Commit Graph

1380 Commits

Author SHA1 Message Date
Stephane Nicoll e57c0c0657 Do not attempt to add Jaxb customization if Jaxb is not present
See gh-16268
2019-03-27 11:38:55 +01:00
Stephane Nicoll bece962711 Merge branch '2.1.x' 2019-03-27 10:18:23 +01:00
Stephane Nicoll c2f9e7dd43 Fix StreamsBuilderFactoryBean injection definition
Closes gh-16329
2019-03-27 10:17:49 +01:00
Johnny Lim 038e213343 Restore setExtractBareNamePropertyMethods() for AssertJ
Closes gh-16325
2019-03-27 07:03:07 +01:00
Andy Wilkinson 4900505425 Merge branch '2.0.x' into 2.1.x 2019-03-26 13:53:57 +00:00
Spring Operator a5dba01cb9 Use HTTPS for external links from XML files where possible
See gh-16314
2019-03-26 13:52:17 +00:00
Andy Wilkinson fedb40a2bf Merge branch '1.5.x' into 2.0.x 2019-03-26 13:48:32 +00:00
Stephane Nicoll 197e1669e2 Polish 2019-03-25 09:01:13 +01:00
Madhura Bhave 8f693a0277 Add support for configuration properties scanning
See gh-12602
2019-03-21 13:30:44 -07:00
Brian Clozel 711169aa8a Adapt tests after Servlet.fn added to Spring Framework
Since Servlet.fn support has been added in Spring Framework, new
infrastructure beans (like `HandlerAdapter` and `HandlerMapping`) have
been added.

This commit adapts the Spring MVC auto-configuration tests to reflect
those changes.
2019-03-21 14:31:38 +01:00
Andy Wilkinson 36c1c051b8 Merge branch '2.1.x' 2019-03-20 16:55:10 +00:00
Andy Wilkinson e23f72c8b0 Merge branch '2.0.x' into 2.1.x 2019-03-20 16:53:48 +00:00
Andy Wilkinson 9fbd38ab3c Merge branch '1.5.x' into 2.0.x 2019-03-20 16:45:26 +00:00
Spring Operator 00ab30362c Use HTTPS for external links in XML files
See gh-16270
2019-03-20 14:33:25 +00:00
dreis2211 dda0b3e2a1 Remove explicit types
Closes gh-16265
2019-03-20 09:44:51 +01:00
Andy Wilkinson b828b398b5 Merge branch '2.1.x' 2019-03-19 17:11:45 +00:00
Andy Wilkinson a36aa67b52 Merge branch '2.0.x' into 2.1.x 2019-03-19 17:04:41 +00:00
Spring Operator 3e2b6ac8ed Update build and setup configuration to use HTTPS
See gh-16246
2019-03-19 16:58:31 +00:00
Mohamed Rifni e3269a7e9b Switch FaviconRequestHandler visibility to package private
Closes gh-16250
2019-03-17 09:33:33 +01:00
Stephane Nicoll fcdc414646 Remove use of `@Autowired` for configuration properties bean
See gh-8762
2019-03-14 11:03:10 +01:00
Stephane Nicoll 4d73211c3a Polish "Check for multiple processors in OnClassCondition"
Closes gh-16115
2019-03-13 18:13:33 +01:00
Jan Thewes a96a79ea45 Check for multiple processors in OnClassCondition
See gh-16115
2019-03-13 18:13:11 +01:00
Stephane Nicoll b2290107db Polish "Trim trailing whitespace from spring.server.servlet.context-path"
Closes gh-16165
2019-03-12 17:46:17 +01:00
Mohamed Rifni bde2f850b2 Trim trailing whitespace from spring.server.servlet.context-path
See gh-16165
2019-03-12 17:45:56 +01:00
Andy Wilkinson 68bfb020aa Reduce need for bean method proxying and disable where not needed
Closes gh-9068
2019-03-12 13:18:42 +00:00
Andy Wilkinson 4b98fa7d94 Alias proxyBeanMethods on annotations meta-annotated with @Configuration
Closes gh-16201
2019-03-12 09:24:20 +00:00
Phillip Webb 64a2e8d67f Update copyright year for changed files 2019-03-11 22:15:36 -07:00
Phillip Webb dd3e8154d9 Merge branch '2.1.x' 2019-03-11 22:15:19 -07:00
Phillip Webb fc3aa43cc2 Update copyright year for changed files 2019-03-11 22:14:53 -07:00
Andy Wilkinson aa2008bc5a Merge branch '2.1.x' 2019-03-11 16:40:19 +00:00
Andy Wilkinson 8c3cec8f13 Merge branch '2.0.x' into 2.1.x 2019-03-11 16:14:19 +00:00
Andy Wilkinson 361437f4e2 Merge branch '1.5.x' into 2.0.x 2019-03-11 15:53:34 +00:00
Stephane Nicoll 430571b37b Perform binding at creation time if possible
Previously, environment binding always happened in a post processor once
the bean has been created. Constructor binding requires to perform the
binding at creating time so this commit performs binding at creation
time if possible.

