Commit Graph

16867 Commits (e679690a74a86e09b9fd0e89e0a81347ef39a682)
 

Author SHA1 Message Date
Stephane Nicoll e679690a74 Clarify the WebTestClient requires WebFlux on the classpath
Closes gh-13469
6 years ago
Stephane Nicoll d6c7eff8f7 Add check for empty values for lookup
Closes gh-13419
6 years ago
Stephane Nicoll 714f3deaa5 Merge pull request #13790 from izeye:polish-20180717
* pr/13790:
  Polish contribution
  Polish
6 years ago
Stephane Nicoll 8095ee4a5b Polish contribution
See gh-13790
6 years ago
Johnny Lim f363fe7dd1 Polish
See gh-13790
6 years ago
Stephane Nicoll ec2ebf52de Merge branch '1.5.x' into 2.0.x 6 years ago
Stephane Nicoll b522199920 Merge pull request #13792 from dreis2211:missing-test-annotation
* pr/13792:
  Add missing @Test in RestarterTests
6 years ago
dreis2211 fba971f47b Add missing @Test in RestarterTests
Closes gh-13792
6 years ago
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
6 years ago
Stephane Nicoll ffe994335e Merge branch '1.5.x' into 2.0.x 6 years ago
Stephane Nicoll fec5ecc5b0 Merge pull request #13779 from izeye:type-utils-line-separator
* pr/13779:
  Remove carriage returns in TypeUtils.getJavaDoc()
6 years ago
Johnny Lim 9fba2c4a62 Remove carriage returns in TypeUtils.getJavaDoc()
Closes gh-13779
6 years ago
Stephane Nicoll a18c413767 Merge pull request #13778 from izeye:patch-50
* pr/13778:
  Fix since on JdbcOperationsDependsOnPostProcessor
6 years ago
Johnny Lim f2cef87878 Fix since on JdbcOperationsDependsOnPostProcessor
Closes gh-13778
6 years ago
Stephane Nicoll 1ca8808a97 Merge pull request #13776 from izeye:polish-20180715
* pr/13776:
  Polish
6 years ago
Johnny Lim 068e22d60b Polish
See gh-13776
6 years ago
Stephane Nicoll f325ee9406 Merge pull request #13774 from izeye:composite-property-sources
* pr/13774:
  Remove a List creation in CompositePropertySources.iterator()
6 years ago
Johnny Lim 4314dc2972 Remove a List creation in CompositePropertySources.iterator()
Closes gh-13774
6 years ago
Stephane Nicoll e6ea28dec5 Polish 6 years ago
Stephane Nicoll 2dc0488af7 Merge pull request #13706 from izeye:duplicate-empty-path
* pr/13706:
  Prevent duplicate RequestMatcher in RequestMatcherFactory.antPath()
6 years ago
Johnny Lim 13202eb278 Prevent duplicate RequestMatcher in RequestMatcherFactory.antPath()
Closes gh-13706
6 years ago
Stephane Nicoll 174cc2bc4e Merge branch '1.5.x' into 2.0.x 6 years ago
Stephane Nicoll e556c04d83 Remove class file 6 years ago
Stephane Nicoll 6602fa3c90 Clean line breaks in configuration metadata descriptions.
Closes gh-13601
6 years ago
Stephane Nicoll ed609f6395 Merge pull request #13762 from dreis2211:fix-typos-2
* pr/13762:
  Fix typos
6 years ago
dreis2211 ac8eebfbad Fix typos
Closes gh-13762
6 years ago
Stephane Nicoll 19709f7dea Polish 6 years ago
Stephane Nicoll 510c99cc0e Merge branch '1.5.x' into 2.0.x 6 years ago
Stephane Nicoll c23c18dc34 Merge pull request #13755 from izeye:patch-49
* pr/13755:
  Fix typo
6 years ago
Johnny Lim e7cb1c63bb Fix typo
Closes gh-13755
6 years ago
Madhura Bhave d7822ba135 Update copyright header for modified files 6 years ago
Madhura Bhave c8c32cfa33 Migrate tests to ApplicationContextRunner 6 years ago
Andy Wilkinson cced3514a7 Polish 6 years ago
Andy Wilkinson c489c6c5f6 Polish test following forward merge 6 years ago
Andy Wilkinson 67dfa0a720 Merge branch '1.5.x' into 2.0.x 6 years ago
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
6 years ago
Andy Wilkinson 44273ee093 Merge branch '1.5.x' into 2.0.x 6 years ago
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
6 years ago
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
6 years ago
Stephane Nicoll 331775d6c0 Document latest version of gradle-git-properties plugin
Closes gh-13747
6 years ago
Johnny Lim f94ce495d8 Fix parameter order for RequestMatcherAssert.doesNotMatch()
Closes gh-13707
6 years ago
Stephane Nicoll 177c54d441 Migrate JdbcTemplateAutoConfiguration tests to context runner 6 years ago
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
6 years ago
Stephane Nicoll dd2b0eb739 Merge pull request #13545 from izeye:fix-traceable-query-string
* pr/13545:
  Fix query string encoding in TraceableHttpServletRequest
6 years ago
Johnny Lim 46e6aa5963 Fix query string encoding in TraceableHttpServletRequest
Closes gh-13545
6 years ago
Stephane Nicoll 419bf0d1ed Merge pull request #13710 from izeye:get-url-mappings
* pr/13710:
  Separate logging from getUrlMappings()
6 years ago
Johnny Lim 0de8317979 Separate logging from getUrlMappings()
Closes gh-13710
6 years ago
Andy Wilkinson 57e2bb9c6a Merge branch '1.5.x' into 2.0.x 6 years ago
Andy Wilkinson 73a08dd668 Avoid overriding beans and ensure import order is used for DataSource
During processing of a configuration class, the class's complete
hierarchy is processed and during the processing of each class its
member classes are processed. Previously, each pool-specific
inner-class of DataSourceConfiguration extended the abstract outer
class. This meant that when the import from
DataSourceAutoConfiguration.PooledDataSourceConfiguration caused the
first pool-specific inner-class to be  processed,
DataSourceConfiguration would be processed as it was the inner-class's
superclass. In turn all of DataSourceConfiguration's member classes
would then be processed. This caused the first import (of
DataSourceConfiguration.Tomcat) to trigger processing of all of the
other pool-specific inner-classes in whatever order they were found
rather than them being processed in the order in which they are
imported by DataSourceAutoConfiguration.PooledDataSourceConfiguration.

Another part of the problem was that none of the pool-specific
inner-classes were conditional on a missing DataSource bean. This
meant that, when multiple pools were on the classpath, each class
after the first would override the previous class's definition of the
DataSource bean.

This commit updates each of the pool-specific inner-classes so that
they no longer extend DataSourceConfiguration. This ensures that
the inner classes are processed in the order defined in the import
on PooledDataSourceConfiguration. Each of the classes has also been
annotated with @ConditionalOnMissingBean(DataSource.class). This
prevents the DataSource bean definition from being overridden and
ensures that the order of precedence for the pool that will be used
is as defined in the import.

Closes gh-13737
6 years ago
Madhura Bhave 4e7719f1c7 Fix typo 6 years ago