Commit Graph

21208 Commits

Author SHA1 Message Date
Madhura Bhave
cb8e5e5912 Merge branch '2.0.x' 2018-07-10 11:37:18 -07:00
Johnny Lim
f94ce495d8 Fix parameter order for RequestMatcherAssert.doesNotMatch()
Closes gh-13707
2018-07-10 11:36:47 -07: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
87b72cc981 Polish DevTools auto-configuration tests to avoid bean overrides
See gh-13609
2018-07-10 16:31:11 +01:00
Stephane Nicoll
5fcf45c4d0 Merge branch '2.0.x' 2018-07-10 17:07:46 +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
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
Stephane Nicoll
8426e3c2c9 Merge branch '2.0.x' 2018-07-10 15:58:39 +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
6fdc5d0eee Merge pull request #13724 from dreis2211:property-sources-stream
* pr/13724:
  Use PropertySources.stream() where possible
2018-07-10 15:38:14 +02:00
dreis2211
be837ccb4b Use PropertySources.stream() where possible
Closes gh-13724
2018-07-10 15:35:03 +02:00
Stephane Nicoll
8c691273e3 Merge branch '2.0.x' 2018-07-10 15:31:56 +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
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
cdd9c92ba2 Start building against snapshots for Spring Data Lovelace RC1
See gh-13740
2018-07-10 11:42:37 +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
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
2018-07-10 09:45:15 +01:00
Madhura Bhave
0c2c018f19 Merge pull request #13707 from izeye
* gh-13707:
  Fix parameter order for RequestMatcherAssert.doesNotMatch()
2018-07-09 15:21:40 -07:00
Johnny Lim
b87b23a44f Fix parameter order for RequestMatcherAssert.doesNotMatch()
Closes gh-13707
2018-07-09 15:20:18 -07:00
Madhura Bhave
63ae682a95 Merge branch '2.0.x' 2018-07-09 14:16:17 -07:00
Madhura Bhave
4e7719f1c7 Fix typo 2018-07-09 14:15:19 -07:00
Madhura Bhave
7bda971971 Merge branch '1.5.x' into 2.0.x 2018-07-09 14:13:36 -07:00
Madhura Bhave
8b2cb32ae7 Fix typo 2018-07-09 14:10:31 -07:00
Andy Wilkinson
063e8e4dc6 Revert "Prohibit bean overriding by default and analyze override failures"
This reverts commit 710cdbab92.
2018-07-09 17:58:49 +01:00
Andy Wilkinson
710cdbab92 Prohibit bean overriding by default and analyze override failures
Closes gh-13609
2018-07-09 13:50:16 +01:00
Andy Wilkinson
918191664a Merge branch '2.0.x' 2018-07-09 13:39:30 +01:00
Andy Wilkinson
9eb5c9bd18 Merge branch '1.5.x' into 2.0.x 2018-07-09 13:39:11 +01:00
Andy Wilkinson
a50646b7cc Fix repackaging of jars with non-default compression configuration
Previously, if a jar that used custom compression configuration was
repackaged, a failure may occur if an entry in the repackaged jar had
a different compressed size to the entry in the source jar.

This commit updates JarWriter to clear the input entry's compressed
size (by setting it to -1) so that the repackaged entry's compressed
size does not have to match that of the input entry.

Closes gh-13720
2018-07-09 13:16:41 +01:00
Brian Clozel
72f74d0b44 Merge pull request #13728 from dreis2211:fix-netty-reactive-tests
* pr/13728:
  Fix API adaptation changes for Reactor Netty
2018-07-09 13:44:49 +02:00
dreis2211
d1acf9a24d Fix API adaptation changes for Reactor Netty 2018-07-09 13:44:08 +02:00
Stephane Nicoll
60457f1d9a Merge branch '2.0.x' 2018-07-09 13:22:14 +02:00
Stephane Nicoll
44ebeb8a6f Merge pull request #13619 from 72MiguelGomes:small-documentation-improve
* pr/13619:
  Polish "Improve description of Endpoint exclude"
  Improve description of Endpoint exclude
2018-07-09 13:21:57 +02:00
Stephane Nicoll
44b9aa168e Polish "Improve description of Endpoint exclude"
Closes gh-13619
2018-07-09 13:20:43 +02:00
Miguel Gomes
838e6cdbbb Improve description of Endpoint exclude
See gh-13619
2018-07-09 13:12:13 +02:00
Stephane Nicoll
0b48e223f3 Merge branch '2.0.x' 2018-07-09 10:50:18 +02:00
Stephane Nicoll
00883a4eac Merge pull request #13616 from izeye:polish-20180630
* pr/13616:
  Polish
2018-07-09 10:49:55 +02:00
Johnny Lim
ab6adc8265 Polish
Closes gh-13616
2018-07-09 10:45:01 +02:00
Stephane Nicoll
f0a31daa57 Merge pull request #13583 from dreis2211:move-conditionals-inside-branch
* pr/13583:
  Polish conditional expressions
2018-07-09 09:15:29 +02:00
dreis2211
5fcba490d2 Polish conditional expressions
Closes gh-13583
2018-07-09 09:15:10 +02:00
Stephane Nicoll
10e05f6503 Merge pull request #13567 from dreis2211:remove-classutils-binder
* pr/13567:
  Optimize checks for java classes in Binder
2018-07-09 08:51:23 +02:00
dreis2211
ba46e77169 Optimize checks for java classes in Binder
Closes gh-13567
2018-07-09 08:51:06 +02:00
Stephane Nicoll
7baa41f148 Merge pull request #13540 from Catalysts:KL/structurizr-starter
* pr/13540:
  Polish "Add reference to structurizr starter"
  Add reference to structurizr starter
2018-07-09 08:39:28 +02:00
Stephane Nicoll
3e24df1794 Polish "Add reference to structurizr starter"
Closes gh-13540
2018-07-09 08:38:58 +02:00
Klaus Lehner
94517b9811 Add reference to structurizr starter
See gh-13540
2018-07-09 08:36:43 +02:00