Rename CoreRequestContext to CoreRequestContextStorage (#473)

hummingbird-project · Jun 15, 2024 · b2fdf6c · b2fdf6c
1 parent ec1bc51
commit b2fdf6c
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 12 deletions.
diff --git a/Sources/Hummingbird/Deprecations.swift b/Sources/Hummingbird/Deprecations.swift
@@ -33,8 +33,10 @@ public typealias HBFileIO = FileIO
 public typealias HBBaseRequestContext = RequestContext
 @_documentation(visibility: internal) @available(*, deprecated, renamed: "BasicRequestContext")
 public typealias HBBasicRequestContext = BasicRequestContext
-@_documentation(visibility: internal) @available(*, deprecated, renamed: "CoreRequestContext")
-public typealias HBCoreRequestContext = CoreRequestContext
+@_documentation(visibility: internal) @available(*, deprecated, renamed: "CoreRequestContextStorage")
+public typealias HBCoreRequestContext = CoreRequestContextStorage
+@_documentation(visibility: internal) @available(*, deprecated, renamed: "CoreRequestContextStorage")
+public typealias CoreRequestContext = CoreRequestContextStorage
 @_documentation(visibility: internal) @available(*, deprecated, renamed: "RequestContext")
 public typealias HBRequestContext = RequestContext
 @_documentation(visibility: internal) @available(*, deprecated, renamed: "RequestDecoder")

diff --git a/Sources/Hummingbird/Server/RequestContext.swift b/Sources/Hummingbird/Server/RequestContext.swift
@@ -55,7 +55,7 @@ public struct ServerRequestContextSource: RequestContextSource {
 }
 
 /// Request context values required by Hummingbird itself.
-public struct CoreRequestContext: Sendable {
+public struct CoreRequestContextStorage: Sendable {
     /// ByteBuffer allocator used by request
     @usableFromInline
     let allocator: ByteBufferAllocator
@@ -93,7 +93,7 @@ public protocol RequestContext: InstantiableRequestContext {
     associatedtype Encoder: ResponseEncoder = JSONEncoder
 
     /// Core context
-    var coreContext: CoreRequestContext { get set }
+    var coreContext: CoreRequestContextStorage { get set }
     /// Maximum upload size allowed for routes that don't stream the request payload. This
     /// limits how much memory would be used for one request
     var maxUploadSize: Int { get }
@@ -146,7 +146,7 @@ extension RequestContext where Encoder == JSONEncoder {
 /// Implementation of a basic request context that supports everything the Hummingbird library needs
 public struct BasicRequestContext: RequestContext {
     /// core context
-    public var coreContext: CoreRequestContext
+    public var coreContext: CoreRequestContextStorage
 
     ///  Initialize an `RequestContext`
     /// - Parameters:

diff --git a/Sources/HummingbirdRouter/RouterBuilderContext.swift b/Sources/HummingbirdRouter/RouterBuilderContext.swift
@@ -35,7 +35,7 @@ public protocol RouterRequestContext: RequestContext {
 /// Basic implementation of a context that can be used with `RouterBuilder``
 public struct BasicRouterRequestContext: RequestContext, RouterRequestContext {
     public var routerContext: RouterBuilderContext
-    public var coreContext: CoreRequestContext
+    public var coreContext: CoreRequestContextStorage
 
     public init(source: Source) {
         self.coreContext = .init(source: source)

diff --git a/Tests/HummingbirdRouterTests/RouterTests.swift b/Tests/HummingbirdRouterTests/RouterTests.swift
@@ -449,7 +449,7 @@ public struct TestRouterContext2: RouterRequestContext, RequestContext {
     /// router context
     public var routerContext: RouterBuilderContext
     /// core context
-    public var coreContext: CoreRequestContext
+    public var coreContext: CoreRequestContextStorage
 
     /// additional data
     public var string: String

diff --git a/Tests/HummingbirdTests/ApplicationTests.swift b/Tests/HummingbirdTests/ApplicationTests.swift
@@ -372,7 +372,7 @@ final class ApplicationTests: XCTestCase {
 
     func testOptionalCodable() async throws {
         struct SortedJSONRequestContext: RequestContext {
-            var coreContext: CoreRequestContext
+            var coreContext: CoreRequestContextStorage
             var responseEncoder: JSONEncoder {
                 let encoder = JSONEncoder()
                 encoder.outputFormatting = .sortedKeys
@@ -453,7 +453,7 @@ final class ApplicationTests: XCTestCase {
                 self.coreContext = .init(source: source)
             }
 
-            var coreContext: CoreRequestContext
+            var coreContext: CoreRequestContextStorage
             var maxUploadSize: Int { 64 * 1024 }
         }
         let router = Router(context: MaxUploadRequestContext.self)
@@ -482,7 +482,7 @@ final class ApplicationTests: XCTestCase {
         /// Implementation of a basic request context that supports everything the Hummingbird library needs
         struct SocketAddressRequestContext: RequestContext {
             /// core context
-            var coreContext: CoreRequestContext
+            var coreContext: CoreRequestContextStorage
             // socket address
             let remoteAddress: SocketAddress?
 

diff --git a/Tests/HummingbirdTests/RouterTests.swift b/Tests/HummingbirdTests/RouterTests.swift
@@ -609,7 +609,7 @@ struct TestRouterContext2: RequestContext {
     }
 
     /// parameters
-    var coreContext: CoreRequestContext
+    var coreContext: CoreRequestContextStorage
 
     /// additional data
     var string: String

diff --git a/Tests/HummingbirdTests/URLEncodedForm/Application+URLEncodedFormTests.swift b/Tests/HummingbirdTests/URLEncodedForm/Application+URLEncodedFormTests.swift
@@ -26,7 +26,7 @@ class HummingBirdURLEncodedTests: XCTestCase {
     }
 
     struct URLEncodedCodingRequestContext: RequestContext {
-        var coreContext: CoreRequestContext
+        var coreContext: CoreRequestContextStorage
 
         init(source: Source) {
             self.coreContext = .init(source: source)