When this happens, a special `ConfigurationPropertiesBeanDefinition` is
created with a supplier that invokes the binder. To avoid a case where
a bean is processed twice, the post-processor now ignores any bean that
has already been bound to the environment.

Closes gh-8762

Co-authored-by: Madhura Bhave <mbhave@pivotal.io>
2019-03-08 15:50:44 +01:00
Andy Wilkinson b8dff5fe17 Merge branch '2.1.x' 2019-03-07 10:20:29 +00:00
Andy Wilkinson 36cbd00853 Disable AssertJ's bare-named property accessor discovery
AssertJ includes a change in 3.12 that means that, by default, it now incorrectly
identifies some of the builder methods on CacheControl as accessor methods for its fields.
This commit restores the behaviour of 3.11 so that a method is only considered to be a
property accessor if a matches the Java bean naming conventions.

Closes gh-16145
2019-03-06 19:42:38 +00:00
Andy Wilkinson 0959698c32 Upgrade to Jersey 2.28
Closes gh-16114
2019-03-06 12:58:35 +00:00
Andy Wilkinson d6a869fa98 Switch to Jakarta EE API dependencies where possible
Closes gh-16113
Closes gh-16112
Closes gh-16111
Closes gh-15916
Closes gh-15689
2019-03-06 11:20:51 +00:00
Brian Clozel ce9626d00f Disable JMX by default
This commit switches the default value for the `spring.jmx.enabled`
configuration property.
JMX is now disabled by default and can be enabled with
`spring.jmx.enabled=true`.

