Commit Graph

791 Commits

Author SHA1 Message Date
Phillip Webb ce9c053cbf Fix checkstyle issues on master
Fix checkstyle issues following 2.0.x merge and
spring-javaformat upgrade.

See gh-13932
2018-07-28 01:36:04 +01:00
Phillip Webb a6c9c92f2e Merge branch '2.0.x' 2018-07-28 01:35:43 +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
Stephane Nicoll dea1e29683 Merge branch '2.0.x' 2018-07-27 01:56:52 +02:00
Johnny Lim 8a9224b78c Polish NoSuchBeanDefinitionFailureAnalyzer
Closes gh-13923
2018-07-27 01:55:38 +02:00
Stephane Nicoll ec2e3c4c0e Merge branch '2.0.x' 2018-07-27 01:03:37 +02:00
dreis2211 bfbf57b0eb Fix typo
Closes gh-13919
2018-07-27 01:03:01 +02:00
Stephane Nicoll 4b3c40ff10 Merge branch '2.0.x' 2018-07-27 00:47:09 +02:00
Stephane Nicoll 37f1146c31 Fix formatting 2018-07-27 00:45:31 +02:00
Madhura Bhave db1d3fa282 Merge branch '2.0.x' 2018-07-26 12:36:40 -07:00
Madhura Bhave c775ff8f60 Fix import 2018-07-26 12:33:52 -07:00
Madhura Bhave 6fe366bd64 Merge branch '2.0.x' 2018-07-26 12:19:57 -07:00
Madhura Bhave 6bd438a737 Document `@ConditionalOnProperty` limitation with collections
Closes gh-7483
2018-07-26 12:19:06 -07:00
Madhura Bhave 78cb802f98 Merge branch '2.0.x' 2018-07-26 11:39:42 -07:00
Madhura Bhave 57515dfa78 Fix typo 2018-07-26 11:38:23 -07:00
dreis2211 4bb78d5a48 Fix unchecked assignment in AutoConfigurationImportSelector
Closes gh-13908
2018-07-26 17:06:04 +02:00
Phillip Webb b5b60c2053 Merge branch '2.0.x' 2018-07-26 13:23:07 +01:00
Phillip Webb 9a9111af21 Support path discovery for main dispatcher servlet
Add an `DispatcherServletPath` interface which provides a much more
consistent way to discover the path of the main dispatcher servet.

Prior to this commit, auto-configurations would often make use of the
`ServerProperties` class to discover the dispatcher servlet path. This
mechanism isn't very explicit and also makes it hard for us to relocate
that property in Spring Boot 2.1.

This commit also reverts most of fddc9e9c7e since it is now clear that
the supporting multiple dispatcher servlet paths will be much more
involved that we originally anticipated.

