1248 Commits

Author SHA1 Message Date
Andy Wilkinson
0eb6c0ddd3 Defer disabling registry until Tomcat server is being created
Closes gh-16498
2019-05-28 20:49:07 +01:00
Andy Wilkinson
6de14f71c6 Fail fast if config prop constructor binding cannot determine names
Previously, configuration property constructor binding relied on compilation
with -parameters to be able to discover the names of a constructor's
parameters, failing silently if the parameter names were not available. This
commit updates it to fail when the names could not be determined and switches
to using DefaultParameterNamesDiscoverer. This align configuration property
constructor binding with actuator endpoint operation invocation.

Closes gh-16928
2019-05-28 15:47:39 +01:00
Andy Wilkinson
892e517c21 Work around Framework regression in handling of null model values
See https://github.com/spring-projects/spring-framework/issues/23038.
2019-05-28 10:05:59 +01:00
Andy Wilkinson
d21a091262 Avoid duplicate retrieval of @ConfigurationProperties in registrar
Closes gh-15802
2019-05-28 09:00:29 +01:00
Stephane Nicoll
593bc22ecc Merge branch '2.1.x' 2019-05-27 16:59:32 +02:00
Stephane Nicoll
2c364ceb89 Fix wrong ApplicationContext import
Closes gh-16978
2019-05-27 16:59:12 +02:00
Brian Clozel
0b70862627 Fix RSocket websocket config with WebFlux
In the case of a WebFlux + RSocket over websocket setup, the RSocket
auto-configuration would not set up the required routes; only the
websocket endpoint for RSocket would be available, overriding the
handler configured for WebFlux.

This commit introduces `NettyRouteProvider`. Components implementing
that interface can contribute HTTP routes to the Reactor Netty server
being built.

* if none is provided, the regular handler setup is used
* if one or more routes are provided, routes are sorted and added before
the WebFlux handler (acting as a default)

Fixes gh-16826
2019-05-27 15:19:32 +02:00
Andy Wilkinson
5e62faf720 Handle null CodeSource when determining Spring Boot version
Closes gh-16956
See gh-16182
2019-05-24 09:41:23 +01:00
Andy Wilkinson
23f803c6b6 Upgrade to Hamcrest 2.1, switch to hamcrest artifact from -core and -library
Closes gh-15555
2019-05-22 14:50:15 +01:00
Andy Wilkinson
9ba5c78878 Merge branch '2.1.x'
Closes gh-16940
2019-05-22 13:00:24 +01:00
Andy Wilkinson
46ecf7a928 Only unwrap when DataSource is a wrapper for required type
Closes gh-16863
2019-05-22 12:52:10 +01:00
Stephane Nicoll
ffbc545a47 Change Logback's maxHistory property default to 7 days
Closes gh-15875
2019-05-21 10:55:30 +02:00
Andy Wilkinson
f8eb230dea Ignore Redshift in DatabaseDriverClassNameTests
Closes gh-16831
2019-05-20 17:18:23 +01:00
Stephane Nicoll
9e31c764fc Polish "Add support for AWS Redshift JDBC driver"
Closes gh-16831
2019-05-20 14:23:44 +02:00
Henryk Konsek
146f35d2bd Add support for AWS Redshift JDBC driver
See gh-16831
2019-05-20 14:06:23 +02:00
Phillip Webb
10e67f8977 Fix dashIgnoringElementEquals algorithm
Update `dashIgnoringElementEquals` so that trailing checks fail if
the last characters are not all `-`.

Fixes gh-16855
2019-05-14 22:44:07 -07:00
Phillip Webb
3a9ca5fa30 Update copyright header of changed files 2019-05-14 21:05:53 -07:00
Phillip Webb
c49b9bece5 Merge branch '2.1.x'
Closes gh-16859
2019-05-14 21:03:55 -07:00
Phillip Webb
ab15b8e26d Support overloaded setters when binding beans
Update `JavaBeanBinder` so that overloaded setters can be used when
binding. Prior to this commit the setter picked would depend on the
order that the JVM returned the declared methods. We now consistently
prefer using the setter with a parameter type that matches the getter.

Closes gh-16206
2019-05-14 21:02:16 -07:00
Phillip Webb
e03f3b8e9a Merge branch '2.1.x'
Closes gh-16857
2019-05-14 18:51:46 -07:00
Phillip Webb
f665910cdb Use generic type for binder cache comparisons
Update `JavaBeanBinder` so that previously cached beans are compared
using full generic type information. Prior to this commit binding would
fail if a class with the same resolved type, but different generics was
in the cache.

Fixes gh-16821
2019-05-14 18:42:16 -07:00
Brian Clozel
20dfeddbb3 Auto-configure RSocketRequester.Builder
This commit auto-configures a prototype `RSocketRequester.Builder` bean
for building requester instances. This builder is pre-configured with
auto-detected `RSocketStrategies` (same as the server side).