Closes gh-16090
2019-03-05 18:51:00 +01:00
Johnny Lim f4786d7d2e Polish
Closes gh-16083
2019-03-04 15:19:57 +01:00
Dmytro Nosan c0a458e9d0 Remove unused constructor argument
Closes gh-16059
2019-02-28 14:09:34 +01:00
Stephane Nicoll d5448eb124 Polish "Add failure analyzer for Flyway's bootstrap failure"
Closes gh-16015
2019-02-28 13:46:04 +01:00
anand 96315372ef Add failure analyzer for Flyway's bootstrap failure
See gh-16015
2019-02-28 13:46:04 +01:00
Stephane Nicoll 2ad234b605 Adapt to breaking change in Spring Hateoas 2019-02-28 13:42:27 +01:00
Stephane Nicoll 554bff6145 Merge branch '2.1.x' 2019-02-27 15:19:37 +01:00
Stephane Nicoll eebd906c8a Polish contribution
Closes gh-16047
2019-02-27 15:10:43 +01:00
Dan Zheng 2c4afb3bd8 Fix NamedParameterJdbcTemplate precedence with database migration tools
See gh-16047
2019-02-27 15:10:20 +01:00
Stephane Nicoll 715db153e3 Polish "Remove code deprecated in 2.1"
Closes gh-16013
2019-02-27 11:15:48 +01:00
Mehmed Baždar 246111cd84 Remove code deprecated in 2.1
See gh-16013
2019-02-27 10:08:48 +01:00
Andy Wilkinson f2e3e274a8 Merge branch '2.1.x' 2019-02-21 08:19:43 +00:00
Andy Wilkinson 53326695ea Polish 2019-02-21 08:13:54 +00:00
Andy Wilkinson de0c065625 Inject single-use configuration dependencies into bean methods
Closes gh-15751
2019-02-20 17:02:43 +00:00
Johnny Lim 55f5f2f910 Polish
Closes gh-15987
2019-02-19 09:14:40 +01:00
Stephane Nicoll ddfdc48161 Merge branch '2.1.x' 2019-02-18 21:25:25 +01:00
Stephane Nicoll 42c246cacb Polish contribution
Closes gh-15984
2019-02-18 21:18:51 +01:00
isank e546ed4834 Order TaskExecution auto-config before TaskScheduling auto-config
See gh-15984
2019-02-18 21:18:09 +01:00
Stephane Nicoll fa49dfcaaf Add support for task scheduling shutdown related properties
See gh-15951
2019-02-18 21:13:32 +01:00
Stephane Nicoll d2cbf08f09 Polish "Add support for task executor shutdown related properties"
Closes gh-15951
2019-02-18 21:13:32 +01:00
Filip Hrisafov 3b47ba21a8 Add support for task executor shutdown related properties
See gh-15951
2019-02-18 21:13:32 +01:00
Andy Wilkinson add8c6f295 Align HypermediaAutoConfigurationTests with latest HATEOAS API changes
See gh-15939
2019-02-18 09:41:11 +00:00
Stephane Nicoll 71df2f311b Polish "Expose Tomcat AccessLog Max days property"
Closes gh-15954
2019-02-14 16:01:21 +01:00
Dmytro Nosan 596f0c28c0 Expose Tomcat AccessLog Max days property
See gh-15954
2019-02-14 16:01:21 +01:00
Stephane Nicoll 8939a7eec3 Merge branch '2.1.x' 2019-02-14 15:35:18 +01:00
Stephane Nicoll f3e142cb7c Polish "Stop using imports from shaded dependencies"
Closes gh-15950
2019-02-14 15:34:03 +01:00
Michael Simons de7812aa3a Stop using imports from shaded dependencies
See gh-15950
2019-02-14 15:34:03 +01:00
Andy Wilkinson 747e419db1 Merge branch '2.1.x' 2019-02-13 17:45:45 +00:00
Andy Wilkinson 9fb0b97f96 Decorate test containers so tests are skipped without Docker
Closes gh-15901
Closes gh-15638
2019-02-13 17:44:45 +00:00
Stephane Nicoll 3d6def9f81 Handle BatchMessagingMessageConverter with Kafka batch listeners
Closes gh-15942
2019-02-13 17:06:38 +01:00
Andy Wilkinson 18174a8e9e Polish "Add opt-in support for Neo4j-OGM native types"
See gh-15637
2019-02-13 15:04:54 +00:00
Michael Simons af21b847a0 Add opt-in support for Neo4j-OGM native types
This includes tests for the autoconfiguration using that new property.
The test require the native types for Bolt and embedded in the test
scope, so the Neo4j-OGM native types have been added to managed
dependencies.

The enhanced autoconfiguration throws an
InvalidConfigurationPropertyValueException when native types cannot be
used due to missing dependencies or wrong transport mode.

See gh-15637
2019-02-13 14:38:44 +00:00
Andy Wilkinson e924745bf8 Start building against Spring Data Moore M2 snapshots
See gh-15197
2019-02-13 11:26:37 +00:00
Andy Wilkinson c41924f7d4 Merge branch '2.1.x' 2019-02-12 15:45:55 +00:00
Andy Wilkinson ab8fcf0d71 Polish "Use class for @ConditionalOnClass"
See gh-15775
2019-02-12 15:45:05 +00:00
Johnny Lim b423962c89 Use class for @ConditionalOnClass
See gh-15775
2019-02-12 15:45:00 +00:00
Andy Wilkinson 48e781181e Merge branch '2.1.x' 2019-02-12 14:15:20 +00:00
Andy Wilkinson 799ac24da1 Reinstate auto-config of RequestContextFilter with Jersey
Previously, the auto-configuration for both Jersey and WebMvc would auto-configure
a RequestContextFilter bean. In 2.1.0, this led to a startup failure due to the latter
attempting to override the bean defined by the former. In addition to the override there
were also problems with the order of the filter as Jersey uses -1 and MVC uses -105.

To avoid the above-described problems, the auto-configuration of the RequestContextFilter
was removed from JerseyAutoConfiguration in 2.1.1. Unfortunately, the broke
request-scoped beans for those using only Jersey.

