Skip to content

Commit 079ce93

Browse files
author
github-actions
committed
Google Java Format
1 parent b40c15c commit 079ce93

File tree

3 files changed

+80
-59
lines changed

3 files changed

+80
-59
lines changed

‎avaje-jex/src/main/java/io/avaje/jex/http/HttpFilter.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,7 @@ interface FilterChain {
5454
void proceed();
5555
}
5656

57-
/**
58-
* Convert a JDK {@link Filter} into a Jex HttpFilter.
59-
*/
57+
/** Convert a JDK {@link Filter} into a Jex HttpFilter. */
6058
static HttpFilter fromJdkFilter(Filter filter) {
6159
return new JdkFilter(filter);
6260
}

‎avaje-jex/src/test/java/io/avaje/jex/core/ContextUtilTest.java

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,15 @@ void parseCharset_defaults() {
1616

1717
@Test
1818
void parseCharset_caseCheck() {
19-
assertThat(ServiceManager.parseCharset("app/foo; charset=Us-AsCiI")).isEqualTo(StandardCharsets.US_ASCII);
20-
assertThat(ServiceManager.parseCharset("app/foo;charset=Us-AsCiI")).isEqualTo(StandardCharsets.US_ASCII);
21-
assertThat(ServiceManager.parseCharset("app/foo;charset = Us-AsCiI ")).isEqualTo(StandardCharsets.US_ASCII);
22-
assertThat(ServiceManager.parseCharset("app/foo;charset = Us-AsCiI;")).isEqualTo(StandardCharsets.US_ASCII);
23-
assertThat(ServiceManager.parseCharset("app/foo;charset = Us-AsCiI;other=junk")).isEqualTo(StandardCharsets.US_ASCII);
19+
assertThat(ServiceManager.parseCharset("app/foo; charset=Us-AsCiI"))
20+
.isEqualTo(StandardCharsets.US_ASCII);
21+
assertThat(ServiceManager.parseCharset("app/foo;charset=Us-AsCiI"))
22+
.isEqualTo(StandardCharsets.US_ASCII);
23+
assertThat(ServiceManager.parseCharset("app/foo;charset = Us-AsCiI "))
24+
.isEqualTo(StandardCharsets.US_ASCII);
25+
assertThat(ServiceManager.parseCharset("app/foo;charset = Us-AsCiI;"))
26+
.isEqualTo(StandardCharsets.US_ASCII);
27+
assertThat(ServiceManager.parseCharset("app/foo;charset = Us-AsCiI;other=junk"))
28+
.isEqualTo(StandardCharsets.US_ASCII);
2429
}
2530
}

‎avaje-jex/src/test/java/io/avaje/jex/core/QueryParamTest.java

