55 */
66package io .jooby .i4031 ;
77
8+ import java .net .URLEncoder ;
9+ import java .nio .charset .StandardCharsets ;
810import java .util .Map ;
911
1012import org .junit .jupiter .api .Assertions ;
1315import io .jooby .junit .ServerTest ;
1416import io .jooby .junit .ServerTestRunner ;
1517import okhttp3 .FormBody ;
18+ import okhttp3 .MediaType ;
1619import okhttp3 .MultipartBody ;
20+ import okhttp3 .RequestBody ;
1721
1822class Issue4031 {
1923
@@ -27,23 +31,24 @@ public void formDataAndQueryParameters(ServerTestRunner runner) {
2731 ctx -> {
2832 try {
2933 Assertions .assertAll (
30- () -> {
31- Assertions .assertEquals (
32- 1 , ctx .form ().size (), "form contains one entry" );
33- Assertions .assertTrue (ctx .form ().isPresent ());
34- Assertions .assertFalse (ctx .form ().isMissing ());
35- Assertions .assertEquals ("bar" , ctx .form ().get ("foo" ).value ());
36- Assertions .assertEquals ("bar" , ctx .form ("foo" ).value ());
37- Assertions .assertEquals ("bar" , ctx .form ().toMap ().get ("foo" ));
38- Assertions .assertEquals ("bar" , ctx .formMap ().get ("foo" ));
39-
40- Assertions .assertEquals (
41- "?parameter1=value1" , ctx .query ().queryString ());
42- Assertions .assertEquals ("parameter1=value1" , ctx .query ().value ());
43- Assertions .assertEquals ("value1" , ctx .query ("parameter1" ).value ());
44- Assertions .assertEquals ("value1" , ctx .queryMap ().get ("parameter1" ));
45- Assertions .assertEquals (1 , ctx .queryMap ().size ());
46- });
34+ () ->
35+ Assertions .assertEquals (
36+ 1 , ctx .form ().size (), "form contains one entry" ),
37+ () -> Assertions .assertTrue (ctx .form ().isPresent ()),
38+ () -> Assertions .assertFalse (ctx .form ().isMissing ()),
39+ () -> Assertions .assertEquals ("bar" , ctx .form ().get ("foo" ).value ()),
40+ () -> Assertions .assertEquals ("bar" , ctx .form ("foo" ).value ()),
41+ () -> Assertions .assertEquals ("bar" , ctx .form ().toMap ().get ("foo" )),
42+ () -> Assertions .assertEquals ("bar" , ctx .formMap ().get ("foo" )),
43+ () ->
44+ Assertions .assertEquals (
45+ "?parameter1=value1" , ctx .query ().queryString ()),
46+ () -> Assertions .assertEquals ("parameter1=value1" , ctx .query ().value ()),
47+ () ->
48+ Assertions .assertEquals ("value1" , ctx .query ("parameter1" ).value ()),
49+ () ->
50+ Assertions .assertEquals ("value1" , ctx .queryMap ().get ("parameter1" )),
51+ () -> Assertions .assertEquals (1 , ctx .queryMap ().size ()));
4752 return "OK" ;
4853 } catch (Exception ex ) {
4954 ctx .setResponseCode (500 );
@@ -61,6 +66,28 @@ public void formDataAndQueryParameters(ServerTestRunner runner) {
6166 Assertions .assertEquals (200 , rsp .code ());
6267 });
6368
69+ // form with bad media type
70+ http .post (
71+ "/" ,
72+ customForm (
73+ Map .of ("foo" , "bar" ), "application/x-www-form-urlencoded; charset=utf-8" ),
74+ Map .of ("parameter1" , "value1" ),
75+ rsp -> {
76+ Assertions .assertEquals ("OK" , rsp .body ().string ());
77+ Assertions .assertEquals (200 , rsp .code ());
78+ });
79+
80+ http .post (
81+ "/" ,
82+ customForm (
83+ Map .of ("foo" , "bar" ), "application/x-www-form-urlencoded;charset=iso-8859-1" ),
84+ Map .of ("parameter1" , "value1" ),
85+ rsp -> {
86+ Assertions .assertEquals ("OK" , rsp .body ().string ());
87+ Assertions .assertEquals (200 , rsp .code ());
88+ });
89+
90+ // multipart
6491 http .post (
6592 "/" ,
6693 new MultipartBody .Builder ()
@@ -75,8 +102,22 @@ public void formDataAndQueryParameters(ServerTestRunner runner) {
75102 });
76103 }
77104
105+ private static RequestBody customForm (Map <String , Object > form , String mediaType ) {
106+ var payload =
107+ form .entrySet ().stream ()
108+ .map (
109+ entry ->
110+ entry .getKey ()
111+ + "="
112+ + URLEncoder .encode (entry .getValue ().toString (), StandardCharsets .UTF_8 ))
113+ .reduce ((a , b ) -> a + "&" + b )
114+ .orElse ("" );
115+
116+ return RequestBody .create (payload , MediaType .parse (mediaType ));
117+ }
118+
78119 @ ServerTest
79- public void readFormDataBeforeBody (ServerTestRunner runner ) {
120+ public void readFormDataAfterBody (ServerTestRunner runner ) {
80121 runner
81122 .define (
82123 app ->
@@ -85,20 +126,19 @@ public void readFormDataBeforeBody(ServerTestRunner runner) {
85126 ctx -> {
86127 try {
87128 Assertions .assertAll (
88- () -> {
89- Assertions .assertEquals (
90- 1 , ctx .form ().size (), "form contains one entry" );
91- Assertions .assertTrue (ctx .form ().isPresent ());
92- Assertions .assertFalse (ctx .form ().isMissing ());
93- Assertions .assertEquals ("bar" , ctx .form ().get ("foo" ).value ());
94- Assertions .assertEquals ("bar" , ctx .form ("foo" ).value ());
95- Assertions .assertEquals ("bar" , ctx .form ().toMap ().get ("foo" ));
96- Assertions .assertEquals ("bar" , ctx .formMap ().get ("foo" ));
97-
98- // get body().value() after calling form methods
99- Assertions .assertThrows (
100- MissingValueException .class , () -> ctx .body ().value ());
101- });
129+ () ->
130+ Assertions .assertEquals (
131+ 1 , ctx .form ().size (), "form contains one entry" ),
132+ () -> Assertions .assertTrue (ctx .form ().isPresent ()),
133+ () -> Assertions .assertFalse (ctx .form ().isMissing ()),
134+ () -> Assertions .assertEquals ("bar" , ctx .form ().get ("foo" ).value ()),
135+ () -> Assertions .assertEquals ("bar" , ctx .form ("foo" ).value ()),
136+ () -> Assertions .assertEquals ("bar" , ctx .form ().toMap ().get ("foo" )),
137+ () -> Assertions .assertEquals ("bar" , ctx .formMap ().get ("foo" )),
138+ // get body().value() after calling form methods
139+ () ->
140+ Assertions .assertThrows (
141+ MissingValueException .class , () -> ctx .body ().value ()));
102142 return "OK" ;
103143 } catch (Exception ex ) {
104144 ctx .setResponseCode (500 );
@@ -115,6 +155,15 @@ public void readFormDataBeforeBody(ServerTestRunner runner) {
115155 Assertions .assertEquals (200 , rsp .code ());
116156 });
117157
158+ http .post (
159+ "/" ,
160+ customForm (
161+ Map .of ("foo" , "bar" ), "application/x-www-form-urlencoded; charset=utf-8" ),
162+ rsp -> {
163+ Assertions .assertEquals ("OK" , rsp .body ().string ());
164+ Assertions .assertEquals (200 , rsp .code ());
165+ });
166+
118167 http .post (
119168 "/" ,
120169 new MultipartBody .Builder ()
@@ -129,7 +178,7 @@ public void readFormDataBeforeBody(ServerTestRunner runner) {
129178 }
130179
131180 @ ServerTest
132- public void readFormDataAfterBody (ServerTestRunner runner ) {
181+ public void readFormDataBeforeBody (ServerTestRunner runner ) {
133182 runner
134183 .define (
135184 app ->
@@ -138,47 +187,54 @@ public void readFormDataAfterBody(ServerTestRunner runner) {
138187 ctx -> {
139188 try {
140189 Assertions .assertAll (
141- () -> {
142- // get body().value() before calling form methods
143- Assertions .assertThrows (
144- MissingValueException .class , () -> ctx .body ().value ());
145-
146- Assertions .assertEquals (
147- 1 , ctx .form ().size (), "form contains one entry" );
148- Assertions .assertTrue (ctx .form ().isPresent ());
149- Assertions .assertFalse (ctx .form ().isMissing ());
150- Assertions .assertEquals ("bar" , ctx .form ().get ("foo" ).value ());
151- Assertions .assertEquals ("bar" , ctx .form ("foo" ).value ());
152- Assertions .assertEquals ("bar" , ctx .form ().toMap ().get ("foo" ));
153- Assertions .assertEquals ("bar" , ctx .formMap ().get ("foo" ));
154- });
190+ // get body().value() before calling form methods
191+ () ->
192+ Assertions .assertThrows (
193+ MissingValueException .class , () -> ctx .body ().value ()),
194+ () ->
195+ Assertions .assertEquals (
196+ 1 , ctx .form ().size (), "form contains one entry" ),
197+ () -> Assertions .assertTrue (ctx .form ().isPresent ()),
198+ () -> Assertions .assertFalse (ctx .form ().isMissing ()),
199+ () -> Assertions .assertEquals ("bar" , ctx .form ().get ("foo" ).value ()),
200+ () -> Assertions .assertEquals ("bar" , ctx .form ("foo" ).value ()),
201+ () -> Assertions .assertEquals ("bar" , ctx .form ().toMap ().get ("foo" )),
202+ () -> Assertions .assertEquals ("bar" , ctx .formMap ().get ("foo" )));
155203 return "OK" ;
156204 } catch (Exception ex ) {
157- ex .printStackTrace ();
158205 ctx .setResponseCode (500 );
159206 return ex .getMessage ();
160207 }
161208 }))
162209 .ready (
163210 http -> {
164- http .post (
165- "/" ,
166- new FormBody .Builder ().add ("foo" , "bar" ).build (),
167- rsp -> {
168- Assertions .assertEquals ("OK" , rsp .body ().string ());
169- Assertions .assertEquals (200 , rsp .code ());
170- });
211+ // http.post(
212+ // "/",
213+ // new FormBody.Builder().add("foo", "bar").build(),
214+ // rsp -> {
215+ // Assertions.assertEquals("OK", rsp.body().string());
216+ // Assertions.assertEquals(200, rsp.code());
217+ // });
171218
172219 http .post (
173220 "/" ,
174- new MultipartBody .Builder ()
175- .setType (MultipartBody .FORM )
176- .addFormDataPart ("foo" , "bar" )
177- .build (),
221+ customForm (
222+ Map .of ("foo" , "bar" ), "application/x-www-form-urlencoded; charset=utf-8" ),
178223 rsp -> {
179224 Assertions .assertEquals ("OK" , rsp .body ().string ());
180225 Assertions .assertEquals (200 , rsp .code ());
181226 });
227+
228+ // http.post(
229+ // "/",
230+ // new MultipartBody.Builder()
231+ // .setType(MultipartBody.FORM)
232+ // .addFormDataPart("foo", "bar")
233+ // .build(),
234+ // rsp -> {
235+ // Assertions.assertEquals("OK", rsp.body().string());
236+ // Assertions.assertEquals(200, rsp.code());
237+ // });
182238 });
183239 }
184240}
0 commit comments