Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Typealias RequestError to avoid KituraContracts import #1267

Merged
merged 4 commits into from May 11, 2018
Merged

Typealias RequestError to avoid KituraContracts import #1267

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8357884
Typealias RequestError to eliminate need for import
djones6 May 9, 2018
6e7e5f3
Add test for bridging
djones6 May 10, 2018
7fb90eb
Explicit Equatable conformance for 4.0 and comments
djones6 May 11, 2018
4d1ad9d
Merge branch 'master' into typealias_RequestError
djones6 May 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions Sources/Kitura/CodableRouter.swift
View file
Open in desktop
Expand Up @@ -19,6 +19,11 @@ import LoggerAPI
import KituraNet
import KituraContracts

/// Bridge [RequestError](https://ibm-swift.github.io/KituraContracts/Structs/RequestError.html)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need a dummy class like https://github.com/IBM-Swift/Kitura/blob/a8144547ed284befec973a0154790f208eb234d1/Sources/Kitura/HTTPStatusCode.swift#L20 ?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As far as I can tell, this dummy class was only necessary because the file otherwise contains only a typealias. In this case I dropped the typealias into the existing CodableRouter.swift since I could argue it belongs there.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK as long as Jazzy is generating the typealias OK then we're fine :)

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested locally, it generates fine.

/// from [KituraContracts](https://ibm-swift.github.io/KituraContracts) so that you only need to import
/// `Kitura` to access it.
public typealias RequestError = KituraContracts.RequestError

// Codable router

extension Router {
Expand Down