Commit Graph

12491 Commits

Author SHA1 Message Date
Phillip Webb de66621905 Fix unsupported null argument
Update `MockClientHttpRequestFactory` following upstream Spring
Framework changes that mean `null` is not a valid payload.
2017-06-07 20:37:37 -07:00
Stephane Nicoll d22ab63063 Merge branch '1.5.x' 2017-06-07 23:23:46 +03:00
Stephane Nicoll 9a7ff9a28f Merge branch '1.4.x' into 1.5.x 2017-06-07 23:23:11 +03:00
Stephane Nicoll c8fdb33293 Upgrade to Spring Framework 4.3.9.RELEASE
Closes gh-9280
2017-06-07 23:22:11 +03:00
Stephane Nicoll 2ecb5014ce Merge branch '1.5.x' 2017-06-07 23:18:39 +03:00
Stephane Nicoll f9381f5276 Merge branch '1.4.x' into 1.5.x 2017-06-07 23:18:15 +03:00
Stephane Nicoll ad5e212162 Merge pull request #9429 from artembilan:patch-1
* pr/9429:
  Upgrade to Spring AMQP 1.6.10
2017-06-07 23:17:55 +03:00
Artem Bilan bd1b230599 Upgrade to Spring AMQP 1.6.10
Closes gh-9429
2017-06-07 23:17:27 +03:00
Andy Wilkinson 0061554105 Merge branch '1.5.x' 2017-06-07 17:19:56 +01:00
Andy Wilkinson e5906a6b64 Allow HttpMsgConverter to depend on ConvService without creating a cycle
In an MVC web application, DelegatingWebMvcConfiguration provides the
ConversionService while also consuming WebMvcConfigurerAdapters that,
among other things, can configure HTTP message converters. Boot's
WebMvcConfigurerAdapter, WebMvcAutoConfigurationAdapter, consumes
the HttpMessageConverters bean and uses it to configure Spring MVC's
HTTP message converters. This can create a bean dependency cycle if
an HTTP message converter bean depends, directly or indirectly on
the ConversionService. An example of the cycle is:

┌─────┐
|  jsonComponentConversionServiceCycle.ThingDeserializer defined in …
↑     ↓
|  org.springframework.boot.autoconfigure.web.WebMvcAutoConfiguration$EnableWebMvcConfiguration
↑     ↓
|  org.springframework.boot.autoconfigure.web.WebMvcAutoConfiguration$WebMvcAutoConfigurationAdapter
↑     ↓
|  org.springframework.boot.autoconfigure.web.HttpMessageConvertersAutoConfiguration
↑     ↓
|  mappingJackson2HttpMessageConverter defined in class path resource [org/springframework/boot/autoconfigure/web/JacksonHttpMessageConvertersConfiguration$MappingJackson2HttpMessageConverterConfiguration.class]
↑     ↓
|  jacksonObjectMapper defined in class path resource [org/springframework/boot/autoconfigure/jackson/JacksonAutoConfiguration$JacksonObjectMapperConfiguration.class]
└─────┘

This commit breaks the cycle by making WebMvcAutoConfigurationAdapter
consume HttpMessageConverters lazily. This allows the adapter to be
created without triggered instantiation of every HTTP message
converter bean and all their dependencies. This allows it to be
injected into DelegatingWebMvcConfiguration without triggering an
attempt to retrieve the ConversionService.

Closes gh-9409
2017-06-07 17:18:09 +01:00
Andy Wilkinson 6b7dfce5c6 Formatting 2017-06-07 17:17:57 +01:00
Andy Wilkinson a74d1314ab Merge branch '1.5.x' 2017-06-07 17:15:42 +01:00
Andy Wilkinson a03ddd331c Polishing 2017-06-07 17:14:26 +01:00
Andy Wilkinson f4c9ab78b2 Fix WebFlux sample's reactor-test dependency
See gh-9427
2017-06-07 16:53:16 +01:00
Stephane Nicoll e9dceb4207 Merge branch '1.5.x' 2017-06-07 18:49:22 +03:00
Stephane Nicoll bddf9232a8 Polish 2017-06-07 18:48:24 +03:00
Stephane Nicoll c2aca4d7f5 Document SpringPhysicalNamingStrategy
Closes gh-9084
2017-06-07 18:43:20 +03:00
Stephane Nicoll 040c12bc85 Merge branch '1.5.x' 2017-06-07 18:42:40 +03:00
Stephane Nicoll fc38c1ba4d Improve cache sample
Clarify the cache sample and in particular that Infinispan does not
bootstrap with a default configuration file. Hence the custom
`infinispan.xml` configuration is enabled by default if Infinispan is
available on the classpath.

