Remove FakeSendable

vapor-community · Jul 1, 2024 · 6826b27 · 6826b27
1 parent a43bf6d
commit 6826b27
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 18 deletions.
diff --git a/Sources/Orders/OrdersServiceCustom.swift b/Sources/Orders/OrdersServiceCustom.swift
@@ -5,7 +5,7 @@
 //  Created by Francesco Paolo Severino on 01/07/24.
 //
 
-import Vapor
+@preconcurrency import Vapor
 import APNS
 import VaporAPNS
 @preconcurrency import APNSCore
@@ -24,15 +24,15 @@ public final class OrdersServiceCustom<O, D, R: OrdersRegistrationModel, E: Erro
     public unowned let delegate: any OrdersDelegate
     private unowned let app: Application
 
-    private let v1: FakeSendable<any RoutesBuilder>
+    private let v1: any RoutesBuilder
     private let logger: Logger?
 
     public init(app: Application, delegate: any OrdersDelegate, logger: Logger? = nil) {
         self.delegate = delegate
         self.logger = logger
         self.app = app
 
-        v1 = FakeSendable(value: app.grouped("api", "orders", "v1"))
+        v1 = app.grouped("api", "orders", "v1")
     }
 }
 

diff --git a/Sources/PassKit/FakeSendable.swift b/Sources/PassKit/FakeSendable.swift
diff --git a/Sources/Passes/PassesServiceCustom.swift b/Sources/Passes/PassesServiceCustom.swift
@@ -5,7 +5,7 @@
 //  Created by Francesco Paolo Severino on 29/06/24.
 //
 
-import Vapor
+@preconcurrency import Vapor
 import APNS
 import VaporAPNS
 @preconcurrency import APNSCore
@@ -24,23 +24,23 @@ public final class PassesServiceCustom<P, D, R: PassesRegistrationModel, E: Erro
     public unowned let delegate: any PassesDelegate
     private unowned let app: Application
 
-    private let v1: FakeSendable<any RoutesBuilder>
+    private let v1: any RoutesBuilder
     private let logger: Logger?
 
     public init(app: Application, delegate: any PassesDelegate, logger: Logger? = nil) {
         self.delegate = delegate
         self.logger = logger
         self.app = app
 
-        v1 = FakeSendable(value: app.grouped("api", "passes", "v1"))
+        v1 = app.grouped("api", "passes", "v1")
     }
 
     /// Registers all the routes required for PassKit to work.
     public func registerRoutes() {
-        v1.value.get("devices", ":deviceLibraryIdentifier", "registrations", ":passTypeIdentifier", use: { try await self.passesForDevice(req: $0) })
-        v1.value.post("log", use: { try await self.logError(req: $0) })
+        v1.get("devices", ":deviceLibraryIdentifier", "registrations", ":passTypeIdentifier", use: { try await self.passesForDevice(req: $0) })
+        v1.post("log", use: { try await self.logError(req: $0) })
 
-        let v1auth = v1.value.grouped(ApplePassMiddleware<P>())
+        let v1auth = v1.grouped(ApplePassMiddleware<P>())
 
         v1auth.post("devices", ":deviceLibraryIdentifier", "registrations", ":passTypeIdentifier", ":passSerial", use: { try await self.registerDevice(req: $0) })
         v1auth.get("passes", ":passTypeIdentifier", ":passSerial", use: { try await self.latestVersionOfPass(req: $0) })
@@ -101,7 +101,7 @@ public final class PassesServiceCustom<P, D, R: PassesRegistrationModel, E: Erro
             isDefault: false
         )
 
-        let pushAuth = v1.value.grouped(middleware)
+        let pushAuth = v1.grouped(middleware)
 
         pushAuth.post("push", ":passTypeIdentifier", ":passSerial", use: { try await self.pushUpdatesForPass(req: $0) })
         pushAuth.get("push", ":passTypeIdentifier", ":passSerial", use: { try await self.tokensForPassUpdate(req: $0) })