Commit Graph

17513 Commits

Author SHA1 Message Date
Madhura Bhave
f88ebc06ff Add support for OIDC Configuration Provider
Closes gh-13210
2018-07-17 16:02:03 -07:00
Madhura Bhave
4fee54cf24 Expose a TestDispatcherServlet bean in the MockMvcAutoConfiguration
This commit also contains changes to `ServletContextInitializerBeans`.
`ServletContextInitializerBeans` can now be configured to only look
for specific ServletContextInitializer subclasses, defaulting to
ServletContextIntializer.class. `SpringBootMockMvcBuilderCustomizer`
only cares about filters so it was unnecessary to look for all
`ServletContextInitializer`s. Additionally, adapting `Servlet` beans
caused a cycle once the `DispatcherServlet` bean was added and the
customizer only needs to adapt `Filter` beans.

Closes gh-13241
2018-07-17 13:00:54 -07:00
Andy Wilkinson
6a189cee06 Merge branch '2.0.x' 2018-07-17 19:26:08 +01:00
Andy Wilkinson
a57d0f0853 Reinstate order of WebMvcMetricsFilter
Closes gh-13781
2018-07-17 19:14:17 +01:00
Stephane Nicoll
a98b020ee4 Merge branch '2.0.x' 2018-07-17 17:04:49 +02:00
Stephane Nicoll
944ed767ac Add dependency management for elasticsearch integration tests distro
Closes gh-13547
2018-07-17 17:03:45 +02:00
Stephane Nicoll
526b50645e Merge branch '2.0.x' 2018-07-17 15:48:26 +02:00
Stephane Nicoll
fd03bde769 Merge pull request #13797 from dreis2211:remove-unused-couchbase-test-abstraction
* pr/13797:
  Remove unused AbstractCouchbaseAutoConfigurationTests
2018-07-17 15:48:14 +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
c0b9c72d74 Merge branch '2.0.x' 2018-07-17 14:07:34 +02:00
Stephane Nicoll
e679690a74 Clarify the WebTestClient requires WebFlux on the classpath
Closes gh-13469
2018-07-17 14:06:41 +02:00
Stephane Nicoll
070c26d6c3 Merge branch '2.0.x' 2018-07-17 12:03:58 +02:00
Stephane Nicoll
d6c7eff8f7 Add check for empty values for lookup
Closes gh-13419
2018-07-17 12:01:26 +02:00
Stephane Nicoll
370af6df08 Revert "Ignore test affect by a regression in Spring Data Lovelace"
This reverts commit d9215d5714.

Closes gh-13784
2018-07-17 11:33:14 +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
58efd1b51a Merge pull request #13790 from izeye:polish-20180717
* pr/13790:
  Polish contribution
  Polish
2018-07-17 10:32:17 +02:00
Stephane Nicoll
fd6023fe49 Polish contribution
Closes gh-13790
2018-07-17 10:25:55 +02:00
Johnny Lim
58df752af4 Polish
See gh-13790
2018-07-17 10:25:38 +02:00
Stephane Nicoll
43091150d8 Merge branch '2.0.x' 2018-07-17 10:23:12 +02:00
Stephane Nicoll
714f3deaa5 Merge pull request #13790 from izeye:polish-20180717
* pr/13790:
  Polish contribution
  Polish
2018-07-17 10:22:54 +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
Stephane Nicoll
ac01409332 Merge branch '2.0.x' 2018-07-17 08:22:58 +02:00
Stephane Nicoll
ec2ebf52de Merge branch '1.5.x' into 2.0.x 2018-07-17 08:22:15 +02:00
Stephane Nicoll
b522199920 Merge pull request #13792 from dreis2211:missing-test-annotation
* pr/13792:
  Add missing @Test in RestarterTests
2018-07-17 08:17:54 +02:00
dreis2211
fba971f47b Add missing @Test in RestarterTests
Closes gh-13792
2018-07-17 08:08:01 +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
d9215d5714 Ignore test affect by a regression in Spring Data Lovelace 2018-07-16 15:44:12 +02:00
Stephane Nicoll
b7274966c4 Merge branch '2.0.x' 2018-07-16 14:12:36 +02:00
Stephane Nicoll
ffe994335e Merge branch '1.5.x' into 2.0.x 2018-07-16 14:12:16 +02:00
Stephane Nicoll
fec5ecc5b0 Merge pull request #13779 from izeye:type-utils-line-separator
* pr/13779:
  Remove carriage returns in TypeUtils.getJavaDoc()
2018-07-16 14:11:58 +02:00
Johnny Lim
9fba2c4a62 Remove carriage returns in TypeUtils.getJavaDoc()
Closes gh-13779
2018-07-16 14:11:32 +02:00
Stephane Nicoll
3c67edafcd Expose more Quartz properties
Closes gh-13782
2018-07-16 14:07:10 +02:00
Stephane Nicoll
0eeba7bf38 Merge pull request #13582 from tdanylchuk:configure-overwriteExistingJobs-via-properties
* pr/13582:
  Polish "Allow to configure Quartz's "overwriteExistingJobs" property"
  Allow to configure Quartz's "overwriteExistingJobs" property
2018-07-16 14:06:46 +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
Brian Clozel
0654dd4de2 Add JUnit Jupiter API to spring-boot-docs build
This is required for the docs module to inspect Spring Boot
annotations for meta-annotations.

See gh-13739
2018-07-16 13:49:37 +02:00
Stephane Nicoll
9c0ce3d20a Merge branch '2.0.x' 2018-07-16 10:51:27 +02:00
Stephane Nicoll
a18c413767 Merge pull request #13778 from izeye:patch-50
* pr/13778:
  Fix since on JdbcOperationsDependsOnPostProcessor
2018-07-16 10:51:10 +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
Stephane Nicoll
5412f56cf1 Merge pull request #13776 from izeye:polish-20180715
* pr/13776:
  Polish
2018-07-16 10:39:31 +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
Stephane Nicoll
1ca8808a97 Merge pull request #13776 from izeye:polish-20180715
* pr/13776:
  Polish
2018-07-16 10:37:24 +02:00
Johnny Lim
068e22d60b Polish
See gh-13776
2018-07-16 10:34:00 +02:00
Stephane Nicoll
635986299c Merge branch '2.0.x' 2018-07-16 10:28:49 +02:00