Commit Graph

488 Commits

Author SHA1 Message Date
Stephane Nicoll
957321492f Merge branch '1.5.x' into 2.0.x 2018-09-20 10:24:57 +02:00
Stephane Nicoll
3469142fec Partially revert 59d911d
This commit restores the public `UsesUnsafeJava` and flag it as
deprecated.

Closes gh-14072
2018-09-05 09:42:18 +02:00
Madhura Bhave
9c82d5c382 Make ApplicationContextServerWebExchangeMatcher and subclasses thread-safe
Fixes gh-14161
2018-09-04 17:06:24 -07:00
Phillip Webb
cafff43022 Update copyright header of changed files 2018-09-04 16:19:05 -07:00
Phillip Webb
9af6b3422f Polish 2018-09-04 16:18:47 -07:00
Stephane Nicoll
ea2fb620b4 Clarify structure of prefixes
Closes gh-14258
2018-08-31 15:23:53 +02:00
Phillip Webb
2e2f91d4a0 Merge branch '1.5.x' into 2.0.x 2018-08-30 15:59:02 -07:00
dreis2211
70add0617a Collapse identical catch blocks
Closes gh-14213
2018-08-27 18:18:06 +02:00
Johnny Lim
fb71174c24 Polish
Closes gh-14184
2018-08-24 11:48:41 +02:00
Madhura Bhave
55406d91d2 Consider dash & underscore when equating indexed elements
Fixes gh-14136
2018-08-21 12:53:25 -07:00
Hiroaki Yoshida
6e86ba12b7 Fix potential infinite recursive loop in toString
Closes gh-14152
2018-08-21 10:02:10 +02:00
Stephane Nicoll
e03f01564a Deprecate EntityManagerFactoryBeanCallback
Closes gh-14083
2018-08-20 14:54:32 +02:00
Stephane Nicoll
e034b383db Fix checkstyle violation
Closes gh-14125
2018-08-20 11:19:01 +02:00
Stephane Nicoll
eedeaa29e5 Polish "Replace loops with Arrays.setAll where possible"
Closes gh-14125
2018-08-20 10:23:16 +02:00
dreis2211
0bc66dc4a9 Replace loops with Arrays.setAll where possible
See gh-14125
2018-08-20 10:16:50 +02:00
artsiom
51fd27fad4 Configure HiddenHttpMethodFilter for Spring WebFlux
Closes gh-14008
2018-08-17 13:40:43 +02:00
dreis2211
59d911d6e0 Remove @UsesUnsafeJava annotations
Closes gh-14072
2018-08-15 14:36:51 +03:00
Johnny Lim
b4abccc07c Polish
See gh-14049
2018-08-15 10:43:04 +03:00
Madhura Bhave
895d092640 PropertySourcesLoader with highest precedence should win
Fixes gh-13955
2018-08-14 11:23:55 -07:00
Madhura Bhave
dfb97eb0f5 Convert environment if webApplicationType changes
If the web application type is set via properties,
it is available only after binding. The environment needs
to be converted to the appropriate type if it does not match.
If a custom environment is set, it is not converted.

Fixes gh-13977
2018-08-13 12:12:30 -07:00
Andy Wilkinson
263e157ef0 Merge branch '1.5.x' into 2.0.x 2018-08-10 12:50:15 +01:00
Stephane Nicoll
20ea16fe9f Merge branch '1.5.x' into 2.0.x 2018-08-03 09:37:01 +02:00
Madhura Bhave
16aff4cd2c Refactor PropertySourcesDeducer
Prior to the changes that fixed #12451,
`FilteredPropertySources` and `CompositePropertySources` were required
by the `PropertySourcesDeducer` to ensure that configuration properties binding
could see changes to the environment even when there was a
PropertySourcesPlaceholderConfigurer in the context. #12451 changed the way
property sources are adapted by `SpringConfigurationPropertySources`, removing the
need for `FilteredPropertySources` and `CompositePropertySources`.

