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

Remove HeadResponder #3147

Merged
merged 2 commits into from Apr 23, 2024
Merged

Remove HeadResponder #3147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
42658b5
Remove HeadResponder
baarde Jan 30, 2024
f573cea
Merge branch 'main' into remove-head-responder
0xTim Apr 23, 2024
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
26 changes: 0 additions & 26 deletions Sources/Vapor/Responder/DefaultResponder.swift
View file
Open in desktop
Expand Up @@ -39,26 +39,6 @@ internal struct DefaultResponder: Responder {
}
}

// If the route isn't explicitly a HEAD route,
// and it's made up solely of .constant components,
// register a HEAD route with the same path
if route.method == .GET &&
route.path.allSatisfy({ component in
if case .constant(_) = component { return true }
return false
}) {
let headRoute = Route(
method: .HEAD,
path: route.path,
responder: middleware.makeResponder(chainingTo: HeadResponder()),
requestType: route.requestType,
responseType: route.responseType)

let headCachedRoute = CachedRoute(route: headRoute, responder: middleware.makeResponder(chainingTo: HeadResponder()))

router.register(headCachedRoute, at: [.constant(HTTPMethod.HEAD.string)] + path)
}

router.register(cached, at: [.constant(route.method.string)] + path)
}
self.router = router
Expand Down Expand Up @@ -155,12 +135,6 @@ internal struct DefaultResponder: Responder {
}
}

private struct HeadResponder: Responder {
func respond(to request: Request) -> EventLoopFuture<Response> {
request.eventLoop.makeSucceededFuture(.init(status: .ok))
}
}

private struct NotFoundResponder: Responder {
func respond(to request: Request) -> EventLoopFuture<Response> {
request.eventLoop.makeFailedFuture(RouteNotFound())
Expand Down
21 changes: 3 additions & 18 deletions Tests/VaporTests/RouteTests.swift
View file
Open in desktop
Expand Up @@ -229,38 +229,23 @@ final class RouteTests: XCTestCase {
}
}

func testHeadRequestWithConstantPathReturnsOK() throws {
func testHeadRequestForwardedToGet() throws {
let app = Application(.testing)
defer { app.shutdown() }

app.get("hello") { req -> String in
return "hi"
}

try app.testable(method: .running(port: 0)).test(.HEAD, "/hello") { res in
XCTAssertEqual(res.status, .ok)
XCTAssertEqual(res.headers.first(name: .contentLength), "0")
XCTAssertEqual(res.body.readableBytes, 0)
}
}

func testHeadRequestWithParameterForwardedToGet() throws {
let app = Application(.testing)
defer { app.shutdown() }

app.get("hello", ":name") { req -> String in
XCTAssertEqual(req.method, .HEAD)
return "hi"
}

try app.testable(method: .running(port: 0)).test(.HEAD, "/hello/joe") { res in
try app.testable(method: .running(port: 0)).test(.HEAD, "/hello") { res in
XCTAssertEqual(res.status, .ok)
XCTAssertEqual(res.headers.first(name: .contentLength), "2")
XCTAssertEqual(res.body.readableBytes, 0)
}
}

func testExplicitHeadRouteHandlerOverridesGeneratedHandler() throws {
func testExplicitHeadRouteOverridesForwardingToGet() throws {
let app = Application(.testing)
defer { app.shutdown() }

Expand Down