Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
18,767 Commits 18 Branches 0 Tags
f492e37370809324e61e97bf6ccbc414eea13dcf
Commit Graph

2699 Commits

Author SHA1 Message Date
Sam Brannen
141ef9082f Clean up Mockito usage 
This commit migrates to the MockitoJUnitRunner where sensible, which
will later allow for an easier migration to Mockito's extension for
JUnit Jupiter.

In addition, this commit deletes unnecessary stubbing for various mocks
and polishes test fixture setup in various test classes.
 2019-05-28 13:59:43 +02:00
Sebastien Deleuze
bc205e0dbf Remove charset parameter from Spring MVC JSON content type 
This change is a follow-up to the ones done as part of gh-22788.

Closes gh-22954
 2019-05-27 18:14:19 +02:00
Phillip Webb
9d74da006c Migrate JUnit 4 assertions to AssertJ 
Migrate all existing JUnit 4 `assert...` based assertions to AssertJ
and add a checkstyle rule to ensure they don't return.

See gh-23022
 2019-05-23 15:52:49 -07:00
Phillip Webb
95a9d46a87 Migrate Hamcrest assertions to AssertJ 
Migrate all existing `assertThat(..., Matcher)` assertions to AssertJ
and add checkstyle rules to ensure they don't return.

See gh-23022
 2019-05-23 15:49:59 -07:00
Sam Brannen
f806594e60 Introduce getOrEmpty(String) convenience method in HttpHeaders 
This commit introduces a getOrEmpty(String) method in HttpHeaders that
returns an immutable, empty list if no values are present for the
specified header name. This is provided as a convenience over the
existing get(String) method which returns null in such cases.

Closes gh-22949
 2019-05-22 15:26:45 +02:00
Sam Brannen
9ca7354146 Polishing 2019-05-22 15:22:29 +02:00
Sam Brannen
819097a07a Clean up warning in Gradle build 2019-05-22 14:48:40 +02:00
Juergen Hoeller
3645281c35 Polishing 2019-05-21 19:26:39 +02:00
Juergen Hoeller
c329bad42a Merge branch '5.1.x' 2019-05-21 00:16:35 +02:00
Juergen Hoeller
8cd3daad0d Polishing 2019-05-21 00:15:40 +02:00
Juergen Hoeller
171e8f56a3 Merge branch '5.1.x' 2019-05-20 22:27:37 +02:00
Juergen Hoeller
75d751d968 Polishing 2019-05-20 22:19:11 +02:00
Phillip Webb
02850f357f Migrate exception checking tests to use AssertJ 
Migrate tests that use `@Test(expectedException=...)` or
`try...fail...catch` to use AssertJ's `assertThatException`
instead.
 2019-05-20 10:47:53 -07:00
Phillip Webb
fb26fc3f94 Polishing 2019-05-20 10:46:20 -07:00
Juergen Hoeller
a363fed209 Merge branch '5.1.x' 2019-05-20 17:21:07 +02:00
Juergen Hoeller
4c334de850 Use Map.values() iteration within isMultipart check 
Closes gh-22982
 2019-05-20 17:17:51 +02:00
Rossen Stoyanchev
ed2a3bd451 Take advantage of Encoder#encodeValue 
EncoderHttpMessageWriter takes advantage of the Encoder#encodeValue
that's new in 5.2 in order to produce a Mono<DataBuffer> instead of
producing a Flux<DataBuffer> and then using flux.singleOrEmpty().

Closes gh-22952
 2019-05-15 17:31:59 -04:00
Rossen Stoyanchev
013249757a Merge branch '5.1.x' 2019-05-15 16:44:05 -04:00
Rossen Stoyanchev
ffd7cffa14 Fix typo in HttpHeaders 
Closes gh-22976
 2019-05-15 16:42:07 -04:00
Rossen Stoyanchev
0274752fe9 Use singleOrEmpty to avoid upstream cancel 
Closes gh-22952
 2019-05-15 16:02:28 -04:00
Rossen Stoyanchev
97c2de915a Add RouteMatcher 
Closes gh-22642
 2019-05-14 21:44:39 -04:00
Rossen Stoyanchev
afc0ae3752 Add hasPatternSyntax method to PathPattern 2019-05-14 15:36:47 -04:00
Rossen Stoyanchev
ac6c96a391 Polish 2019-05-13 13:45:25 -04:00
Sam Brannen
73dbd06361 Enforces static imports for JUnit 4 assertions and assumptions 
This commit configures Checkstyle to enforces static imports for JUnit 4
assertions and assumptions.

See gh-22932
 2019-05-12 15:13:07 +02:00