This commit attempts to strike a better balance by reintroducing the auto-configuration
of RequestContextFilter in JerseyAutoConfiguration. It will back off if the user defines
their own filter or filter registration. WebMvcAutoConfiguration has been updated to
back off in the same manner. This leaves the potential for ordering problems, but they
are no worse than they were before. Furthermore, the user has the means to correct any
problems by using the various filter ordering properties that are provided for Jersey,
Spring Session, Spring Security, etc.

Closes gh-15376
2019-02-12 14:05:36 +00:00
Andy Wilkinson db31e42751 Merge branch '2.1.x' 2019-02-12 09:58:21 +00:00
Andy Wilkinson a975c0ad16 Use Testcontainers’ CassandraContainer rather than our own
Closes gh-15901
2019-02-12 09:58:05 +00:00
Andy Wilkinson 6fe226d781 Merge branch '2.1.x' 2019-02-11 17:38:24 +00:00
Andy Wilkinson 20f26c4d30 Polish "Fix stopping of Embedded Mongo before context is closed"
See gh-15692
2019-02-11 17:34:40 +00:00
Eugene 750246f021 Fix stopping of Embedded Mongo before context is closed
See gh-15692
2019-02-11 17:33:59 +00:00
Andy Wilkinson b5c9afc055 Merge branch '2.1.x' 2019-02-11 17:12:51 +00:00
Andy Wilkinson 295a660e35 Polish "Set NO_REQUEST_TIMEOUT as a server option not a socket option"
See gh-15822
2019-02-11 17:11:20 +00:00
ayudovin dbce3731a4 Set NO_REQUEST_TIMEOUT as a server option not a socket option
See gh-15822
2019-02-11 17:08:16 +00:00
Andy Wilkinson c6a1df6cd4 Merge branch '2.1.x' 2019-02-11 16:42:29 +00:00
Jeffrey van der Laan 4f86233ca7 Do not auto-configure OEMIV filter when user defines registration bean
See gh-15889
2019-02-11 16:33:06 +00:00
Kedar Joshi 4a253ff87c Polish
1. Removed unnecessary null checks
2. Combined collection initialization and modification
3. Minor collections related optimizations

Closes gh-15837
2019-02-10 10:35:36 +01:00
Madhura Bhave 4d69e127c8 Merge branch '2.1.x' 2019-02-08 18:38:21 -08:00
Madhura Bhave 26da45aa9a Configure a JerseyApplicationPath bean for the actuators
This commit also ensures that Jersey-based actuator endpoints are
available before the user has configured a `ResourceConfig` bean

Fixes gh-15625
Fixes gh-15877
2019-02-08 18:38:01 -08:00
Brian Clozel e8fef97335 Merge branch '2.1.x' 2019-02-08 12:29:39 +01:00
Brian Clozel cba6079b7b Log unhandled server exceptions in WebFlux
Prior to this commit, errors unhandled by custom `WebExceptionHandler`
and resulting in an HTTP 500 status would not be logged at ERROR level,
giving no information to developers about the actual exception.

This commit ensures that such exceptions are logged at the ERROR level
with their exception. By the time the exception hits the
`DefaultErrorWebExceptionHandler`, if the response is already committed
or if the exception is due to a client disconnecting, the error is
delegated to Framework support as Spring Boot won't be able to render an
error page as expected.