Closes gh-16280
2019-05-13 16:03:21 +02:00
Brian Clozel
9f2995af6f Migrate from deprecated Jetty's SslContextFactory
Closes gh-16827
2019-05-13 10:27:20 +02:00
Madhura Bhave
f1786c357b Revert "Disable ConfigurationProperties scanning for slice tests"
This reverts commit 3b4ff7d74641bd453554df22bc4eaa55da4522d4.
The commit caused the build to fail because it disabled
`@ConfigurationPropertiesScan` completely in slice tests. It
did not take into account components that were explicitly included
in slice tests using the `components` attribute. Since `@ConfigurationPropertiesScan`
replaces `@Component` and `@EnableConfigurationProperties`, these components
are no longer registered even though explicitly included.
2019-05-11 09:59:36 -07:00
Madhura Bhave
3b4ff7d746 Disable ConfigurationProperties scanning for slice tests
Closes gh-16659
2019-05-10 14:43:55 -07:00
Stephane Nicoll
c85c653e57 Polish "Add negative tests to ConfigurationPropertiesScanTests"
Closes gh-16758
2019-05-10 10:22:34 +02:00
Johnny Lim
d44ffd3534 Add negative tests to ConfigurationPropertiesScanTests
See gh-16758
2019-05-10 10:22:08 +02:00
Stephane Nicoll
f056b952d9 Merge branch '2.1.x' 2019-05-02 09:18:21 +02:00
Johnny Lim
1b9a4d5e45 Polish CompressionConnectorCustomizerTests
Closes gh-16699
2019-05-02 09:13:47 +02:00
Stephane Nicoll
ed538a2e31 Merge branch '2.1.x' 2019-05-01 08:41:27 +02:00
Stephane Nicoll
19413c0c71 Polish
See gh-16688
2019-05-01 08:41:07 +02:00
Madhura Bhave
fd97066604 Use MergedAnnotation.getRoot() method
Closes gh-16661
2019-04-30 16:19:18 -07:00
Maciej Walkowiak
d7722e328a Add jOOQ to SQL logging group
See gh-16678
2019-04-30 08:55:07 +02:00
Madhura Bhave
a0d425332d Use ImportBeanDefintionRegistrar directly instead of import selector
Closes gh-16679
2019-04-29 18:01:31 -07:00
dreis2211
cf05959375 Optimize ConfigurationPropertyName.buildToString()
See gh-16658
2019-04-25 17:18:55 +01:00
Phillip Webb
1e44aba772 Fix compiler warnings and polish
Fix various compiler warnings and apply a little polish.
2019-04-24 19:37:42 -07:00
Andy Wilkinson
b39fdea508 Merge pull request #16474 from Christoph Dreis
* gh-16474:
  Speed up element equality checks in ConfigurationPropertyName

Closes gh-16474
2019-04-24 14:00:46 +01:00
dreis2211
3786dbc869 Speed up element equality checks in ConfigurationPropertyName
See gh-16474
2019-04-24 13:59:53 +01:00
Madhura Bhave
5c2a7e61d0 Fix tests 2019-04-22 22:40:11 -07:00
Madhura Bhave
9fb65e57c0 ConfigurationPropertiesScan should account for conditions
Fixes gh-16612
2019-04-22 18:37:29 -07:00
Stephane Nicoll
fd14cd0bd0 Merge branch '2.1.x' 2019-04-22 10:00:28 +02:00
Stephane Nicoll
1f656e75fc Polish "Fix UndertowWebServer's logger name"
Closes gh-16613
2019-04-22 09:59:24 +02:00
liaozan
360da66333 Fix UndertowWebServer's logger name
See gh-16613
2019-04-22 09:58:59 +02:00
ForeverHex
124d969b2d Fix checkstyle violation
Closes gh-16616
2019-04-21 20:28:16 +02:00
Phillip Webb
1f893d9376 Log warning on slow host resolution
Update `StartupInfoLogger` so that if the `InetAddress` call takes
more than 200ms a warning is logged.

Closes gh-7087
2019-04-19 15:11:22 -07:00
Phillip Webb
405135d5a8 Polish StartupInfoLogger message creation
Rework some of the internals of `StartupInfoLogger` so that fewer
strings are created.
2019-04-19 15:11:22 -07:00
Madhura Bhave
ba196b47ac Fix failure analyzer message
See gh-16581
2019-04-19 09:37:31 -07:00
Stephane Nicoll
e9447b0dbf Merge branch '2.1.x' 2019-04-19 16:31:34 +02:00
Stephane Nicoll
2448efc028 Polish "Cache MimeTypes to improve performance"
Closes gh-16507
2019-04-19 16:30:54 +02:00
wenqi.huang
b3f94c47d9 Cache MimeTypes to improve performance
See gh-16507
2019-04-19 16:29:32 +02:00