Closes gh-13834
2018-07-26 11:35:12 +01:00
Stephane Nicoll bdf028a2e6 Merge branch '2.0.x' 2018-07-25 15:39:01 +02:00
Stephane Nicoll 99f33d5070 Start building against Spring Data Kay snapshots
See gh-13890
2018-07-25 15:34:52 +02:00
Andy Wilkinson 1ab98ca33f Start building against Spring HATEOAS 0.25.0 snapshots
See gh-13742
2018-07-25 15:21:20 +02:00
Stephane Nicoll 56542ef809 Start building against Spring Integration 2.1.0 snapshots
See gh-13891
2018-07-25 14:50:14 +02:00
Madhura Bhave eefa0ada9f Allow property overrides for OIDC Configuration Provider
Closes gh-13869
2018-07-24 15:11:05 -07:00
Madhura Bhave 5011bc6451 Merge branch '2.0.x' 2018-07-24 14:28:01 -07:00
Madhura Bhave 6032b454b0 Polish 2018-07-24 14:11:01 -07:00
Madhura Bhave f5617601aa Polish "Register OAuth2AuthorizedClientRepository bean"
Closes gh-13870
2018-07-24 13:31:03 -07:00
artsiom 2dcf19938d Register OAuth2AuthorizedClientRepository bean 2018-07-24 13:30:36 -07:00
Stephane Nicoll c98bb40136 Adapt NoSuchBeanDefinitionFailureAnalyzer to framework change
This commit adapts to a Spring Framework change based on SPR-11419 and
SPR-15338. Rather than throwing an exception when injecting a List or
Map of a candidate bean that is not present, an empty collection/map is
injected.
2018-07-24 13:36:38 +02:00
Stephane Nicoll 5fb2060566 Polish "Add configuration for Tomcat's cachingAllowed property"
Closes gh-13614
2018-07-24 11:20:35 +02:00
Rob Tompkins 200ac6db30 Add configuration for Tomcat's cachingAllowed property
See gh-13614
2018-07-24 11:18:33 +02:00
Stephane Nicoll dcd230fc00 Merge branch '2.0.x' 2018-07-24 10:38:48 +02:00
Stephane Nicoll 7d2e25f6f8 Merge branch '1.5.x' into 2.0.x 2018-07-24 10:37:31 +02:00
dreis2211 d0918f87b2 Fix OAuth2WebSecurityConfigurationTests
Closes gh-13872
2018-07-24 09:57:42 +02:00
Andy Wilkinson 70dbcba7b6 Merge branch '2.0.x' 2018-07-20 17:04:25 +01:00
Andy Wilkinson daad992c96 Merge branch '1.5.x' into 2.0.x 2018-07-20 17:03:59 +01:00
Stephane Nicoll 11d9a7c30d Merge branch '2.0.x' 2018-07-20 15:51:28 +02:00
Stephane Nicoll fc0a687ee0 Migrate test to ApplicationContextRunner 2018-07-20 15:51:14 +02:00
Madhura Bhave d958e83799 Merge branch '2.0.x' 2018-07-19 15:48:29 -07:00
Madhura Bhave 56235187d0 Fix typo 2018-07-19 15:47:14 -07:00
Andy Wilkinson a33dd8b9cb Merge branch '2.0.x' 2018-07-19 20:43:58 +01:00
Andy Wilkinson 10b91602e9 Increase connect and read timeouts when testing against Cassandra 2018-07-19 20:43:39 +01:00
Stephane Nicoll bc7db86c8c Consistently apply exclude on auto-configuration
Previously, exclude of an import selector was applied only locally. In
other words, if one import selector imports `AcmeAutoConfiguration` and
another one exclude it, it would still be imported because exclude were
applied separately

This commit collects the outcome of all auto-configuration import
selectors and then apply exclusions in a single pass.

Closes gh-12586
2018-07-19 14:08:10 +02:00
Stephane Nicoll 184cd0c708 Avoid CGLIB requirement in MessageSourceAutoConfiguration
Closes gh-13824
2018-07-19 13:58:19 +02:00
Madhura Bhave ceaac98847 Update docs with OIDC provider configuration
See gh-13210
2018-07-18 12:27:13 -07:00
Madhura Bhave f88ebc06ff Add support for OIDC Configuration Provider
Closes gh-13210
2018-07-17 16:02:03 -07:00
Stephane Nicoll 526b50645e Merge branch '2.0.x' 2018-07-17 15:48:26 +02:00
dreis2211 e9a8d4c949 Remove unused AbstractCouchbaseAutoConfigurationTests
Closes gh-13797
2018-07-17 15:48:00 +02:00
Stephane Nicoll 8bf22db9c3 Merge branch '2.0.x' 2018-07-17 15:46:20 +02:00
Stephane Nicoll 6e749ef276 Improve NoSuchBeanDefinitionFailureAnalyzer to handle null beans
Previously, if a user defines a `@Bean` with a method that returns
`null`, injection by type will ignore that definition but the report
doesn't mention that candidate.

This commit improves the failure analyzer to look for user-defined beans
as well, detecting beans that are `null` matching the requested type
and including them in the report.