Lines changed: 69 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,34 @@ class QueryParamTest {
1313
static TestPair pair = init();
1414

1515
static TestPair init() {
16-
var app = Jex.create()
17-
.routing(routing -> routing
18-
.get("/", ctx -> ctx.text("hello"))
19-
.get("/one/{id}", ctx -> ctx.text("one-" + ctx.pathParam("id") + "|match:" + ctx.matchedPath()))
20-
.get("/one/{id}/{b}", ctx -> ctx.text("path:" + ctx.pathParamMap() + "|query:" + ctx.queryParam("z") + "|match:" + ctx.matchedPath()))
21-
.get("/queryParamMap", ctx -> ctx.text("qpm: "+ctx.queryParamMap()))
22-
.get("/queryParams", ctx -> ctx.text("qps: "+ctx.queryParams("a")))
23-
.get("/queryString", ctx -> ctx.text("qs: "+ctx.queryString()))
24-
.get("/plus/{plus}", ctx -> ctx.text(ctx.pathParam("plus")+ctx.queryParam("plus")))
25-
.get("/scheme", ctx -> ctx.text("scheme: "+ctx.scheme()))
26-
);
16+
var app =
17+
Jex.create()
18+
.routing(
19+
routing ->
20+
routing
21+
.get("/", ctx -> ctx.text("hello"))
22+
.get(
23+
"/one/{id}",
24+
ctx ->
25+
ctx.text(
26+
"one-" + ctx.pathParam("id") + "|match:" + ctx.matchedPath()))
27+
.get(
28+
"/one/{id}/{b}",
29+
ctx ->
30+
ctx.text(
31+
"path:"
32+
+ ctx.pathParamMap()
33+
+ "|query:"
34+
+ ctx.queryParam("z")
35+
+ "|match:"
36+
+ ctx.matchedPath()))
37+
.get("/queryParamMap", ctx -> ctx.text("qpm: " + ctx.queryParamMap()))
38+
.get("/queryParams", ctx -> ctx.text("qps: " + ctx.queryParams("a")))
39+
.get("/queryString", ctx -> ctx.text("qs: " + ctx.queryString()))
40+
.get(
41+
"/plus/{plus}",
42+
ctx -> ctx.text(ctx.pathParam("plus") + ctx.queryParam("plus")))
43+
.get("/scheme", ctx -> ctx.text("scheme: " + ctx.scheme())));
2744
return TestPair.create(app);
2845
}
2946

@@ -41,31 +58,25 @@ void get() {
4158

4259
@Test
4360
void getOne_path() {
44-
var res = pair.request()
45-
.path("one").path("foo").GET().asString();
61+
var res = pair.request().path("one").path("foo").GET().asString();
4662

4763
assertThat(res.statusCode()).isEqualTo(200);
4864
assertThat(res.body()).isEqualTo("one-foo|match:/one/{id}");
4965

50-
res = pair.request()
51-
.path("one").path("bar").GET().asString();
66+
res = pair.request().path("one").path("bar").GET().asString();
5267

5368
assertThat(res.statusCode()).isEqualTo(200);
5469
assertThat(res.body()).isEqualTo("one-bar|match:/one/{id}");
5570
}
5671

5772
@Test
5873
void getOne_path_path() {
59-
var res = pair.request()
60-
.path("one").path("foo").path("bar")
61-
.GET().asString();
74+
var res = pair.request().path("one").path("foo").path("bar").GET().asString();
6275

6376
assertThat(res.statusCode()).isEqualTo(200);
6477
assertThat(res.body()).isEqualTo("path:{id=foo, b=bar}|query:null|match:/one/{id}/{b}");
6578

66-
res = pair.request()
67-
.path("one").path("fo").path("ba").queryParam("z", "42")
68-
.GET().asString();
79+
res = pair.request().path("one").path("fo").path("ba").queryParam("z", "42").GET().asString();
6980

7081
assertThat(res.statusCode()).isEqualTo(200);
7182
assertThat(res.body()).isEqualTo("path:{id=fo, b=ba}|query:42|match:/one/{id}/{b}");
@@ -80,79 +91,86 @@ void queryParamMap_when_empty() {
8091

8192
@Test
8293
void queryParamMap_keyWithMultiValues_expect_firstValueInMap() {
83-
HttpResponse<String> res = pair.request().path("queryParamMap")
84-
.queryParam("a","AVal0")
85-
.queryParam("a","AVal1")
86-
.queryParam("b", "BVal")
87-
.GET().asString();
94+
HttpResponse<String> res =
95+
pair.request()
96+
.path("queryParamMap")
97+
.queryParam("a", "AVal0")
98+
.queryParam("a", "AVal1")
99+
.queryParam("b", "BVal")
100+
.GET()
101+
.asString();
88102
assertThat(res.statusCode()).isEqualTo(200);
89103
assertThat(res.body()).isEqualTo("qpm: {a=AVal0, b=BVal}");
90104
}
91105

92106
@Test
93107
void queryParamMap_basic() {
94-
HttpResponse<String> res = pair.request().path("queryParamMap")
95-
.queryParam("a","AVal")
96-
.queryParam("b", "BVal")
97-
.GET().asString();
108+
HttpResponse<String> res =
109+
pair.request()
110+
.path("queryParamMap")
111+
.queryParam("a", "AVal")
112+
.queryParam("b", "BVal")
113+
.GET()
114+
.asString();
98115
assertThat(res.statusCode()).isEqualTo(200);
99116
assertThat(res.body()).isEqualTo("qpm: {a=AVal, b=BVal}");
100117
}
101118

102119
@Test
103120
void queryParams_basic() {
104-
HttpResponse<String> res = pair.request().path("queryParams")
105-
.queryParam("a","one")
106-
.queryParam("a", "two")
107-
.GET().asString();
121+
HttpResponse<String> res =
122+
pair.request()
123+
.path("queryParams")
124+
.queryParam("a", "one")
125+
.queryParam("a", "two")
126+
.GET()
127+
.asString();
108128
assertThat(res.statusCode()).isEqualTo(200);
109129
assertThat(res.body()).isEqualTo("qps: [one, two]");
110130
}
111131

112132
@Test
113133
void queryParams_when_null_expect_emptyList() {
114-
HttpResponse<String> res = pair.request().path("queryParams")
115-
.queryParam("b","one")
116-
.GET().asString();
134+
HttpResponse<String> res =
135+
pair.request().path("queryParams").queryParam("b", "one").GET().asString();
117136
assertThat(res.statusCode()).isEqualTo(200);
118137
assertThat(res.body()).isEqualTo("qps: []");
119138
}
120139

121140
@Test
122141
void queryString_when_null() {
123-
HttpResponse<String> res = pair.request().path("queryString")
124-
.GET().asString();
142+
HttpResponse<String> res = pair.request().path("queryString").GET().asString();
125143
assertThat(res.statusCode()).isEqualTo(200);
126144
assertThat(res.body()).isEqualTo("qs: null");
127145
}
128146

129147
@Test
130148
void queryString_when_set() {
131-
HttpResponse<String> res = pair.request().path("queryString")
132-
.queryParam("foo","f1")
133-
.queryParam("bar","b1")
134-
.queryParam("bar","b2")
135-
.GET().asString();
149+
HttpResponse<String> res =
150+
pair.request()
151+
.path("queryString")
152+
.queryParam("foo", "f1")
153+
.queryParam("bar", "b1")
154+
.queryParam("bar", "b2")
155+
.GET()
156+
.asString();
136157
assertThat(res.statusCode()).isEqualTo(200);
137158
assertThat(res.body()).isEqualTo("qs: foo=f1&bar=b1&bar=b2");
138159
}
139160

140161
@Test
141162
void plus() {
142-
HttpResponse<String> res = pair.request().path("plus/+")
143-
.queryParam("plus","+")
144-
.GET().asString();
163+
HttpResponse<String> res =
164+
pair.request().path("plus/+").queryParam("plus", "+").GET().asString();
145165
assertThat(res.statusCode()).isEqualTo(200);
146166
assertThat(res.body()).isEqualTo("++");
147167
}
148168

149169
@Test
150170
void scheme() {
151-
HttpResponse<String> res = pair.request().path("scheme")
152-
.queryParam("foo","f1")
153-
.GET().asString();
171+
HttpResponse<String> res =
172+
pair.request().path("scheme").queryParam("foo", "f1").GET().asString();
154173
assertThat(res.statusCode()).isEqualTo(200);
155174
assertThat(res.body()).isEqualTo("scheme: http");
156175
}
157-
158176
}

0 commit comments

Comments
 (0)