Fixes gh-15769
2019-02-08 12:25:05 +01:00
Andy Wilkinson 45cc649c7d Merge branch '2.1.x' 2019-02-04 12:36:33 +00:00
Andy Wilkinson 82bc87560c Use AssertJ’s exception assertions rather than fail
Closes gh-15761
2019-02-04 11:48:26 +00:00
Stephane Nicoll 5269ea5536 Polish contribution
Closes gh-15754
2019-01-31 16:33:38 +01:00
Johnny Lim 6603033bbc Polish SessionConfigurationImportSelector.selectImports()
See gh-15754
2019-01-31 16:33:02 +01:00
Stephane Nicoll 002fa405a8 Merge branch '2.1.x' 2019-01-31 16:26:37 +01:00
Stephane Nicoll ede23caace Polish "Inject Map directly rather than via ObjectProvider"
Closes gh-15798
2019-01-31 16:25:18 +01:00
ayudovin 3a2e85ce75 Inject Map directly rather than via ObjectProvider
See gh-15798
2019-01-31 16:24:18 +01:00
Stephane Nicoll c5675de666 Polish "Handle AccessControlException in JspTemplateAvailabilityProvider"
Closes gh-15778
2019-01-31 16:21:48 +01:00
ayudovin 81273bdf9a Handle AccessControlException in JspTemplateAvailabilityProvider
See gh-15778
2019-01-31 16:20:19 +01:00
dreis2211 d4ab101223 Use Assertions.contentOf() where possible
Closes gh-15793
2019-01-28 10:08:57 +01:00
Stephane Nicoll 342212b8dc Merge branch '2.1.x' 2019-01-28 10:08:02 +01:00
Stephane Nicoll 6f86a84301 Polish "Alias auto-configured `TaskExecutor` to make async tasks use it"
Closes gh-15748
2019-01-28 10:04:30 +01:00
Camille Vienot d0859f1569 Alias auto-configured `TaskExecutor` to make async tasks use it
See gh-15748
2019-01-28 09:59:55 +01:00
Andy Wilkinson 530c7bee71 Do not auto-configure HttpMessageConverters in reactive web apps
Closes gh-15712
2019-01-18 14:57:14 -05:00
Andy Wilkinson 6abd18ae96 Do not auto-configure RestTemplateBuilder in reactive web apps
Closes gh-15718
2019-01-18 14:50:24 -05:00
Andy Wilkinson 5d60d6bd62 Use ApplicationContextRunner to test RestTemplateAutoConfiguration 2019-01-18 14:36:18 -05:00
Andy Wilkinson 7dd65074e8 Only perform background pre-init with multiple processors
Closes gh-15722
2019-01-18 11:50:17 -05:00
Stephane Nicoll 6baa6b291e Polish contribution
Closes gh-15695
2019-01-14 08:11:20 -05:00
Johnny Lim af3ed9ff9f Polish
See gh-15695
2019-01-14 08:09:32 -05:00
Phillip Webb 2f77ef7722 Merge branch '2.1.x' 2019-01-11 16:45:05 -08:00
Phillip Webb 6a901199f5 Polish 2019-01-11 16:42:02 -08:00
Stephane Nicoll 8d1d3fb087 Polish "Avoid string concatenation inside StringBuilder append()"
Closes gh-15589
2019-01-11 08:30:12 +01:00
igor-suhorukov 59ac85d371 Avoid string concatenation inside StringBuilder append()
See gh-15589
2019-01-11 08:28:19 +01:00
Brian Clozel a83d9635af Merge branch '2.1.x' 2019-01-08 16:13:35 +01:00
Brian Clozel 6200a319f2 Polish
Closes gh-15385
2019-01-08 16:13:18 +01:00
ayudovin e9588ca04b Support server.connection-timeout for Netty server 2019-01-08 16:03:08 +01:00
Stephane Nicoll 448f1626f9 Merge branch '2.1.x' 2019-01-07 14:56:18 +01:00
Stephane Nicoll 830da28b8c Fix JPA bootstrap executor detection with multiple candidates
Spring Boot provides two separate auto-configurations that can
potentially expose an `AsyncTaskExecutor` implementation so relying on
the presence of a single instance is too weak.

This commit fixes the detection of the AsyncTaskExecutor that can be
used to bootstrap JPA so that a single instance is used and, in the case
more than one exists, the one named `applicationTaskExecutor`.