Closes gh-13531
2018-07-17 15:45:49 +02:00
Stephane Nicoll ada699a9f6 Allow to customize the RabbitMQ RetryTemplate
This commit adds the ability to customize the RetryTemplate used in the
RabbitMQ infrastructure. The customizer is slightly unusual and offer
a `Target` enum that define the component that will use the retry
template: `SENDER` for the auto-configured `RabbitTemplate` and
`LISTENER` for a listener container created by a
`RabbitListenerContainerFactoryConfigurer`.

Closes gh-13793
2018-07-17 11:31:20 +02:00
Stephane Nicoll 43091150d8 Merge branch '2.0.x' 2018-07-17 10:23:12 +02:00
Stephane Nicoll 8095ee4a5b Polish contribution
See gh-13790
2018-07-17 10:12:34 +02:00
Johnny Lim f363fe7dd1 Polish
See gh-13790
2018-07-17 10:03:41 +02:00
Brian Clozel 624cbe08d5 Merge branch '2.0.x' 2018-07-16 23:37:31 +02:00
Brian Clozel 58e886fddf Remove @Lazy injection for HttpMessageConverters
This commit turns a lazy injection point for `HttpMessageConverters`
into an `ObjectProvider`-backed injection.

This allows to lazily rely on that bean without creating for it; in some
environments, such proxy creation can lead to issues like SPR-16990.

See gh-13785
2018-07-16 23:12:47 +02:00
Stephane Nicoll 3c67edafcd Expose more Quartz properties
Closes gh-13782
2018-07-16 14:07:10 +02:00
Stephane Nicoll 66cb4ce3c7 Polish "Allow to configure Quartz's "overwriteExistingJobs" property"
Closes gh-13582
2018-07-16 14:06:13 +02:00
Taras Danylchuk 910e6dc4cc Allow to configure Quartz's "overwriteExistingJobs" property
See gh-13582
2018-07-16 14:06:13 +02:00
Stephane Nicoll 9c0ce3d20a Merge branch '2.0.x' 2018-07-16 10:51:27 +02:00
Johnny Lim f2cef87878 Fix since on JdbcOperationsDependsOnPostProcessor
Closes gh-13778
2018-07-16 10:50:55 +02:00
Brian Clozel 9b60eef0e2 Fix build after SPR-17034 in Spring Framework
Since SPR-17034, the core container now behaves a bit differently when
dealing with `null` beans.

Given a `null` `HandlerMapping` bean named "resourceHandlerMapping":

* `context.getBean("resourceHandlerMapping", HandlerMapping.class)`
still returns a `NullBean`
* `ListableBeanFactory.getBeansOfType` will return a Map of all existing
beans, not including the `null` ones as values of the map.

