Andy Wilkinson
e2d6280d83
Merge branch '1.5.x' into 2.0.x
2018-06-20 13:56:55 +01:00
Stephane Nicoll
864a6b3e91
Merge branch '1.5.x' into 2.0.x
2018-06-19 20:59:27 +02:00
Stephane Nicoll
7ae82b070b
Stop calling Charset.availableCharsets() early
...
This is no longer required as Spring Framework has been updated to
invoke this method lazily as well.
Closes gh-13423
2018-06-19 14:12:00 +02:00
Stephane Nicoll
62c93a4b9a
Add missing `@ConditionalOnClass` check on RedisCacheConfiguration
...
Closes gh-13508
2018-06-18 17:54:10 +02:00
Madhura Bhave
4194baad91
Don't log p/w when AuthenticationManagerBuilder configured
...
Fixes gh-12872
2018-06-07 12:52:15 -07:00
Madhura Bhave
f7ff8dd165
Make generated password output consistent
2018-06-07 12:39:46 -07:00
Brian Clozel
7cbbd95fc9
Ignore invalid Accept headers in WebFlux error handling
...
Prior to this commit, the `DefaultErrorWebExceptionHandler` would parse
the HTTP "Accept" headers when routing the request to the error handler;
if an error occured during parsing, an `InvalidMediaTypeException` would
be thrown and break the error handling for this request.
This commit ignores those exceptions and makes sure that the error
handling function does not override the response status or the error
itself with those exceptions.
Closes: gh-13372
2018-06-06 14:02:04 +02:00
Phillip Webb
571c50e43f
Switch to functional web code to use static imports
...
Update the samples and tests to use the more idiomatic static import
style.
2018-06-04 17:27:34 -07:00
Dmytro Nosan
20003489be
Auto-configure jOOQ with TransactionListenerProvider
...
Closes gh-13331
2018-06-04 17:35:40 +02:00
Stephane Nicoll
a9b2826c26
Merge branch '1.5.x' into 2.0.x
2018-06-04 14:14:52 +02:00
Johnny Lim
6b0ce46491
Polish
...
Closes gh-13320
2018-06-01 09:22:20 +02:00
Stephane Nicoll
20e349c332
Polish
2018-05-31 17:35:56 +02:00
Stephane Nicoll
32aa5b9bae
Merge branch '1.5.x' into 2.0.x
2018-05-31 16:38:23 +02:00
Phillip Webb
f8ec2e6176
Polish
2018-05-30 21:01:31 -07:00
Phillip Webb
09fa1e7e11
Polish
2018-05-30 12:12:01 -07:00
Johnny Lim
4eb070767c
Remove an unnecessary @QuartzDataSource
...
Closes gh-13302
2018-05-30 17:49:21 +02:00
dreis2211
3ed31d60dc
Add assertion in IntegrationAutoConfigurationTests
...
Closes gh-13280
2018-05-29 09:04:00 +02:00
Stephane Nicoll
8a9d0bd22a
Merge branch '1.5.x' into 2.0.x
2018-05-28 14:28:45 +02:00
Johnny Lim
f385a1cb11
Polish
...
Closes gh-13243
2018-05-28 09:36:15 +02:00
Phillip Webb
6f0ccc64a5
Fix checkstyle violations
2018-05-25 23:03:17 -07:00
Phillip Webb
9fd3b9103a
Format code
2018-05-25 23:02:45 -07:00
Phillip Webb
9c5f207e22
Fix merge error
2018-05-25 20:57:46 -07:00
Phillip Webb
21d80d87a3
Merge branch '1.5.x' into 2.0.x
2018-05-25 18:45:37 -07:00
Phillip Webb
2dc4f1df00
Polish
2018-05-21 21:32:42 -07:00
Phillip Webb
6d8b4710d7
Merge branch '1.5.x' into 2.0.x
2018-05-21 17:18:49 -07:00
Stephane Nicoll
125b5974c0
Merge branch '1.5.x' into 2.0.x
2018-05-17 16:17:55 +02:00
Johnny Lim
652bbf4ab2
Polish DefaultErrorWebExceptionHandler.renderErrorView()
...
Closes gh-13174
2018-05-16 09:28:26 +02:00
Johnny Lim
b9aa934d78
Remove @Deprecated on CouchbaseProperties.Endpoints.setKeyValue()
...
Closes gh-13171
2018-05-15 15:09:35 +02:00
Stephane Nicoll
8f53c2e2bb
Support for custom comment prefix
...
Some Quartz initialization scripts have comments in a different format.
This commit introduces a `comment-prefix` property that should be set by
the user if their target database has a script that contains those
unusual comments.
Closes gh-13041
2018-05-14 09:32:42 +02:00
Johnny Lim
3dd2f5bb05
Polish
...
See gh-13148
2018-05-14 08:19:10 +02:00
Johnny Lim
aa60d60b8a
Polish JpaProperties.determineDdlAuto()
...
Closes gh-13036
2018-05-14 08:13:06 +02:00
dreis2211
e6a23fa3ff
Remove unnecessary semicolons
...
Closes gh-13144
2018-05-11 14:23:47 +02:00
Johnny Lim
75e591e76e
Polish
...
Closes gh-13130
2018-05-11 10:00:15 +02:00
Stephane Nicoll
4683940423
Merge branch '1.5.x' into 2.0.x
2018-05-11 09:56:54 +02:00
Andy Wilkinson
c826310fd1
Polish
2018-05-09 08:44:15 +01:00
Stephane Nicoll
c22e9a5514
Make sure that JpaProperties does not have Hibernate imports
...
This commit removes Hibernate imports from JpaProperties so that it can
be used with another JPA provider.
This commit is a breaking change for an internal, yet public class used
to transmit customizations provided by the user. It does not change the
external functionality though: naming strategies defined as bean are
still taken into account and a customizer has a chance to override it
regardless.
Closes gh-13043
2018-05-05 07:21:50 +02:00
Phillip Webb
975e986fef
Polish
2018-05-04 20:06:27 -07:00
Phillip Webb
f9750248ef
Migrate KafkaProperties to use PropertyMapper
2018-05-04 20:06:11 -07:00
Phillip Webb
6de479fe6a
Polish
2018-05-04 16:08:05 -07:00
Madhura Bhave
6855c5556d
EndpointRequest should consider server.servlet.path
...
Fixes gh-12934
2018-05-04 16:03:31 -07:00
Phillip Webb
5b3cb8a698
Update copyright header year for changed files
2018-05-04 15:59:26 -07:00
Phillip Webb
6e09e497f2
Formatting
2018-05-04 12:06:19 -07:00
Stephane Nicoll
18b1e8da60
Merge branch '1.5.x' into 2.0.x
2018-05-04 16:57:12 +02:00
Phillip Webb
2d70a7ae5e
Polish caught exception names
...
Prefer `ex` over `e`.
2018-05-03 22:43:32 -07:00
Phillip Webb
41efea51a7
Polish ternary expressions
...
Consistently format ternary expressions and always favor `!=` as the
the check.
2018-05-03 22:43:12 -07:00
Phillip Webb
e125085993
Merge branch '1.5.x' into 2.0.x
2018-05-03 12:43:50 -07:00
Stephane Nicoll
700ec6b840
Polish "Complete SSL configuration for Kafka"
...
Closes gh-13031
2018-05-03 15:50:33 +02:00
Toshiaki Maki
d208641c59
Complete SSL configuration for Kafka
...
See gh-13031
2018-05-03 15:38:49 +02:00
Stephane Nicoll
69ab956e8b
Stop assuming datasource creation failure originates from auto-config
...
There are documented way to reuse bits of the infrastructure in user
config to offer similar datasource configuration. If that fails, the
regular failure there will kick in.
This commit improves `DataSourceBeanCreationFailureAnalyzer` to not
misguide users that the auto-configuration has failed. Rather, it
describes what has failed in a more generic way.
Closes gh-12947
2018-05-03 11:46:27 +02:00
Stephane Nicoll
d6244889f5
Add default value for "spring.flyway.locations"
...
See gh-12193
2018-05-02 16:07:38 +02:00
Andy Wilkinson
f019d5c85b
Merge branch '1.5.x' into 2.0.x
2018-05-02 12:22:04 +01:00
Stephane Nicoll
fbf8f57773
Merge branch '1.5.x' into 2.0.x
2018-05-02 10:41:24 +02:00
Stephane Nicoll
9f7be62687
Backport polish commit "22b99a90"
2018-05-01 11:33:26 -07:00
Johnny Lim
d8700522d3
Rename nested *AutoConfiguration classes to *Configuration
...
Closes gh-12989
2018-04-30 16:50:18 +02:00
Madhura Bhave
0385bd4131
Use spring.session.timeout for Spring Session timeout
...
Fallback to server.servlet.session.timeout for backwards compatibility.
Fixes gh-12906
2018-04-27 13:16:17 -07:00
Johnny Lim
b941c5f1a6
Polish
...
Closes gh-12981
2018-04-27 09:29:16 +02:00
Brian Clozel
e3e404f9f9
Fix optional ContentNegotiationStrategy for Actuator
...
Since https://jira.spring.io/browse/SPR-16624 , the contract for
`ContentNegotiationStrategy` has been refined and should never return an
empty list if it's got no preference for a media type, but it should
rather respond with a `"*/*"` instead.
This commit fixes the `OptionalPathExtensionContentNegotiationStrategy`
defined in the Spring MVC auto-configuration to have that behavior.
Fixes gh-12900
2018-04-23 13:48:42 +02:00
dreis2211
a930835b92
Replace <code> tags where possible
...
Closes gh-12922
2018-04-20 07:19:31 +02:00
Stephane Nicoll
38bd4bd58c
Stop associating an Executor bean to Quartz
...
This commits make sure that the Quartz auto-configuration no longer
associates an `Executor` bean if present in the context as Quartz offers
properties to tune it, which would mutate and lead to unexpected
results.
Closes gh-12823
2018-04-12 15:48:20 +02:00
Stephane Nicoll
e4e56bbcc3
Migrate to ApplicationContextRunner
2018-04-12 15:48:20 +02:00
Phillip Webb
ba85cefce3
Polish
2018-04-09 14:50:03 -07:00
Stephane Nicoll
6692301d51
Polish "Replace Couchbase's deprecated methods"
...
Closes gh-12655
2018-04-09 16:17:46 +02:00
Yulin Qin
3236306e53
Replace Couchbase's deprecated methods
...
See gh-12655
2018-04-09 13:22:22 +02:00
Stephane Nicoll
92d9479765
Gracefully handle exclusion of DataSourceAutoConfiguration
...
This commit makes sure that an auto-configuration that requires
`DataSourceProperties` will not break if `DataSourceAutoConfiguration`
has been explicitly excluded.
Closes gh-12512
2018-04-09 10:34:23 +02:00
Madhura Bhave
2f5ab50367
Add @QuartzDataSource for quartz auto-configuration
...
Closes gh-12755
2018-04-05 16:49:04 -07:00
Phillip Webb
41dc70146a
Polish "Prevent warnings when running embedded Artemis"
...
Closes gh-12680
2018-04-04 21:10:35 -07:00
Benjamin Graf
19818b752c
Prevent warnings when running embedded Artemis
...
Configure AddressSettings for DLQ and ExpiryQueue for the embedded
Artemis broker to prevent warnings from being logged.
Closes gh-12680
2018-04-04 21:03:04 -07:00
Phillip Webb
685babc829
Polish "Use lambdas for map entry iteration where possible"
...
Closes gh-12626
2018-04-04 19:36:18 -07:00
igor-suhorukov
69bc19e0ca
Use lambdas for map entry iteration where possible
...
See gh-12626
2018-04-04 19:36:10 -07:00
Phillip Webb
598e9bb842
Polish
2018-04-04 18:01:25 -07:00
Phillip Webb
d49a1024bd
Merge branch '1.5.x'
2018-04-04 15:35:20 -07:00
Phillip Webb
6fb4fba43a
Merge branch '1.5.x'
2018-04-04 12:17:57 -07:00
Madhura Bhave
8e81f0c23d
Fix conditions report message for same short name
...
If two auto-configuration classes with the same name are present,
the conditions report message now uses the fully qualified name for
both instead of the short name.
Fixes gh-11710
2018-04-02 12:57:28 -07:00
Phillip Webb
7649eb6230
Allow auto-configure sort with incomplete chain
...
Update `AutoConfigurationSorter` so that all `@AutoConfigureBefore` and
`@AutoConfigureAfter` classes are considered even if they are ultimately
not part of the requested set.
Prior to this commit, given classes ordered with annotations such that
A -> B -> C a call to sort only [A, B] could return the incorrect order.
Fixes gh-12660
2018-03-29 18:00:38 -07:00
Stephane Nicoll
4b4a8acb9d
Group auto-configuration import selectors together
...
This commit updates Spring Boot's DeferredImportSelector implementations
to group imports in a consistent set. This makes sure ordering is
applied consistently.
Closes gh-12366
2018-03-29 17:41:35 -07:00
Phillip Webb
98a2a91d16
Polish
2018-03-29 14:00:13 -07:00
Stephane Nicoll
d456e1de49
Polish contribution
...
Closes gh-12590
2018-03-29 08:53:17 +02:00
Johnny Lim
74f9a84ea9
Make intermediate classes in type hierarchy of public class public
...
See gh-12590
2018-03-29 08:51:46 +02:00
Stephane Nicoll
13f45e6434
Remove misleading Jersey configuration property
...
This commit removes an override of a `ResourceConfig` property that was
set as an init parameter property (and therefore ignored).
Closes gh-3557
2018-03-28 13:53:26 +02:00
Stephane Nicoll
ccbfcbedf0
Add support for org.jooq.RecordUnmapperProvider
...
Closes gh-12560
2018-03-28 13:42:54 +02:00
Stephane Nicoll
42e81e987b
Fix @EnableIntegrationManagement
...
Restore proper use of `defaultCountsEnabled` that was inadvertently
changed to `countsEnabled`
Closes gh-12594
2018-03-27 18:57:41 +02:00
Stephane Nicoll
553b184248
Polish "Use Supplier variants of Assert methods"
...
Closes gh-12630
2018-03-26 17:59:35 +02:00
dreis2211
3b0f6e7168
Use Supplier variants of Assert methods
...
See gh-12630
2018-03-26 17:58:17 +02:00
Stephane Nicoll
62cc4e9552
Polish "Remove value in @ConditionalOnMissingBean if possible"
...
Closes gh-12604
2018-03-26 17:47:00 +02:00
Johnny Lim
c100510222
Remove value in @ConditionalOnMissingBean if possible
...
See gh-12604
2018-03-26 17:38:46 +02:00
Johnny Lim
625bf93598
Polish
...
See gh-12584
2018-03-26 17:33:25 +02:00
Stephane Nicoll
9cac45d514
Polish "Add Redis Sentinel database support"
...
Closes gh-12556
2018-03-26 12:37:37 +02:00
Alen Turkovic
1f80079c49
Add Redis Sentinel database support
...
See gh-12556
2018-03-26 12:33:16 +02:00
igor-suhorukov
21628a9a59
Polish
...
Closes gh-12553
2018-03-20 09:08:21 -04:00
Andy Wilkinson
72e36eadae
Polish
2018-03-17 15:28:05 +00:00
Andy Wilkinson
6c77b012f0
Polish "Follow project convention for lambda expression"
...
Csee gh-12527
2018-03-17 15:23:50 +00:00
igor-suhorukov
261264cef3
Follow project convention for lambda expression
...
Closes gh-12527
2018-03-17 15:22:37 +00:00
Stephane Nicoll
78571f50f8
Restore server.error.include-stacktrace default value
2018-03-17 07:00:09 -04:00
Phillip Webb
79ad03b584
Merge branch '1.5.x'
2018-03-16 15:06:08 -07:00
Phillip Webb
620208a802
Polish
2018-03-16 13:39:50 -07:00
Brian Clozel
0162978c78
Support server.error.whitelabel.enabled in WebFlux
...
This commit disables the default HTML view in the WebFlux error handling
support when `server.error.whitelabel.enabled=false`.
In this case, the original exception will be forwarded down the stream
and handled by the default `WebExceptionHandler` provided by Spring
WebFlux (likely to respond a blank page and an error HTTP response
status).
Closes gh-12520
2018-03-16 16:54:34 +01:00
Brian Clozel
161ecc0575
Bind server.error.whitelabel.enabled to ErrorProperties
...
Closes gh-12516
2018-03-16 16:54:22 +01:00
Andy Wilkinson
2da4897aa8
Polish
2018-03-16 09:57:35 +00:00
Phillip Webb
c201c1dac1
Polish
2018-03-15 16:09:14 -07:00
Madhura Bhave
cb3da28bb9
Enforce length > 1 for H2 and WebServices path
...
Fixes gh-12485
2018-03-15 12:14:28 -07:00