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

1742 Commits

Author SHA1 Message Date
Sam Brannen
2074afc87f Polish Javadoc 
See gh-23075
 2019-06-04 16:55:51 +03:00
Arjen Poutsma
145610129b Javadoc 
Closes gh-23075
 2019-06-04 15:31:27 +02:00
Brian Clozel
4b8ce04bdc Mark Spring web config classes as proxyBeanMethods=false 
Closes gh-23004
 2019-05-28 19:11:35 +02:00
Johnny Lim
83078eb6fd Add constants for application/cbor to MediaType 
Closes gh-23042
 2019-05-28 18:51:25 +02:00
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
Sam Brannen
09db8881bb Fix Checkstyle violation 2019-05-26 14:28:09 +02:00
stsypanov
4cc7b9b9fc tiny simplifications regarding usage of Iterator 2019-05-25 20:32:43 +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
Juergen Hoeller
8a33ef2d14 Merge branch '5.1.x' 2019-05-21 21:06:38 +02:00
Juergen Hoeller
5aa0de7ac8 Upgrade to OkHttp 3.14.2, Joda-Time 2.10.2, OpenPDF 1.2.17, JRuby 9.2.7 2019-05-21 20:47:06 +02:00
Arjen Poutsma
9b3c92e8d2 Add leading slash for path predicate if not present 
This commit adds a leading slash for path predicates in both
WebFlux.fn and WebMvc.fn.

Closes gh-22795
 2019-05-21 12:09:36 +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
Juergen Hoeller
a363fed209 Merge branch '5.1.x' 2019-05-20 17:21:07 +02:00
Juergen Hoeller
c5d6b74321 Fix stale-if-error xsd documentation 
Closes gh-22983
 2019-05-20 17:18:11 +02:00
stsypanov
9ca8681f79 Iteration over a map using EntrySet 2019-05-13 15:38:13 +02:00
Juergen Hoeller
cfc4a59135 Merge branch '5.1.x' 2019-05-13 13:40:07 +02:00
Juergen Hoeller
daee6f5bd9 Avoid expensive assertions in web resource resolution 
Closes gh-22955
 2019-05-13 13:28:07 +02:00
Johnny Lim
9a6ce66bd9 Add a missing single quote in assertion message 2019-05-13 12:04:22 +02: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
64819bbc1d Clean up warnings 2019-05-10 18:00:29 +02:00
Sam Brannen
e465f51d56 Suppress deprecation warnings 2019-05-09 13:21:42 +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
Sam Brannen
4038d590a1 Suppress deprecation warning in Gradle build 2019-05-08 17:18:41 +02:00
Sam Brannen
4d1637a9b7 Avoid warnings in RequestMappingHandlerMappingTests 2019-05-08 16:29:31 +02: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
45147c23c1 Empty body checks in ConsumesRequestCondition 
Normally consumes matches the "Content-Type" header but what should be done if
there is no content? This commit adds checks for method parameters with
@RequestBody(required=false) and if "false" then also match requests with no content.

Closes gh-22010
 2019-05-07 22:03:36 -04:00
Arjen Poutsma
00a5106bfa Add route(RequestPredicate, HandlerFunction) to RouterFunctions builder 
Closes gh-22701
 2019-05-07 16:49:02 +02:00
Arjen Poutsma
55b56b8c5c Javadoc 
Closes gh-22893
 2019-05-07 15:24:33 +02:00
Sam Brannen
ccb01e663a Merge branch '5.1.x' 2019-05-07 13:03:45 +02:00
Sam Brannen
4aaec942c4 Introduce HTTPS mappings in spring.schemas files 
Closes gh-22903
 2019-05-07 12:56:42 +02:00
Rossen Stoyanchev
53cadf15e7 Deferred handling of Flux error in Spring MVC 
This commit defers flushing of the response until the first item is
emitted that needs to be written (and flushed) to the response.

This makes Spring MVC consistent with WebFlux in this regard.

Closes gh-21972
 2019-05-06 12:26:25 -04:00
Sam Brannen
d616e10dca Use assertThat from Hamcrest instead of JUnit 4 
org.junit.Assert.assertThat() is deprecated as of JUnit 4.13.

See gh-22894
 2019-05-05 19:26:04 +02:00
Johnny Lim
d489227874 Use HttpHeaders constants where possible 2019-05-04 11:14:08 +02:00
Juergen Hoeller
f0f6af2926 Merge branch '5.1.x' 2019-05-03 18:13:12 +02:00
Juergen Hoeller
a7949ac84a Consistent use of StringUtils.hasLength(String) vs isEmpty(Object) 2019-05-03 17:29:14 +02:00
Juergen Hoeller
eaa9a78d5d Merge branch '5.1.x' 2019-05-03 00:23:57 +02:00
Juergen Hoeller
31c3b8a291 Avoid unguarded String concatenation for debug/trace logging 
Closes gh-22874
 2019-05-03 00:10:56 +02:00
Juergen Hoeller
8a57997d21 Avoid use of Objects.requireNonNull plus related polishing 2019-05-02 16:32:47 +02:00
Rossen Stoyanchev
07c9a0e1f5 Merge branch '5.1.x' 2019-05-01 04:03:21 -04:00
Rossen Stoyanchev
b398216191 Fail proactively if lookupPath not in requestUri 
Closes gh-22851
 2019-05-01 03:57:44 -04:00
Rossen Stoyanchev
b5327ef60f Fix regression in ProducesRequestCondition 
Closes gh-22853
 2019-05-01 02:59:19 -04:00
Juergen Hoeller
52657b68ea Merge branch '5.1.x' 2019-04-30 18:55:34 +02:00
Juergen Hoeller
e0423fbdc2 Revise inline comment for logException call 
Closes gh-22794
 2019-04-30 18:42:53 +02:00
Juergen Hoeller
359c4f091e Add rejectInvalidCookies flag to CookieLocaleResolver 
Closes gh-22861
 2019-04-30 18:39:58 +02:00