@@ -111,7 +111,7 @@ void getResource() throws Exception {
111
111
assertThat (headers .containsKey ("Last-Modified" )).isTrue ();
112
112
assertThat (resourceLastModifiedDate ("test/foo.css" ) / 1000 ).isEqualTo (headers .getLastModified () / 1000 );
113
113
assertThat (headers .getFirst ("Accept-Ranges" )).isEqualTo ("bytes" );
114
- assertThat (headers .get ("Accept-Ranges" ). size ()). isEqualTo (1 );
114
+ assertThat (headers .get ("Accept-Ranges" )). hasSize (1 );
115
115
assertResponseBody (exchange , "h1 { color:red; }" );
116
116
}
117
117
@@ -157,14 +157,14 @@ void getResourceNoCache() throws Exception {
157
157
assertThat (response .getHeaders ().containsKey ("Last-Modified" )).isTrue ();
158
158
assertThat (resourceLastModifiedDate ("test/foo.css" ) / 1000 ).isEqualTo (response .getHeaders ().getLastModified () / 1000 );
159
159
assertThat (response .getHeaders ().getFirst ("Accept-Ranges" )).isEqualTo ("bytes" );
160
- assertThat (response .getHeaders ().get ("Accept-Ranges" ). size ()). isEqualTo (1 );
160
+ assertThat (response .getHeaders ().get ("Accept-Ranges" )). hasSize (1 );
161
161
}
162
162
163
163
@ Test
164
164
void getVersionedResource () throws Exception {
165
165
VersionResourceResolver versionResolver = new VersionResourceResolver ();
166
166
versionResolver .addFixedVersionStrategy ("versionString" , "/**" );
167
- this .handler .setResourceResolvers (Arrays . asList (versionResolver , new PathResourceResolver ()));
167
+ this .handler .setResourceResolvers (List . of (versionResolver , new PathResourceResolver ()));
168
168
this .handler .afterPropertiesSet ();
169
169
170
170
MockServerWebExchange exchange = MockServerWebExchange .from (MockServerHttpRequest .get ("" ));
@@ -173,7 +173,7 @@ void getVersionedResource() throws Exception {
173
173
174
174
assertThat (exchange .getResponse ().getHeaders ().getETag ()).isEqualTo ("W/\" versionString\" " );
175
175
assertThat (exchange .getResponse ().getHeaders ().getFirst ("Accept-Ranges" )).isEqualTo ("bytes" );
176
- assertThat (exchange .getResponse ().getHeaders ().get ("Accept-Ranges" ). size ()). isEqualTo (1 );
176
+ assertThat (exchange .getResponse ().getHeaders ().get ("Accept-Ranges" )). hasSize (1 );
177
177
}
178
178
179
179
@ Test
@@ -188,7 +188,7 @@ void getResourceWithHtmlMediaType() throws Exception {
188
188
assertThat (headers .containsKey ("Last-Modified" )).isTrue ();
189
189
assertThat (resourceLastModifiedDate ("test/foo.html" ) / 1000 ).isEqualTo (headers .getLastModified () / 1000 );
190
190
assertThat (headers .getFirst ("Accept-Ranges" )).isEqualTo ("bytes" );
191
- assertThat (headers .get ("Accept-Ranges" ). size ()). isEqualTo (1 );
191
+ assertThat (headers .get ("Accept-Ranges" )). hasSize (1 );
192
192
}
193
193
194
194
@ Test
@@ -204,7 +204,7 @@ void getResourceFromAlternatePath() throws Exception {
204
204
assertThat (headers .containsKey ("Last-Modified" )).isTrue ();
205
205
assertThat (resourceLastModifiedDate ("testalternatepath/baz.css" ) / 1000 ).isEqualTo (headers .getLastModified () / 1000 );
206
206
assertThat (headers .getFirst ("Accept-Ranges" )).isEqualTo ("bytes" );
207
- assertThat (headers .get ("Accept-Ranges" ). size ()). isEqualTo (1 );
207
+ assertThat (headers .get ("Accept-Ranges" )). hasSize (1 );
208
208
assertResponseBody (exchange , "h1 { color:red; }" );
209
209
}
210
210
@@ -268,7 +268,7 @@ void getResourceFromFileSystem() throws Exception {
268
268
269
269
@ Test // gh-27538, gh-27624
270
270
void filterNonExistingLocations () throws Exception {
271
- List <Resource > inputLocations = Arrays . asList (
271
+ List <Resource > inputLocations = List . of (
272
272
new ClassPathResource ("test/" , getClass ()),
273
273
new ClassPathResource ("testalternatepath/" , getClass ()),
274
274
new ClassPathResource ("nosuchpath/" , getClass ()));
@@ -437,7 +437,7 @@ void initAllowedLocationsWithExplicitConfiguration() throws Exception {
437
437
438
438
ResourceWebHandler handler = new ResourceWebHandler ();
439
439
handler .setResourceResolvers (List .of (pathResolver ));
440
- handler .setLocations (Arrays . asList (location1 , location2 ));
440
+ handler .setLocations (List . of (location1 , location2 ));
441
441
handler .afterPropertiesSet ();
442
442
443
443
assertThat (pathResolver .getAllowedLocations ()).containsExactly (location1 );
@@ -545,7 +545,7 @@ void partialContentByteRange() {
545
545
assertThat (exchange .getResponse ().getHeaders ().getContentLength ()).isEqualTo (2 );
546
546
assertThat (exchange .getResponse ().getHeaders ().getFirst ("Content-Range" )).isEqualTo ("bytes 0-1/10" );
547
547
assertThat (exchange .getResponse ().getHeaders ().getFirst ("Accept-Ranges" )).isEqualTo ("bytes" );
548
- assertThat (exchange .getResponse ().getHeaders ().get ("Accept-Ranges" ). size ()). isEqualTo (1 );
548
+ assertThat (exchange .getResponse ().getHeaders ().get ("Accept-Ranges" )). hasSize (1 );
549
549
assertResponseBody (exchange , "So" );
550
550
}
551
551
@@ -561,7 +561,7 @@ void partialContentByteRangeNoEnd() {
561
561
assertThat (exchange .getResponse ().getHeaders ().getContentLength ()).isEqualTo (1 );
562
562
assertThat (exchange .getResponse ().getHeaders ().getFirst ("Content-Range" )).isEqualTo ("bytes 9-9/10" );
563
563
assertThat (exchange .getResponse ().getHeaders ().getFirst ("Accept-Ranges" )).isEqualTo ("bytes" );
564
- assertThat (exchange .getResponse ().getHeaders ().get ("Accept-Ranges" ). size ()). isEqualTo (1 );
564
+ assertThat (exchange .getResponse ().getHeaders ().get ("Accept-Ranges" )). hasSize (1 );
565
565
assertResponseBody (exchange , "." );
566
566
}
567
567
@@ -577,7 +577,7 @@ void partialContentByteRangeLargeEnd() {
577
577
assertThat (exchange .getResponse ().getHeaders ().getContentLength ()).isEqualTo (1 );
578
578
assertThat (exchange .getResponse ().getHeaders ().getFirst ("Content-Range" )).isEqualTo ("bytes 9-9/10" );
579
579
assertThat (exchange .getResponse ().getHeaders ().getFirst ("Accept-Ranges" )).isEqualTo ("bytes" );
580
- assertThat (exchange .getResponse ().getHeaders ().get ("Accept-Ranges" ). size ()). isEqualTo (1 );
580
+ assertThat (exchange .getResponse ().getHeaders ().get ("Accept-Ranges" )). hasSize (1 );
581
581
assertResponseBody (exchange , "." );
582
582
}
583
583
@@ -593,7 +593,7 @@ void partialContentSuffixRange() {
593
593
assertThat (exchange .getResponse ().getHeaders ().getContentLength ()).isEqualTo (1 );
594
594
assertThat (exchange .getResponse ().getHeaders ().getFirst ("Content-Range" )).isEqualTo ("bytes 9-9/10" );
595
595
assertThat (exchange .getResponse ().getHeaders ().getFirst ("Accept-Ranges" )).isEqualTo ("bytes" );
596
- assertThat (exchange .getResponse ().getHeaders ().get ("Accept-Ranges" ). size ()). isEqualTo (1 );
596
+ assertThat (exchange .getResponse ().getHeaders ().get ("Accept-Ranges" )). hasSize (1 );
597
597
assertResponseBody (exchange , "." );
598
598
}
599
599
@@ -609,7 +609,7 @@ void partialContentSuffixRangeLargeSuffix() {
609
609
assertThat (exchange .getResponse ().getHeaders ().getContentLength ()).isEqualTo (10 );
610
610
assertThat (exchange .getResponse ().getHeaders ().getFirst ("Content-Range" )).isEqualTo ("bytes 0-9/10" );
611
611
assertThat (exchange .getResponse ().getHeaders ().getFirst ("Accept-Ranges" )).isEqualTo ("bytes" );
612
- assertThat (exchange .getResponse ().getHeaders ().get ("Accept-Ranges" ). size ()). isEqualTo (1 );
612
+ assertThat (exchange .getResponse ().getHeaders ().get ("Accept-Ranges" )). hasSize (1 );
613
613
assertResponseBody (exchange , "Some text." );
614
614
}
615
615
0 commit comments