Skip to content

Commit 711dea0

Browse files
refactor(Middleware): remove function alias (#2)
1 parent 36c2f60 commit 711dea0

3 files changed

Lines changed: 5 additions & 14 deletions

File tree

src/main/kotlin/net/ccbluex/netty/http/HttpServer.kt

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,9 @@ import io.netty.channel.epoll.EpollEventLoopGroup
2626
import io.netty.channel.epoll.EpollServerSocketChannel
2727
import io.netty.channel.nio.NioEventLoopGroup
2828
import io.netty.channel.socket.nio.NioServerSocketChannel
29-
import io.netty.handler.codec.http.FullHttpResponse
3029
import io.netty.handler.logging.LogLevel
3130
import io.netty.handler.logging.LoggingHandler
3231
import net.ccbluex.netty.http.middleware.Middleware
33-
import net.ccbluex.netty.http.middleware.MiddlewareFunction
34-
import net.ccbluex.netty.http.model.RequestContext
3532
import net.ccbluex.netty.http.rest.RouteController
3633
import net.ccbluex.netty.http.websocket.WebSocketController
3734
import org.apache.logging.log4j.LogManager
@@ -47,18 +44,14 @@ class HttpServer {
4744
val routeController = RouteController()
4845
val webSocketController = WebSocketController()
4946

50-
val middlewares = mutableListOf<MiddlewareFunction>()
47+
val middlewares = mutableListOf<Middleware>()
5148

5249
companion object {
5350
internal val logger = LogManager.getLogger("HttpServer")
5451
}
5552

56-
fun middleware(middlewareFunction: MiddlewareFunction) {
57-
middlewares += middlewareFunction
58-
}
59-
6053
fun middleware(middleware: Middleware) {
61-
middlewares += middleware::middleware
54+
middlewares += middleware
6255
}
6356

6457
/**

src/main/kotlin/net/ccbluex/netty/http/middleware/CorsMiddleware.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class CorsMiddleware(
3030
* Middleware to handle CORS requests.
3131
* Pass to server.middleware() to apply the CORS policy to all requests.
3232
*/
33-
override fun middleware(context: RequestContext, response: FullHttpResponse): FullHttpResponse {
33+
override fun invoke(context: RequestContext, response: FullHttpResponse): FullHttpResponse {
3434
val httpHeaders = response.headers()
3535
val requestOrigin = context.headers["origin"] ?: context.headers["Origin"]
3636

src/main/kotlin/net/ccbluex/netty/http/middleware/Middleware.kt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ package net.ccbluex.netty.http.middleware
33
import io.netty.handler.codec.http.FullHttpResponse
44
import net.ccbluex.netty.http.model.RequestContext
55

6-
typealias MiddlewareFunction = (RequestContext, FullHttpResponse) -> FullHttpResponse
7-
8-
interface Middleware {
9-
fun middleware(context: RequestContext, response: FullHttpResponse): FullHttpResponse
6+
fun interface Middleware {
7+
operator fun invoke(context: RequestContext, response: FullHttpResponse): FullHttpResponse
108
}

0 commit comments

Comments
 (0)