Closes gh-13760
2018-07-16 10:39:56 +02:00
Johnny Lim 1ae420670a Polish
Closes gh-13776
2018-07-16 10:38:40 +02:00
Stephane Nicoll 48962718d1 Merge branch '2.0.x' 2018-07-16 10:37:43 +02:00
Johnny Lim 068e22d60b Polish
See gh-13776
2018-07-16 10:34:00 +02:00
Andy Wilkinson ac1f2a5817 Polish 2018-07-14 08:45:34 +01:00
Stephane Nicoll 42bba4e1c5 Document Liquibase default values
Closes gh-13765
2018-07-13 13:41:32 +02:00
Andy Wilkinson c59f31218a Revert "Ignore Data Elasticsearch test that fails due to DATAES-470"
Closes gh-13744
2018-07-13 10:59:37 +01:00
Stephane Nicoll 4c7c328972 Polish "Upgrade to Liquibase 3.6.2"
Closes gh-13625
2018-07-13 11:40:45 +02:00
Miguel Gomes b5cb074219 Upgrade to Liquibase 3.6.2
See gh-13625
2018-07-13 11:37:26 +02:00
Stephane Nicoll 8fc1e0ed4e Merge branch '2.0.x' 2018-07-13 07:55:59 +02:00
dreis2211 ac8eebfbad Fix typos
Closes gh-13762
2018-07-13 07:54:03 +02:00
Brian Clozel 2e5f0c2873 Fix WebMvc auto-conf tests after Framework change
This commit adapts to a recent Spring Framework change (a40d25a) that
turns no-op Spring MVC beans (infrastructure components that, given
their configuration, won't contribute anything to the application) into
`NullBean` instances.
2018-07-12 10:04:45 +02:00
Madhura Bhave dba0e1b778 Merge branch '2.0.x' 2018-07-11 15:26:08 -07:00
Madhura Bhave d7822ba135 Update copyright header for modified files 2018-07-11 15:25:39 -07:00
Madhura Bhave 34ebf1a97c Merge branch '2.0.x' 2018-07-11 15:23:00 -07:00
Madhura Bhave c8c32cfa33 Migrate tests to ApplicationContextRunner 2018-07-11 15:06:36 -07:00
Madhura Bhave 6d9fabf5bc Harmonize mongo auto-configuration
Provides a way to easily exclude `MongoAutoConfiguration` or
`MongoReactiveAutoConfiguration` so that multiple mongo clients
are not present.

Fixes gh-12407
2018-07-11 13:15:08 -07:00
Andy Wilkinson cced3514a7 Polish 2018-07-11 17:49:10 +01:00
Andy Wilkinson 889f1bce3f Merge branch '2.0.x' 2018-07-11 17:13:59 +01:00
Andy Wilkinson c489c6c5f6 Polish test following forward merge 2018-07-11 17:13:45 +01:00
Andy Wilkinson f32ab6eade Merge branch '2.0.x' 2018-07-11 16:51:58 +01:00
Andy Wilkinson 67dfa0a720 Merge branch '1.5.x' into 2.0.x 2018-07-11 16:51:43 +01:00
Stephane Nicoll 59749d53b8 Merge branch '2.0.x' 2018-07-11 11:24:06 +02:00
Stephane Nicoll 48819253eb Fix dependency order between JdbcTemplate and database migration tools
This commit makes sure that Flyway/Liquibase migrates the schema if
necessary before a `JdbcTemplate` is made available as an injection
point.

This commit also adds a test that validates simple datasource
initialization (spring.datasource.*) happens before a `JdbcTemplate`
bean can be used.

Closes gh-13155
2018-07-11 11:23:44 +02:00
Stephane Nicoll 8194dc4aea Merge branch '2.0.x' 2018-07-10 19:45:36 +02:00
Stephane Nicoll 177c54d441 Migrate JdbcTemplateAutoConfiguration tests to context runner 2018-07-10 19:45:20 +02:00
Andy Wilkinson a5b3d549b9 Ignore Data Elasticsearch test that fails due to DATAES-470 2018-07-10 15:58:18 +01:00
Andy Wilkinson 43e2df105c Align with latest changes in Spring Data REST 2018-07-10 15:58:18 +01:00
Andy Wilkinson cf3b1f6653 Start building against Spring HATEOAS 0.25.0 snapshots
See gh-13742
2018-07-10 15:58:18 +01:00
Andy Wilkinson c1a81cfca0 Prohibit bean overriding by default and analyze override failures
Closes gh-13609
2018-07-10 12:28:18 +01:00
Andy Wilkinson 19a494a94d Merge branch '2.0.x' 2018-07-10 10:27:39 +01:00
Andy Wilkinson 57e2bb9c6a Merge branch '1.5.x' into 2.0.x 2018-07-10 10:27:28 +01:00
Stephane Nicoll 0b48e223f3 Merge branch '2.0.x' 2018-07-09 10:50:18 +02:00
Johnny Lim ab6adc8265 Polish
Closes gh-13616
2018-07-09 10:45:01 +02:00
dreis2211 5fcba490d2 Polish conditional expressions
Closes gh-13583
2018-07-09 09:15:10 +02:00
Andy Wilkinson 337d2d8e9a Merge branch '2.0.x' 2018-07-04 15:25:33 +01:00
Andy Wilkinson 58be01a790 Try to make Jest auto-configuration tests more robust 2018-07-04 15:25:10 +01:00
Andy Wilkinson 18904ec291 Upgrade to Mysql 8.0.11
Closes gh-13688
2018-07-03 20:04:55 +01:00