Sam Brannen
deecab6311 Use assertThat from Hamcrest instead of JUnit 4 
org.junit.Assert.assertThat() is deprecated as of JUnit 4.13.

See gh-22894
 2019-05-12 14:46:55 +02:00
Sam Brannen
724c805211 Discontinue use of JUnit 3 APIs 
This commit also ensures that the JSR-330 TCK is executed with the
normal build by adhering to naming conventions for test classes.

See gh-22894
 2019-05-12 14:46:55 +02:00
Sam Brannen
9b61316c2e Clean up warnings in spring-web 2019-05-10 17:31:23 +02:00
Sam Brannen
d8f1d56100 Fix broken test 2019-05-09 16:21:54 +02:00
Sebastien Deleuze
c601ecf169 Merge branch '5.1.x' 2019-05-09 15:00:53 +02:00
Sebastien Deleuze
c8d49ed284 Fix EncoderHttpMessageWriter.isStreamingMediaType() 
Closes gh-22936
 2019-05-09 14:57:15 +02:00
Sam Brannen
8e29eca1eb Merge branch '5.1.x' 2019-05-09 13:25:21 +02:00
Sam Brannen
59fdce1116 Fix bug in EncoderHttpMessageWriter.isStreamingMediaType() 2019-05-09 13:24:27 +02:00
Sam Brannen
e465f51d56 Suppress deprecation warnings 2019-05-09 13:21:42 +02:00
Sam Brannen
dc1c110288 Delete dead code 2019-05-09 13:21:27 +02:00
Juergen Hoeller
8b08b6812a Merge branch '5.1.x' 2019-05-09 02:26:23 +02:00
Juergen Hoeller
190b751147 Support any HttpEntity implementing ResolvableTypeProvider 
Closes gh-22931
 2019-05-09 02:09:31 +02:00
Phillip Webb
798b51f4a3 Migrate to BDD Mockito 
Migrate all tests to consistently use BDD Mockito. Also add
checksyle rule to enforce going forwards.
 2019-05-08 13:46:13 -07:00
Phillip Webb
816bbee8de Remove '.*' imports from tests 
Organize test imports to expand all '.*' static imports into
fully qualified imports.

This update will allow us to use additional checkstyle rules in
the future, and will also help if we migrate fully to AssertJ.
 2019-05-08 09:55:09 -07:00
Juergen Hoeller
82d32f0875 Remove unused import 2019-05-08 17:51:54 +02:00
Rossen Stoyanchev
44659f4945 Unwrap Part content in asyncPart builder method 
Closes gh-22876
 2019-05-08 10:59:58 -04:00
Phil Webb
d7320de871 Migrate away from ExpectedException (#22922) 
* Add limited checkstyles to test code

Add a limited set of checkstyle rules to the test codebase to improve
code consistency.

* Fix checksyle violations in test code

* Organize imports to fix checkstyle for test code

* Migrate to assertThatExceptionOfType

Migrate aware from ExpectedException rules to AssertJ exception
assertions. Also include a checkstyle rules to ensure that the
the ExpectedException is not accidentally used in the future.

See gh-22894
 2019-05-08 16:25:52 +02:00
Rossen Stoyanchev
7e6e3d7027 Switch writeAcceptCharset to false by default 
Closes gh-22506
 2019-05-08 09:56:52 -04:00
Rossen Stoyanchev
a9f0eae4ab Merge branch '5.1.x' 2019-05-08 09:41:10 -04:00
Rossen Stoyanchev
6e0dfd6999 Check if Accept-Charset is present before adding it 
Closes gh-22506
 2019-05-08 09:40:32 -04:00
Arjen Poutsma
dc01917dae Javadoc 2019-05-08 12:21:00 +02:00
Arjen Poutsma
e7cca7792d Add way to override default multipartReader 
This commit introduces a way to override the default multipart reader,
for instance to the SynchronossPartHttpMessageReader.
 2019-05-08 12:10:20 +02:00
Arjen Poutsma
32915d8bf5 Add logging to DefaultMultipartMessageReader 2019-05-08 12:10:20 +02:00
Arjen Poutsma
e625ace8c8 Add reference counting for UndertowDataBuffer 
This commit adds proper reference counting to the UndertowDataBuffer.
 2019-05-08 12:09:16 +02:00
Arjen Poutsma
cdd346222c Add reference counting for UndertowDataBuffer 
This commit adds proper reference counting to the UndertowDataBuffer.
 2019-05-08 11:58:48 +02:00
Juergen Hoeller
cdf51c3d51 Nullability refinements and related polishing 2019-05-08 00:27:56 +02:00