trys removed

twof · Oct 27, 2018 · 9868493 · 9868493
1 parent 6cbfdc7
commit 9868493
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 37 deletions.
diff --git a/Sources/CrudRouter/ControllerProtocols/Crudable.swift b/Sources/CrudRouter/ControllerProtocols/Crudable.swift
@@ -8,8 +8,8 @@ public protocol Crudable: ControllerProtocol {
         at path: PathComponentsRepresentable...,
         parent relation: KeyPath<ChildType, Parent<ChildType, ParentType>>,
         _ either: OnlyExceptEither<ParentRouterMethod>,
-        relationConfiguration: ((CrudParentController<ChildType, ParentType>) throws -> Void)?
-    ) throws where
+        relationConfiguration: ((CrudParentController<ChildType, ParentType>) -> Void)?
+    ) where
         ParentType: Model & Content,
         ChildType.Database == ParentType.Database,
         ParentType.ID: Parameter
@@ -18,8 +18,8 @@ public protocol Crudable: ControllerProtocol {
         at path: PathComponentsRepresentable...,
         children relation: KeyPath<ChildType, Children<ChildType, ChildChildType>>,
         _ either: OnlyExceptEither<ChildrenRouterMethod>,
-        relationConfiguration: ((CrudChildrenController<ChildChildType, ChildType>) throws -> Void)?
-    ) throws where
+        relationConfiguration: ((CrudChildrenController<ChildChildType, ChildType>) -> Void)?
+    ) where
         ChildChildType: Model & Content,
         ChildType.Database == ChildChildType.Database,
         ChildChildType.ID: Parameter
@@ -28,8 +28,8 @@ public protocol Crudable: ControllerProtocol {
         at path: PathComponentsRepresentable...,
         siblings relation: KeyPath<ChildType, Siblings<ChildType, ChildChildType, ThroughType>>,
         _ either: OnlyExceptEither<ModifiableSiblingRouterMethod>,
-        relationConfiguration: ((CrudSiblingsController<ChildChildType, ChildType, ThroughType>) throws -> Void)?
-    ) throws where
+        relationConfiguration: ((CrudSiblingsController<ChildChildType, ChildType, ThroughType>) -> Void)?
+    ) where
         ChildChildType: Content,
         ChildType.Database == ThroughType.Database,
         ChildChildType.ID: Parameter,
@@ -43,8 +43,8 @@ public protocol Crudable: ControllerProtocol {
         at path: PathComponentsRepresentable...,
         siblings relation: KeyPath<ChildType, Siblings<ChildType, ChildChildType, ThroughType>>,
         _ either: OnlyExceptEither<ModifiableSiblingRouterMethod>,
-        relationConfiguration: ((CrudSiblingsController<ChildChildType, ChildType, ThroughType>) throws -> Void)?
-    ) throws where
+        relationConfiguration: ((CrudSiblingsController<ChildChildType, ChildType, ThroughType>) -> Void)?
+    ) where
         ChildChildType: Content,
         ChildType.Database == ThroughType.Database,
         ChildChildType.ID: Parameter,
@@ -60,8 +60,8 @@ extension Crudable {
         at path: PathComponentsRepresentable...,
         parent relation: KeyPath<ChildType, Parent<ChildType, ParentType>>,
         _ either: OnlyExceptEither<ParentRouterMethod> = .only([.read, .update]),
-        relationConfiguration: ((CrudParentController<ChildType, ParentType>) throws -> Void)?=nil
-    ) throws where
+        relationConfiguration: ((CrudParentController<ChildType, ParentType>) -> Void)?=nil
+    ) where
         ParentType: Model & Content,
         ChildType.Database == ParentType.Database,
         ParentType.ID: Parameter {
@@ -81,17 +81,17 @@ extension Crudable {
                 controller = CrudParentController(relation: relation, path: fullPath, router: self.router, activeMethods: allMethods.subtracting(Set(methods)))
             }
 
-            try controller.boot(router: self.router)
+            do { try controller.boot(router: self.router) } catch { fatalError("I have no reason to expect boot to throw") }
 
-            try relationConfiguration?(controller)
+            relationConfiguration?(controller)
     }
 
     public func crud<ChildChildType>(
         at path: PathComponentsRepresentable...,
         children relation: KeyPath<ChildType, Children<ChildType, ChildChildType>>,
         _ either: OnlyExceptEither<ChildrenRouterMethod> = .only([.read, .readAll, .create, .update, .delete]),
-        relationConfiguration: ((CrudChildrenController<ChildChildType, ChildType>) throws -> Void)?=nil
-    ) throws where
+        relationConfiguration: ((CrudChildrenController<ChildChildType, ChildType>) -> Void)?=nil
+    ) where
         ChildChildType: Model & Content,
         ChildType.Database == ChildChildType.Database,
         ChildChildType.ID: Parameter {
@@ -110,17 +110,17 @@ extension Crudable {
                 controller = CrudChildrenController<ChildChildType, ChildType>(childrenRelation: relation, path: fullPath, router: self.router, activeMethods: allMethods.subtracting(Set(methods)))
             }
 
-            try controller.boot(router: self.router)
+            do { try controller.boot(router: self.router) } catch { fatalError("I have no reason to expect boot to throw") }
 
-            try relationConfiguration?(controller)
+            relationConfiguration?(controller)
     }
 
     public func crud<ChildChildType, ThroughType>(
         at path: PathComponentsRepresentable...,
         siblings relation: KeyPath<ChildType, Siblings<ChildType, ChildChildType, ThroughType>>,
         _ either: OnlyExceptEither<ModifiableSiblingRouterMethod> = .only([.read, .readAll, .create, .update, .delete]),
-        relationConfiguration: ((CrudSiblingsController<ChildChildType, ChildType, ThroughType>) throws -> Void)?=nil
-    ) throws where
+        relationConfiguration: ((CrudSiblingsController<ChildChildType, ChildType, ThroughType>) -> Void)?=nil
+    ) where
         ChildChildType: Content,
         ChildType.Database == ThroughType.Database,
         ChildChildType.ID: Parameter,
