Commit Graph

25158 Commits

Author SHA1 Message Date
Scott Frederick
e5ec6dfef0 Find nearest milestone for forward merge with .x pattern
Fixes gh-22350
2020-07-15 17:04:34 -05:00
Andy Wilkinson
d9882f2c88 Clarify the effects of ordering auto-configuration classes
Closes gh-22337
2020-07-15 10:48:01 +01:00
Andy Wilkinson
9558779dd4 Replace ConfigurationPropertiesBeanDefinitionValidator with a FailureAnalyzer
Previously, regular bean definitions for configuration properties classes
that attempt to use constructor binding were detected in a bean factory
post-processor, ConfigurationPropertiesBeanDefinitionValidator. This
validation examined every standard bean definition and failed if it
encountered one for a class that should have used constructor binding.
There were two downsides to this approach:

1. Reflection used to identify if the bean should be using constructor
   binding triggered class loading that could prevent subsequent
   instrumentation by a load-time weaver.
2. The cost of the validation was incurred when there was no
   misconfiguration to report.

This commit replaces ConfigurationPropertiesBeanDefinitionValidator
with a failure analyzer. This failure analyzer only runs once a failure
has occurred and the application context is not going to complete
refresh. This avoids causing problems with subsequent instrumentation
and also avoids the cost of validation and error reporting unless there
is an error.

Fixes gh-20798
2020-07-14 11:37:54 +01:00
Andy Wilkinson
afa5b12bdb Make reactive Jetty auto-config back off without jetty-servlet
Fixes gh-22275
2020-07-09 10:36:32 +01:00
Andy Wilkinson
efad6c16d1 Merge branch '2.1.x' into 2.2.x
Closes gh-22269
2020-07-09 09:40:50 +01:00
Andy Wilkinson
9800804b65 Upgrade CI images to use ubuntu:bionic-20200630
Closes gh-22271
2020-07-09 09:39:52 +01:00
Andy Wilkinson
66987533d1 Link to application properties section from externalized config list
Closes gh-22262
2020-07-08 17:58:35 +01:00
Andy Wilkinson
4e79bb1cff Disable bean method proxying in SpringBootJdbcConfiguration
Closes gh-22231
2020-07-07 11:51:07 +01:00
Andy Wilkinson
14f24dbecc Merge branch '2.1.x' into 2.2.x
Closes gh-22248
2020-07-07 11:42:43 +01:00
Andy Wilkinson
26f591264c Fix handling of NestedServletException with no root cause
Fixes gh-22169
2020-07-07 11:34:25 +01:00
Andy Wilkinson
1ad66cf92b Merge pull request #22207 from Sineaggi
* gh-22207:
  Polish "Rename NoneOfNestedConditions to NoneNestedConditions in example docs"
  Rename NoneOfNestedConditions to NoneNestedConditions in example docs

Closes gh-22207
2020-07-07 10:46:44 +01:00
Andy Wilkinson
a8d3f9af31 Polish "Rename NoneOfNestedConditions to NoneNestedConditions in example docs"
See gh-22207
2020-07-07 10:46:32 +01:00
Clayton Walker
7fee70a625 Rename NoneOfNestedConditions to NoneNestedConditions in example docs
See gh-22207
2020-07-07 10:46:20 +01:00
Andy Wilkinson
ae043285d8 Merge pull request #22214 from XenoAmess
* gh-22214:
  Polish "Fix unwrapping of captured PrintStream in test support's OutputCapture"
  Fix unwrapping of captured PrintStream in test support's OutputCapture

Closes gh-22214
2020-07-07 09:55:01 +01:00
Andy Wilkinson
a0f1424393 Polish "Fix unwrapping of captured PrintStream in test support's OutputCapture"
See gh-22214
2020-07-07 09:54:52 +01:00
XenoAmess
75a64bd901 Fix unwrapping of captured PrintStream in test support's OutputCapture
See gh-22214
2020-07-07 09:53:34 +01:00
Andy Wilkinson
4301580095 Improve testing of PropertyPlaceholderAutoConfiguration
Since Spring Framework 4.3.0.RC2, a default embedded value resolver
has been registered with the bean factory when one is not otherwise
configured. This meant that placeholders in `@Value` would be resolved
with or without PropertyPlaceholderAutoConfiguration defining a
PropertySourcesPlaceholderConfigurer bean. However, placeholders in
bean definitions would only be resolved if a
PropertySourcesPlaceholderConfigurer was defined.