See gh-9417
2017-06-07 18:41:38 +03:00
Andy Wilkinson c32fab13fd Upgrade to Reactor Bismuth M2
Closes gh-9427
2017-06-07 16:38:44 +01:00
Andy Wilkinson a72c1b2cba Merge branch '1.5.x' 2017-06-07 14:02:46 +01:00
Andy Wilkinson 9579e95868 Handle explicit disablement of management SSL correctly
Closes gh-9423
2017-06-07 13:57:59 +01:00
Andy Wilkinson 901f37de93 Merge branch '1.5.x' 2017-06-07 13:45:48 +01:00
Andy Wilkinson 223b694d3a Sort the table of starter modules alphabetically
Closes gh-9422
2017-06-07 13:45:02 +01:00
Andy Wilkinson 3bcdd29c25 Merge branch '1.5.x' 2017-06-07 13:36:03 +01:00
Andy Wilkinson fcd0adc307 Start building against Spring Data Ingalls snapshots
See gh-9425
2017-06-07 13:35:38 +01:00
Andy Wilkinson de02240f41 Merge branch '1.5.x' 2017-06-07 13:24:20 +01:00
Andy Wilkinson e3e86eb9c8 Merge branch '1.4.x' into 1.5.x 2017-06-07 13:23:59 +01:00
Andy Wilkinson 8810450e64 Upgrade to Spring Data Hopper SR11
Closes gh-9424
2017-06-07 13:23:17 +01:00
Andy Wilkinson dc7498244d Merge branch '1.5.x' 2017-06-07 10:41:05 +01:00
Andy Wilkinson 197c0cefbb Merge pull request #9259 from Ethan Rubinson
* gh-9259:
  Polish "Copy conversion service when performing environment conversion"
  Copy conversion service when performing environment conversion
2017-06-07 10:27:14 +01:00
Andy Wilkinson 5b30269ac9 Polish "Copy conversion service when performing environment conversion"
Closes gh-9246
2017-06-07 10:24:15 +01:00
Rubinson,Ethan(erubinson) a424081803 Copy conversion service when performing environment conversion
Previously, when a web environment was converted to a
StandardEnvironment, any customizations of the source environment's
ConversionService were lost.

This commit updates the logic that performs the conversion to copy
the source's ConversionService to the converted environment, thereby
ensuring that any customizations are retained.

Closes gh-9259
See gh-9246
2017-06-07 10:21:56 +01:00
Andy Wilkinson 563c9dc58c Merge branch '1.5.x' 2017-06-06 22:24:31 +01:00
Andy Wilkinson 84721666c5 Stop DuplicateJsonObjectContextCustomizer breaking context caching
See gh-9248
2017-06-06 22:23:43 +01:00
Andy Wilkinson 61a1798296 Merge branch '1.5.x' 2017-06-06 21:39:09 +01:00
Andy Wilkinson 21a5ab7875 Log a warning during tests when multiple JSONOjects on the class path
Closes gh-9248
2017-06-06 21:35:33 +01:00
Stephane Nicoll 05fbd5dc46 Merge branch '1.5.x' 2017-06-06 16:04:29 +02:00
Stephane Nicoll cbdab9edb3 Add support for custom ProtocolResolver with Devtools
Prior to this commit, custom `ProtocolResolvers` set on the
`ApplicationContext` were lost when Devtools is used as the customized
`ResourceLoader` did not copy any customization made to the default
resource loader.

This commit makes sure to copy any `ProtocolResolver` set on the context.

Closes gh-9331
2017-06-06 16:04:12 +02:00
Andy Wilkinson d844a0cf66 Merge branch '1.5.x' 2017-06-06 14:57:40 +01:00
Andy Wilkinson aa6dbdbae2 Ensure that listeners are called when application fails to run
Closes gh-9054
2017-06-06 14:53:05 +01:00
Andy Wilkinson d0c8f80117 Merge branch '1.5.x' 2017-06-06 11:46:32 +01:00
Andy Wilkinson ad629055fa Ensure that custom static resource locations end with /
Closes gh-9360
2017-06-06 11:39:04 +01:00
Andy Wilkinson cdebfcdeef Merge branch '1.5.x' 2017-06-06 11:22:31 +01:00
Andy Wilkinson 5be5b13775 Clarify need for Apache HTTP Client to disable redirects in TestRestTemplate
Closes gh-9410
2017-06-06 11:14:15 +01:00
Andy Wilkinson 9464eea7ae Merge branch '1.5.x' 2017-06-06 10:43:11 +01:00
Andy Wilkinson a666919acf Increase prominence of warning about fully-executable jar compatibility
Closes gh-8927
2017-06-06 10:42:30 +01:00
Stephane Nicoll f61ad19299 Merge pull request #9411 from vpavic:improve-quartz-support
* pr/9411:
  Polish contribution
  Ensure `QuartzDatabaseInitializer` is initialized before `Scheduler`
2017-06-06 10:59:52 +02:00
Stephane Nicoll 7f420d1268 Polish contribution
Closes gh-9411
2017-06-06 10:52:31 +02:00
Vedran Pavic db060c847d Ensure `QuartzDatabaseInitializer` is initialized before `Scheduler`
If the auto-configured `Scheduler` instance backed by JDBC job store is
used as a dependency in an application component, the initialization of
`Scheduler` will be triggered before `QuartzDatabaseInitializer`. This
will result in failure due to schema not being prepared in time for
`Scheduler` to populate job details.

This commit ensures `QuartzDatabaseInitializer` is initialized before the
auto-configured `Scheduler` by introducing a dependency between the two.

See gh-9411
2017-06-06 10:14:49 +02:00