Fixes gh-13738
2018-08-02 15:00:01 -07:00
Madhura Bhave
7e2494ebdd Set environment active profiles according to processing order
Fixes gh-13965
2018-08-02 11:01:22 -07:00
Johnny Lim
94468e5865 Polish
See gh-13963
2018-08-01 11:04:59 +02:00
dreis2211
66b1742f96 Optimize some StringBuilder.append() calls
Closes gh-13961
2018-08-01 08:41:03 +02:00
Johnny Lim
d4fba783fb Remove ex.printStackTrace() in tests
Closes gh-13952
2018-07-31 08:16:40 +02:00
Andy Wilkinson
06b4007ce4 Avoid installing unwanted ConsoleHandler when cleaning up
Closes gh-13470
2018-07-30 13:00:34 +01:00
Phillip Webb
0ec22c8bf9 Polish copyright date on changed files 2018-07-29 09:29:29 +01:00
Phillip Webb
aeb885192e Polish ternary expressions 2018-07-29 09:24:46 +01:00
Phillip Webb
63b609827e Fix checkstyle method order issues
Fix checkstyle issues with method ordering following the
spring-javaformat upgrade.

See gh-13932
2018-07-28 01:11:53 +01:00
Phillip Webb
e6a68b39a3 Fix checkstyle javadoc issues
Fix checkstyle issues in javadoc following the spring-javaformat
upgrade.

See gh-13932
2018-07-28 01:11:52 +01:00
Phillip Webb
7fc455654a Fix checkstyle ternary issues
Fix checkstyle issues with ternary expressions following the
spring-javaformat upgrade.

See gh-13932
2018-07-28 01:11:52 +01:00
Madhura Bhave
1831f3be16 Fix NPE when Collection contains unbound children
Fixes gh-13636
2018-07-24 17:42:51 -07:00
Stephane Nicoll
dcb68d4c64 Deprecate unused property
Closes gh-13836
2018-07-23 09:31:02 +02:00
Madhura Bhave
66156cc24f Polish 2018-07-18 10:29:43 -07:00
Andy Wilkinson
53400b1d81 Merge branch '1.5.x' into 2.0.x 2018-07-18 11:15:40 +01:00
Madhura Bhave
e907ae605d Fix tests
See gh-13783
2018-07-17 17:08:53 -07:00
Madhura Bhave
9bd723ddad Fix exception message
Fixes gh-13783
2018-07-17 17:05:29 -07:00
Johnny Lim
068e22d60b Polish
See gh-13776
2018-07-16 10:34:00 +02:00
Johnny Lim
4314dc2972 Remove a List creation in CompositePropertySources.iterator()
Closes gh-13774
2018-07-16 10:20:49 +02:00
Andy Wilkinson
44273ee093 Merge branch '1.5.x' into 2.0.x 2018-07-11 14:38:49 +01:00
Stephane Nicoll
3423c5dddb Detect DispatcherServlets registered via ServletRegistrationBean
Previously, when a DispatcherServlet was registered via a
ServletRegistrationBean, the mappings endpoint did not expose any
information about it as it wasn't detected.

This commit fixes the detection of available DispatcherServlets in the
context so that the mappings endpoint include them all.

Closes gh-13186
2018-07-10 17:06:36 +02:00
Johnny Lim
ab6adc8265 Polish
Closes gh-13616
2018-07-09 10:45:01 +02:00
Madhura Bhave
673a08d228 Support microseconds in Duration conversions
Closes gh-13624
2018-07-02 13:18:09 -07:00
Andy Wilkinson
06a8c41943 Preserve trailing whitespace in origin-tracked property values
Closes gh-13602
2018-07-02 19:17:02 +01:00
dreis2211
17edf0e2fe Fix typo 2018-06-27 11:31:06 -07:00
Andy Wilkinson
fd125b4a4a Remove assumption that a file URI can be turned into a File
Closes gh-13493
2018-06-21 12:47:23 +01:00
Andy Wilkinson
2624748911 Merge branch '1.5.x' into 2.0.x 2018-06-21 11:41:02 +01:00
Andy Wilkinson
4fc0a33094 Merge branch '1.5.x' into 2.0.x 2018-06-20 16:49:53 +01:00