This commit updates PropertyPlaceholderAutoConfigurationTests to align
with this change in Framework. We now test that placeholders are
resolved in `@Value` annotations with or without the auto-configuration
and that placeholders in bean definitions are only resolved with the
auto-configured.

Closes gh-22230
2020-07-06 14:24:36 +01:00
Andy Wilkinson
21453b5016 Ignore scoped targets when finding matching beans
Fixes gh-22038
2020-07-02 10:39:56 +01:00
Andy Wilkinson
81d6751ba7 Use ApplicationContextRunner in ConditionalOnSingleCandidateTests 2020-07-02 10:10:28 +01:00
Andy Wilkinson
1410ef2911 Merge branch '2.1.x' into 2.2.x
Closes gh-22193
2020-07-02 09:42:03 +01:00
Andy Wilkinson
c9958c2ab4 Upgrade CI to Docker 19.03.12
Closes gh-22189
2020-07-02 09:39:13 +01:00
Andy Wilkinson
e44640de89 Merge branch '2.1.x' into 2.2.x
Closes gh-22182
2020-07-01 13:48:08 +01:00
Andy Wilkinson
25777360b2 Merge pull request #22110 from dreis2211
* gh-22110:
  Improve error handling in JDK upgrade checks

Closes gh-22110
2020-07-01 13:47:15 +01:00
dreis2211
24072bed96 Improve error handling in JDK upgrade checks
See gh-22110
2020-07-01 13:45:50 +01:00
Andy Wilkinson
a13acf9f2b Upgrade to Reactor Dysprosium-SR9
Closes gh-21937
2020-07-01 11:49:39 +01:00
Andy Wilkinson
500d2bd9de Merge pull request #22138 from dreis2211
* gh-22138:
  Accept empty filter dispatcher types in auto-configurations

Closes gh-22138
2020-06-30 17:39:44 +01:00
dreis2211
8c0e302f2e Accept empty filter dispatcher types in auto-configurations
Prior to this commit, the usage of EnumSet.copyOf resulted in exceptions when
the underlying collection was empty.

See gh-22138
2020-06-30 17:39:21 +01:00
Andy Wilkinson
abeab73b2c Merge branch '2.1.x' into 2.2.x
Closes gh-22170
2020-06-30 16:45:46 +01:00
Andy Wilkinson
bca5ef4ac8 Merge pull request #22163 from XenoAmess
* gh-22163:
  Remove duplicated icon from git-repo-windows resource definition

Closes gh-22163
2020-06-30 16:25:44 +01:00
XenoAmess
89d4cda855 Remove duplicated icon from git-repo-windows resource definition
See gh-22163
2020-06-30 16:25:32 +01:00
Andy Wilkinson
64aa418baa Merge pull request #22141 from im47cn
* gh-22141:
  Polish "Avoid NPE when binder is closed before started event"
  Avoid NPE when binder is closed before started event

Closes gh-22141
2020-06-30 14:09:42 +01:00
Andy Wilkinson
3922fb7164 Polish "Avoid NPE when binder is closed before started event"
See gh-22141
2020-06-30 13:26:30 +01:00
im47cn
b34c268547 Avoid NPE when binder is closed before started event
Previously, if TomcatMetricsBinder destroy() was called before it had
received an ApplicationStartedEvent an NPE would be thrown due to
TomcatMetrics being null. This NPE was then caught and logged at
warning level by the disposable bean adapter.

This prevents the NPE by checking that the TomcatMetrics instance is
null before calling close() on it.

See gh-22141
2020-06-30 13:23:58 +01:00
Madhura Bhave
9c732fa2b6 Merge pull request #22082 from thenx-wei
* pr/22082:
  Simplify logic in ErrorPage's equals method

