-
Notifications
You must be signed in to change notification settings - Fork 7
/
cask.patch
225 lines (213 loc) · 9.62 KB
/
cask.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
diff --git a/cask/src/cask/decorators/compress.scala b/cask/src/cask/decorators/compress.scala
index 71f4bb4..ab833e1 100644
--- a/cask/src/cask/decorators/compress.scala
+++ b/cask/src/cask/decorators/compress.scala
@@ -7,7 +7,7 @@ import cask.model.{Request, Response}
import collection.JavaConverters._
class compress extends cask.RawDecorator{
def wrapFunction(ctx: Request, delegate: Delegate) = {
- val acceptEncodings = Option(ctx.exchange.getRequestHeaders.get("Accept-Encoding"))
+ val acceptEncodings = Option(ctx.exchange.getRequestHeaders().get("Accept-Encoding"))
.toSeq
.flatMap(_.asScala)
.flatMap(_.split(", "))
diff --git a/cask/src/cask/endpoints/JsonEndpoint.scala b/cask/src/cask/endpoints/JsonEndpoint.scala
index 50591a9..9d8c5b4 100644
--- a/cask/src/cask/endpoints/JsonEndpoint.scala
+++ b/cask/src/cask/endpoints/JsonEndpoint.scala
@@ -52,7 +52,7 @@ abstract class postJsonBase(val path: String, override val subpath: Boolean = fa
def wrapFunction(ctx: Request, delegate: Delegate): Result[Response.Raw] = {
val obj = for{
json <-
- try Right(ujson.read(if (cacheBody) ctx.bytes else ctx.exchange.getInputStream))
+ try Right(ujson.read(if (cacheBody) ctx.bytes else ctx.exchange.getInputStream()))
catch{case e: Throwable => Left(cask.model.Response(
"Input text is invalid JSON: " + e + "\n" + Util.stackTraceString(e),
statusCode = 400
diff --git a/cask/src/cask/endpoints/WebEndpoints.scala b/cask/src/cask/endpoints/WebEndpoints.scala
index b2b9731..b831155 100644
--- a/cask/src/cask/endpoints/WebEndpoints.scala
+++ b/cask/src/cask/endpoints/WebEndpoints.scala
@@ -18,7 +18,7 @@ trait WebEndpoint extends HttpEndpoint[Response.Raw, Seq[String]]{
object WebEndpoint{
def buildMapFromQueryParams(ctx: Request) = {
val b = Map.newBuilder[String, Seq[String]]
- val queryParams = ctx.exchange.getQueryParameters
+ val queryParams = ctx.exchange.getQueryParameters()
for(k <- queryParams.keySet().iterator().asScala){
val deque = queryParams.get(k)
val arr = new Array[String](deque.size)
diff --git a/cask/src/cask/endpoints/WebSocketEndpoint.scala b/cask/src/cask/endpoints/WebSocketEndpoint.scala
index ea5bbd6..b59217f 100644
--- a/cask/src/cask/endpoints/WebSocketEndpoint.scala
+++ b/cask/src/cask/endpoints/WebSocketEndpoint.scala
@@ -42,31 +42,31 @@ extends WebsocketResult with WebSocketConnectionCallback {
// as different events here; the former goes to AbstractReceiveListener#onClose,
// while the latter to ChannelListener#handleEvent. Make sure we handle both cases.
channel.addCloseTask(channel => actor.send(Ws.ChannelClosed()))
- channel.getReceiveSetter.set(
+ channel.getReceiveSetter().set(
new AbstractReceiveListener() {
override def onFullTextMessage(channel: WebSocketChannel, message: BufferedTextMessage) = {
- actor.send(Ws.Text(message.getData))
+ actor.send(Ws.Text(message.getData()))
}
override def onFullBinaryMessage(channel: WebSocketChannel, message: BufferedBinaryMessage): Unit = {
actor.send(Ws.Binary(
- WebSockets.mergeBuffers(message.getData.getResource:_*).array()
+ WebSockets.mergeBuffers(message.getData().getResource():_*).array()
))
}
override def onFullPingMessage(channel: WebSocketChannel, message: BufferedBinaryMessage): Unit = {
actor.send(Ws.Ping(
- WebSockets.mergeBuffers(message.getData.getResource:_*).array()
+ WebSockets.mergeBuffers(message.getData().getResource():_*).array()
))
}
override def onFullPongMessage(channel: WebSocketChannel, message: BufferedBinaryMessage): Unit = {
actor.send(Ws.Pong(
- WebSockets.mergeBuffers(message.getData.getResource:_*).array()
+ WebSockets.mergeBuffers(message.getData().getResource():_*).array()
))
}
override def onCloseMessage(cm: CloseMessage, channel: WebSocketChannel) = {
- actor.send(Ws.Close(cm.getCode, cm.getReason))
+ actor.send(Ws.Close(cm.getCode(), cm.getReason()))
}
}
)
diff --git a/cask/src/cask/main/Main.scala b/cask/src/cask/main/Main.scala
index 15c3656..5a0282c 100644
--- a/cask/src/cask/main/Main.scala
+++ b/cask/src/cask/main/Main.scala
@@ -63,10 +63,10 @@ abstract class Main{
def main(args: Array[String]): Unit = {
if (!verbose) Main.silenceJboss()
- val server = Undertow.builder
+ val server = Undertow.builder()
.addHttpListener(port, host)
.setHandler(defaultHandler)
- .build
+ .build()
server.start()
}
@@ -82,7 +82,7 @@ object Main{
(implicit log: Logger) extends HttpHandler() {
def handleRequest(exchange: HttpServerExchange): Unit = try {
// println("Handling Request: " + exchange.getRequestPath)
- val (effectiveMethod, runner) = if ("websocket".equalsIgnoreCase(exchange.getRequestHeaders.getFirst("Upgrade"))) {
+ val (effectiveMethod, runner) = if ("websocket".equalsIgnoreCase(exchange.getRequestHeaders().getFirst("Upgrade"))) {
Tuple2(
"websocket",
(r: Any) =>
@@ -96,12 +96,12 @@ object Main{
}
)
} else Tuple2(
- exchange.getRequestMethod.toString.toLowerCase(),
+ exchange.getRequestMethod().toString.toLowerCase(),
(r: Any) => Main.writeResponse(exchange, r.asInstanceOf[Response.Raw])
)
val decodedSegments = Util
- .splitPath(exchange.getRequestURI)
+ .splitPath(exchange.getRequestURI())
.iterator
.map(java.net.URLDecoder.decode(_, "UTF-8"))
.toList
@@ -176,24 +176,24 @@ object Main{
def writeResponse(exchange: HttpServerExchange, response: Response.Raw) = {
response.data.headers.foreach{case (k, v) =>
- exchange.getResponseHeaders.put(new HttpString(k), v)
+ exchange.getResponseHeaders().put(new HttpString(k), v)
}
response.headers.foreach{case (k, v) =>
- exchange.getResponseHeaders.put(new HttpString(k), v)
+ exchange.getResponseHeaders().put(new HttpString(k), v)
}
response.cookies.foreach(c => exchange.setResponseCookie(Cookie.toUndertow(c)))
exchange.setStatusCode(response.statusCode)
- val output = exchange.getOutputStream
+ val output = exchange.getOutputStream()
response.data.write(new java.io.OutputStream {
def write(b: Int): Unit = output.write(b)
override def write(b: Array[Byte]): Unit = output.write(b)
override def write(b: Array[Byte], off: Int, len: Int): Unit = output.write(b, off, len)
override def close() = {
- if (!exchange.isComplete) output.close()
+ if (!exchange.isComplete()) output.close()
}
override def flush() = {
- if (!exchange.isComplete) output.flush()
+ if (!exchange.isComplete()) output.flush()
}
})
}
diff --git a/cask/src/cask/model/Params.scala b/cask/src/cask/model/Params.scala
index 56a7135..710c31a 100644
--- a/cask/src/cask/model/Params.scala
+++ b/cask/src/cask/model/Params.scala
@@ -13,9 +13,9 @@ case class Request(exchange: HttpServerExchange, remainingPathSegments: Seq[Stri
extends geny.ByteData with geny.Readable {
import collection.JavaConverters._
lazy val cookies: Map[String, Cookie] = {
- exchange.getRequestCookies.asScala.mapValues(Cookie.fromUndertow).toMap
+ exchange.getRequestCookies().asScala.mapValues(Cookie.fromUndertow).toMap
}
- lazy val data: InputStream = exchange.getInputStream
+ lazy val data: InputStream = exchange.getInputStream()
/**
* Read all the bytes of the incoming request *with* caching
@@ -31,11 +31,11 @@ extends geny.ByteData with geny.Readable {
baos.toByteArray
}
lazy val queryParams: Map[String, collection.Seq[String]] = {
- exchange.getQueryParameters.asScala.mapValues(_.asScala.toArray.toSeq).toMap
+ exchange.getQueryParameters().asScala.mapValues(_.asScala.toArray.toSeq).toMap
}
lazy val headers: Map[String, collection.Seq[String]] = {
- exchange.getRequestHeaders.asScala
- .map{ header => header.getHeaderName.toString.toLowerCase -> header.asScala }
+ exchange.getRequestHeaders().asScala
+ .map{ header => header.getHeaderName().toString.toLowerCase -> header.asScala }
.toMap
}
@@ -45,18 +45,18 @@ object Cookie{
def fromUndertow(from: io.undertow.server.handlers.Cookie): Cookie = {
Cookie(
- from.getName,
- from.getValue,
- from.getComment,
- from.getDomain,
- if (from.getExpires == null) null else from.getExpires.toInstant,
- from.getMaxAge,
- from.getPath,
- from.getVersion,
- from.isDiscard,
- from.isHttpOnly,
- from.isSecure,
- from.getSameSiteMode
+ from.getName(),
+ from.getValue(),
+ from.getComment(),
+ from.getDomain(),
+ if (from.getExpires() == null) null else from.getExpires().toInstant,
+ from.getMaxAge(),
+ from.getPath(),
+ from.getVersion(),
+ from.isDiscard(),
+ from.isHttpOnly(),
+ from.isSecure(),
+ from.getSameSiteMode()
)
}
def toUndertow(from: Cookie): io.undertow.server.handlers.Cookie = {
@@ -99,8 +99,8 @@ sealed trait FormEntry{
}
object FormEntry{
def fromUndertow(from: io.undertow.server.handlers.form.FormData.FormValue) = {
- if (!from.isFile) FormValue(from.getValue, from.getHeaders)
- else FormFile(from.getFileName, from.getPath, from.getHeaders)
+ if (!from.isFile()) FormValue(from.getValue(), from.getHeaders())
+ else FormFile(from.getFileName(), from.getPath(), from.getHeaders())
}
}