Closes gh-15447
2019-01-07 14:54:59 +01:00
Stephane Nicoll 6ba1f40e59 Polish "Allow easy customization of EmbeddedMongo DownloadConfig"
Closes gh-15496
2019-01-02 10:33:17 +01:00
michael b5b6889601 Allow easy customization of EmbeddedMongo DownloadConfig
See gh-15496
2019-01-02 10:30:33 +01:00
Madhura Bhave 19caff6776 Merge branch '2.1.x' 2018-12-31 13:24:52 -08:00
Oleksii Bondar b52dddf784 Refactor OAuth2ClientPropertiesRegistrationAdapterTests
Closes gh-15586
2018-12-31 13:18:00 -08:00
Stephane Nicoll d0811b48df Polish "Disable Hibernate entity scanning for default JPA setup"
Closes gh-15565
2018-12-31 16:51:43 +01:00
ayudovin 510a8e2ec1 Disable Hibernate entity scanning for default JPA setup
See gh-15565
2018-12-31 16:51:31 +01:00
Stephane Nicoll 33547569db Merge branch '2.1.x' 2018-12-31 10:36:41 +01:00
Stephane Nicoll c6202b57e0 Merge branch '2.0.x' into 2.1.x 2018-12-31 10:36:24 +01:00
Stephane Nicoll be161b23cb Polish class conditions documentation
Closes gh-15578
2018-12-31 10:36:02 +01:00
dreis2211 0f5f6f15dc Use hasFieldOrPropertyWithValue where possible
Closes gh-15582
2018-12-30 09:48:27 +01:00
Stephane Nicoll b578dc05df Polish 2018-12-26 09:16:27 +01:00
igor-suhorukov dfb3cd51bc Simplify code by using for-each loop
See gh-15563
2018-12-25 09:58:42 +01:00
Stephane Nicoll fd12e696b0 Polish "Replace redundant call to class isInstance() with instanceof"
Closes gh-15554
2018-12-23 15:51:39 +01:00
igor-suhorukov 7424f48803 Replace redundant call to class isInstance() with instanceof
See gh-15554
2018-12-23 15:50:22 +01:00
Andy Wilkinson ddf64802c0 Merge branch '2.1.x' 2018-12-21 15:13:10 +00:00
Andy Wilkinson bfd63ab085 Polish "Stop JtaAutoConfiguration from enabling JtaProperties when not used"
Closes gh-15550
2018-12-21 15:12:29 +00:00
Nishant Raut 0b29da14b3 Stop JtaAutoConfiguration from enabling JtaProperties when not used
See gh-15550
2018-12-21 15:12:29 +00:00
Stephane Nicoll 9d67400afa Merge branch '2.1.x' 2018-12-20 17:54:08 +01:00
igor-suhorukov e578d30722 Replace anonymous inner class with lambda
See gh-15438
2018-12-20 17:47:29 +01:00
Andy Wilkinson 3a7406fe3a Merge branch '2.0.x' into 2.1.x 2018-12-20 15:58:03 +00:00
Andy Wilkinson 0741c90489 Avoid blocking on a Mono indefinitely
Closes gh-15535
2018-12-20 15:31:39 +00:00
Andy Wilkinson 9d2d6d5812 Merge branch '2.1.x' 2018-12-20 15:30:51 +00:00
Andy Wilkinson 9a33d1a2f9 Merge branch '2.0.x' into 2.1.x 2018-12-20 15:30:42 +00:00
Andy Wilkinson 8c68da0882 Avoid blocking on a Mono indefinitely
Closes gh-15535
2018-12-20 15:24:53 +00:00
Andy Wilkinson 70f4d5e5a8 Polish "Apply context and connector customizer beans to Tomcat factories"
Closes gh-15492
2018-12-19 17:09:21 +00:00
Raheela 90c489048f Apply context and connector customizer beans to Tomcat factories
See gh-15492
2018-12-19 17:01:02 +00:00
Andy Wilkinson c8a0c99a21 Remove D…S…Init…InvokerTests' assumptions about classpath structure
See gh-15471
2018-12-17 16:35:22 +00:00
Stephane Nicoll 6207b46bc6 Merge branch '2.1.x' 2018-12-17 17:07:58 +01:00
dreis2211 948902f090 Avoid unnecessary usage of ReflectionTestUtils
Closes gh-15482
2018-12-17 17:07:23 +01:00
Andy Wilkinson 61d04db0d7 Minimize and centralize assumptions about build output
Closes gh-15471
2018-12-14 17:50:20 +00:00
Andy Wilkinson 064f6478df Move back to JUnit 4 until SUREFIRE-1614 has been resolved
See gh-14736
See gh-14737
See gh-14738
2018-12-12 16:49:30 +00:00
Andy Wilkinson 2b453bbb16 Minimise dependencies on Log4j2
Closes gh-15441
2018-12-12 08:19:34 +00:00