Closes gh-22082
2020-06-29 17:08:05 -07:00
May
c1b9d3c226 Simplify logic in ErrorPage's equals method
See gh-22082
2020-06-29 17:06:49 -07:00
Madhura Bhave
67060731bc Merge branch '2.1.x' into 2.2.x 2020-06-29 16:40:59 -07:00
Madhura Bhave
4a55a414e7 Fix typo 2020-06-29 16:40:24 -07:00
Andy Wilkinson
5475f10657 Remove WebClient's in-memory buffer size limit for endpoint tests
Previously, the thread dump endpoint's response could exceed
WebClient's in-memory buffer limt when there were a large number of
threads or the threads had large stacks.

This commit disables WebClient's in-memory buffer size limit so that
the test passing is not dependent on the number of active threads and
their stack sizes.

Closes gh-22101
2020-06-25 10:21:43 +01:00
Scott Frederick
b27303704f Fix RedisReactiveHealthIndicator in clustered configuration
Prior to Spring Data Redis version 2.2.8, the contents of the
Properties object returned from the
ReactiveRedisConnection.ServerCommands.info API were the same
for clustered and non-clustered Redis configurations, containing a set
of key/value pairs. This allowed ReactiveRedisHealthIndicator to get
a version property using a well-known key. Starting with Spring Data
Redis 2.2.8, the info property keys contain a host:port prefix in a
clustered Redis configuration. This prevented
ReactiveRedisHealthIndicator from getting the version property as
before and resulted in the health always being reported as DOWN.

This commit adjusts ReactiveRedisHealthIndicator to detect the
clustered configuration from Spring Data Redis and find the version
property for one of the reported cluster nodes.

Fixes gh-22061
2020-06-24 13:34:22 -05:00
Andy Wilkinson
3fed27fd90 Merge branch '2.1.x' into 2.2.x
Closes gh-22085
2020-06-24 10:17:57 +01:00
Andy Wilkinson
0b4533659f Use Groovy's bom in spring-boot-dependencies
Closes gh-22084
2020-06-24 10:17:06 +01:00
Phillip Webb
a49156d95e Merge pull request #22022 from polarbear567
* pr/22022:
  Polish 'Inherit show-details property in health groups'
  Inherit show-details property in health groups

Closes gh-22022
2020-06-22 23:15:05 -07:00
Phillip Webb
e6eb02603c Polish 'Inherit show-details property in health groups'
Rework the inheritance so that the property metadata JSON more
accurately reflects the default value.

See gh-22022
2020-06-22 23:01:37 -07:00
Leo Li
10de88884f Inherit show-details property in health groups
Update `Group` properties so that the `showDetails` value does not
inherit `Show.NEVER`. Prior to this commit, the `Group` properties
would not correctly inherit a `showDetails` value from the main
`management.endpoint.health.show-details` property.

See gh-22022
2020-06-22 22:54:34 -07:00
Phillip Webb
bf04baba73 Merge pull request #22040 from Konrado85
* pr/22040:
  Polish 'Fix infinite loop in FieldValues'
  Fix infinite loop in FieldValues

Closes gh-22040
2020-06-22 12:13:08 -07:00
Phillip Webb
3b3a49db1f Polish 'Fix infinite loop in FieldValues'
See gh-22040
2020-06-22 12:01:04 -07:00
Konrado85
39a853c57b Fix infinite loop in FieldValues
Update `FieldValues` test object so that it doesn't cause an infinite
loop if it is actually created.

See gh-22040
2020-06-22 11:58:22 -07:00
Stephane Nicoll
97af782ee6 Merge pull request #22000 from mla-mpensdavila
* pr/22000:
  Polish "Document how to exclude an annotation processor with Maven"
  Document how to exclude an annotation processor with Maven

Closes gh-22000
2020-06-19 11:37:31 +02:00
Stephane Nicoll
9b803af3c3 Polish "Document how to exclude an annotation processor with Maven"
See gh-22000
2020-06-19 11:36:25 +02:00
Marco Pens
627c0b1031 Document how to exclude an annotation processor with Maven
See gh-22000
2020-06-19 11:35:48 +02:00