Commit Graph

16870 Commits

Author SHA1 Message Date
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
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
e679690a74 Clarify the WebTestClient requires WebFlux on the classpath
Closes gh-13469
2018-07-17 14:06:41 +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
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
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
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
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
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
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
f325ee9406 Merge pull request #13774 from izeye:composite-property-sources
* pr/13774:
  Remove a List creation in CompositePropertySources.iterator()
2018-07-16 10:26:57 +02:00
Johnny Lim
4314dc2972 Remove a List creation in CompositePropertySources.iterator()
Closes gh-13774
2018-07-16 10:20:49 +02:00
Stephane Nicoll
e6ea28dec5 Polish 2018-07-13 09:36:37 +02:00
Stephane Nicoll
2dc0488af7 Merge pull request #13706 from izeye:duplicate-empty-path
* pr/13706:
  Prevent duplicate RequestMatcher in RequestMatcherFactory.antPath()
2018-07-13 09:36:10 +02:00
Johnny Lim
13202eb278 Prevent duplicate RequestMatcher in RequestMatcherFactory.antPath()
Closes gh-13706
2018-07-13 09:35:34 +02:00
Stephane Nicoll
174cc2bc4e Merge branch '1.5.x' into 2.0.x 2018-07-13 09:25:42 +02:00
Stephane Nicoll
e556c04d83 Remove class file 2018-07-13 09:21:27 +02:00
Stephane Nicoll
6602fa3c90 Clean line breaks in configuration metadata descriptions.
Closes gh-13601
2018-07-13 09:19:17 +02:00
Stephane Nicoll
ed609f6395 Merge pull request #13762 from dreis2211:fix-typos-2
* pr/13762:
  Fix typos
2018-07-13 07:55:40 +02:00
dreis2211
ac8eebfbad Fix typos
Closes gh-13762
2018-07-13 07:54:03 +02:00
Stephane Nicoll
19709f7dea Polish 2018-07-12 16:57:52 +02:00
Stephane Nicoll
510c99cc0e Merge branch '1.5.x' into 2.0.x 2018-07-12 08:55:10 +02:00
Stephane Nicoll
c23c18dc34 Merge pull request #13755 from izeye:patch-49
* pr/13755:
  Fix typo
2018-07-12 08:51:32 +02:00
Johnny Lim
e7cb1c63bb Fix typo
Closes gh-13755
2018-07-12 08:51:11 +02:00
Madhura Bhave
d7822ba135 Update copyright header for modified files 2018-07-11 15:25:39 -07:00
Madhura Bhave
c8c32cfa33 Migrate tests to ApplicationContextRunner 2018-07-11 15:06:36 -07:00
Andy Wilkinson
cced3514a7 Polish 2018-07-11 17:49:10 +01:00
Andy Wilkinson
c489c6c5f6 Polish test following forward merge 2018-07-11 17:13:45 +01:00
Andy Wilkinson
67dfa0a720 Merge branch '1.5.x' into 2.0.x 2018-07-11 16:51:43 +01:00
Andy Wilkinson
6dc14af92d Update view of bean types when an override is detected
Previously, when a bean was overridden and its type changes,
BeanTypeRegistry could be left with a stale view of the bean's type.
This would lead to incorrect bean condition evaluation as conditions
would match or not match based on the bean's old type.

This commit updates the type registry to refresh its view of a bean's
type when its definition changes.

Closes gh-13588
2018-07-11 16:46:37 +01:00
Andy Wilkinson
44273ee093 Merge branch '1.5.x' into 2.0.x 2018-07-11 14:38:49 +01:00
Andy Wilkinson
57ebdab2ab Delay property source initialization till LoggingSystem is initialized
Previously, the initialization of StandardServletEnvironment's
property sources in SpringBootServletInitializer led to debug logging
calls being made before the LoggingSystem had been initialized. As a
result, the system's default configuration was used and, in the case
of Logback at least, the debug logging was output to System.out
in a war deployment.

This commit updates SpringBootServletInitializer to delay the
initialization of StandardServletEnvironment's property sources until
after the LoggingSystem has been initialized, but still in time for
active profiles to be configured via servlet context parameters
(see gh-9972).

Closes gh-13736
2018-07-11 11:47:17 +01: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
331775d6c0 Document latest version of gradle-git-properties plugin
Closes gh-13747
2018-07-11 10:13:41 +02:00
Johnny Lim
f94ce495d8 Fix parameter order for RequestMatcherAssert.doesNotMatch()
Closes gh-13707
2018-07-10 11:36:47 -07:00
Stephane Nicoll
177c54d441 Migrate JdbcTemplateAutoConfiguration tests to context runner 2018-07-10 19:45:20 +02: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
Stephane Nicoll
dd2b0eb739 Merge pull request #13545 from izeye:fix-traceable-query-string
* pr/13545:
  Fix query string encoding in TraceableHttpServletRequest
2018-07-10 15:58:26 +02:00
Johnny Lim
46e6aa5963 Fix query string encoding in TraceableHttpServletRequest
Closes gh-13545
2018-07-10 15:56:10 +02:00
Stephane Nicoll
419bf0d1ed Merge pull request #13710 from izeye:get-url-mappings
* pr/13710:
  Separate logging from getUrlMappings()
2018-07-10 15:31:43 +02:00
Johnny Lim
0de8317979 Separate logging from getUrlMappings()
Closes gh-13710
2018-07-10 15:27:43 +02:00