@@ -145,17 +145,17 @@ extension Crudable {
                 controller = CrudSiblingsController<ChildChildType, ChildType, ThroughType>(siblingRelation: relation, path: fullPath, router: self.router, activeMethods: allMethods.subtracting(Set(methods)))
             }
 
-            try controller.boot(router: self.router)
+             do { try controller.boot(router: self.router) } catch { fatalError("I have no reason to expect boot to throw") }
 
-            try relationConfiguration?(controller)
+            relationConfiguration?(controller)
     }
 
     public func crud<ChildChildType, ThroughType>(
         at path: PathComponentsRepresentable...,
         siblings relation: KeyPath<ChildType, Siblings<ChildType, ChildChildType, ThroughType>>,
         _ either: OnlyExceptEither<ModifiableSiblingRouterMethod> = .only([.read, .readAll, .create, .update, .delete]),
-        relationConfiguration: ((CrudSiblingsController<ChildChildType, ChildType, ThroughType>) throws -> Void)?=nil
-    ) throws where
+        relationConfiguration: ((CrudSiblingsController<ChildChildType, ChildType, ThroughType>) -> Void)?=nil
+    ) where
         ChildChildType: Content,
         ChildType.Database == ThroughType.Database,
         ChildChildType.ID: Parameter,
@@ -179,8 +179,8 @@ extension Crudable {
                 controller = CrudSiblingsController<ChildChildType, ChildType, ThroughType>(siblingRelation: relation, path: fullPath, router: self.router, activeMethods: allMethods.subtracting(Set(methods)))
             }
 
-            try controller.boot(router: self.router)
+            do { try controller.boot(router: self.router) } catch { fatalError("I have no reason to expect boot to throw") }
 
-            try relationConfiguration?(controller)
+            relationConfiguration?(controller)
     }
 }
diff --git a/Sources/CrudRouter/Extensions/Router+CRUD.swift b/Sources/CrudRouter/Extensions/Router+CRUD.swift
@@ -6,8 +6,8 @@ public extension Router {
         _ path: PathComponentsRepresentable...,
         register type: ModelType.Type,
         _ either: OnlyExceptEither<RouterMethod> = .only([.read, .readAll, .create, .update, .delete]),
-        relationConfiguration: ((CrudController<ModelType>) throws -> ())?=nil
-    ) throws where ModelType.ID: Parameter {
+        relationConfiguration: ((CrudController<ModelType>) -> ())?=nil
+    ) where ModelType.ID: Parameter {
         let allMethods: Set<RouterMethod> = Set([.read, .readAll, .create, .update, .delete])
         let controller: CrudController<ModelType>
 
@@ -18,8 +18,8 @@ public extension Router {
             controller = CrudController<ModelType>(path: path, router: self, activeMethods: allMethods.subtracting(Set(methods)))
         }
 
-        try controller.boot(router: self)
+        do { try controller.boot(router: self) } catch { fatalError("I have no reason to expect boot to throw") }
 
-        try relationConfiguration?(controller)
+        relationConfiguration?(controller)
     }
 }
diff --git a/Tests/CrudRouterTests/CrudRouterTests.swift b/Tests/CrudRouterTests/CrudRouterTests.swift
@@ -89,15 +89,15 @@ func configure(_ config: inout Config, _ env: inout Environment, _ services: ino
 }
 
 func routes(_ router: Router) throws {
-    try router.crud(register: Galaxy.self) { controller in
-        try controller.crud(children: \.planets)
+    router.crud(register: Galaxy.self) { controller in
+        controller.crud(children: \.planets)
     }
-    try router.crud(register: Planet.self) { controller in
-        try controller.crud(parent: \.galaxy)
-        try controller.crud(siblings: \.tags)
+    router.crud(register: Planet.self) { controller in
+        controller.crud(parent: \.galaxy)
+        controller.crud(siblings: \.tags)
     }
-    try router.crud(register: Tag.self) { controller in
-        try controller.crud(siblings: \.planets)
+    router.crud(register: Tag.self) { controller in
+        controller.crud(siblings: \.planets)
     }
 }
 
@@ -165,7 +165,7 @@ final class CrudRouterTests: XCTestCase {
     func testBaseCrudRegistrationWithRouteName() throws {
         let router = EngineRouter.default()
 
-        try router.crud("planets", register: Planet.self)
+        router.crud("planets", register: Planet.self)
 
         XCTAssert(router.routes.isEmpty == false)
         XCTAssert(router.routes.count == 5)
@@ -181,7 +181,7 @@ final class CrudRouterTests: XCTestCase {
     func testBaseCrudRegistrationWithDefaultRoute() throws {
         let router = EngineRouter.default()
 
-        try router.crud(register: Planet.self)
+        router.crud(register: Planet.self)
 
         XCTAssert(router.routes.isEmpty == false)
         XCTAssert(router.routes.count == 5)