Commit Graph

10882 Commits

Author SHA1 Message Date
Andy Wilkinson fe6320db42 Align Security filter dispatcher types with Spring Security's defaults
Closes gh-8289
2017-02-14 17:02:36 +00:00
Andy Wilkinson f57dae639d Align default Filter dispatcher types with the Servlet spec
The Servlet spec states that the default is REQUEST. This commit
aligns Spring Boot with that default.

Closes gh-7467
2017-02-14 16:50:49 +00:00
Andy Wilkinson d1a77b6489 Add dependency management for Lettuce
Closes gh-8287
2017-02-14 15:07:38 +00:00
Stephane Nicoll 7cb451b934 Merge branch '1.5.x' 2017-02-14 15:16:42 +01:00
Stephane Nicoll 7920543480 Add note regarding the detection of `spring.jpa.database`
Closes gh-8253
2017-02-14 15:16:17 +01:00
Brian Clozel a5bdbd0dc2 Introduce EmbeddedWebServerInitializedEvent
This commit adds `EmbeddedWebServerInitializedEvent`, which holds the
`EmbeddedWebServer` information when the application context starts.
The `EmbeddedServletContainerInitializedEvent` now inherits from that
type and holds additional information, the
`EmbeddedWebApplicationContext`.

Closes gh-8208
2017-02-14 14:30:49 +01:00
Stephane Nicoll 924397ff94 Merge branch '1.5.x' 2017-02-14 13:32:50 +01:00
Stephane Nicoll 6993854c55 Explain how to downgrade to Jackson 2.6
Closes gh-8192
2017-02-14 13:31:57 +01:00
Andy Wilkinson 54b95973bb Merge branch '1.5.x' 2017-02-14 11:23:36 +00:00
Andy Wilkinson e2a12e77b7 Merge branch '1.4.x' into 1.5.x 2017-02-14 11:23:25 +00:00
Andy Wilkinson 6f3b4db7b3 Merge pull request #8263 from Johnny Lim
* gh-8263:
  Tests that lists of lists are sanitized correctly
  Ensure that entries in a list of lists are not lost during sanitization
2017-02-14 11:23:02 +00:00
Andy Wilkinson bbe9394228 Tests that lists of lists are sanitized correctly
See gh-8263
2017-02-14 11:22:04 +00:00
Johnny Lim 88afc43d44 Ensure that entries in a list of lists are not lost during sanitization
Closes gh-8263
See gh-8197
2017-02-14 11:20:14 +00:00
Stephane Nicoll ce6372c46f Add support of reactive repositories with `@DataMongoTest`
Closes gh-8280
2017-02-14 11:21:51 +01:00
Stephane Nicoll 50553137d3 Merge branch '1.5.x' 2017-02-14 10:32:48 +01:00
Stephane Nicoll a0ef61a27d Enable proxy target class for `MethodValidationPostProcessor`
Closes gh-8277
2017-02-14 10:32:26 +01:00
Andy Wilkinson c99ac2f13d Merge branch '1.5.x' 2017-02-13 15:03:09 +00:00
Andy Wilkinson 4aecf19c92 Merge branch '1.4.x' into 1.5.x 2017-02-13 15:02:57 +00:00
Andy Wilkinson 9499658bc3 Revert "Start building against Spring Framework 4.3.7.BUILD-SNAPSHOT"
This reverts commit 661940033a.

See gh-8248
2017-02-13 15:01:25 +00:00
Andy Wilkinson f9015be619 Merge branch '1.5.x' 2017-02-13 12:37:15 +00:00
Andy Wilkinson e0b355d313 Avoid ClassNotFoundException caused by areturn verification
The verifier's type checker is required to check that a type returned
from a method (an areturn instruction) is assignable to the method's
declared return type. When the return type is an interface, the JLS
states that it should be treated as java.lang.Object. This means that
no analysis of the type being returned is required and verification
passes. When the return type is a class, the type being returned must
be analyzed to ensure that it is compatible. This analysis causes the
return type to be loaded during verification.

Prior to this commit, BasicBatchConfigurer's
createAppropriateTransactionManager method had a return type of
AbstractPlatformTransactionManager and a branch that could return
a JpaTransactionManager. This caused the verifier to attempt to load
JpaTransactionManager so that it could check that it was assignable
to AbstractPlatformTransactionManager. This would fail when
spring-orm is not on the classpath as JpaTransactionManager could not
be loaded.

This commit updates BasicBatchConfigurer to change the return type
of createAppropriateTransactionManager so that it returns a
PlatformTransactionManager which is an interface. As described above,
this relaxes the verification of any areturn instructions in the
method and, in this particular case stops the verifier from trying to
load JpaTransactionManager.

Closes gh-8181
2017-02-13 12:36:17 +00:00
Stephane Nicoll fe552fc920 Merge branch '1.5.x' 2017-02-13 10:09:04 +01:00
Stephane Nicoll bd6d1b74c0 Merge branch '1.4.x' into 1.5.x 2017-02-13 10:08:51 +01:00
Stephane Nicoll bcbcb9c00b Clarify use of `DataSource` for batch apps
Closes gh-8271
2017-02-13 10:08:40 +01:00
Stephane Nicoll 093140ae44 Merge branch '1.5.x' 2017-02-13 09:54:39 +01:00
Stephane Nicoll 842170768d Polish cache sample readme
Closes gh-8272
2017-02-13 09:53:37 +01:00
Stephane Nicoll 53fcd5422e Merge branch '1.5.x' 2017-02-12 14:02:56 +01:00
Stephane Nicoll ff4a4cf33a Merge branch '1.4.x' into 1.5.x 2017-02-12 14:02:37 +01:00
Stephane Nicoll 661940033a Start building against Spring Framework 4.3.7.BUILD-SNAPSHOT
See gh-8248
2017-02-12 14:01:18 +01:00
Stephane Nicoll ca2f8778f4 Merge branch '1.5.x' 2017-02-12 13:59:37 +01:00
Stephane Nicoll 6c4013249b Merge branch '1.4.x' into 1.5.x 2017-02-12 13:59:19 +01:00
Stephane Nicoll 58a4f04962 Fix typo in documentation
Closes gh-8259
2017-02-12 13:59:04 +01:00
Madhura Bhave ffd35aaf5f Merge branch '1.5.x' 2017-02-09 17:15:20 -08:00
Madhura Bhave 77e5c585f4 Validate kid in Cloud Foundry token header
Instead of validating the signature against all the public keys,
we can validate it only against the public key with the kid that
matches the one in the token header.

Closes gh-8126
2017-02-09 16:47:44 -08:00
Stephane Nicoll 25a025cf36 Fix doc generation 2017-02-09 16:54:05 +01:00
Stephane Nicoll 1fdcc3d002 Merge pull request #8230 from mp911de:issue/8051-reactive-mongo
* pr/8230:
  Polish contribution
  Provide a starter for reactive Spring Data MongoDB
2017-02-09 15:55:33 +01:00
Stephane Nicoll b30d4303d5 Polish contribution
Closes gh-8230
2017-02-09 15:54:59 +01:00
Mark Paluch 48b0f1577b Provide a starter for reactive Spring Data MongoDB
Add autoconfiguration to bootstrap MongoDB Reactive Streams driver
components, reactive Spring Data MongoDB and reactive repositories. Add
bean dependency processor for flapdoodle so embedded MongoDB instances
are configured before bootstraping the reactive MongoDB client.

Add Spring Data MongoDB Reactive starter with blocking and non-blocking
dependencies. MongoDB requires a separate driver that is used in the
`ReactiveMongoTemplate` while `MappingMongoConverter` (shared amongst
blocking/reactive Template API) requires the blocking driver to resolve
DBRefs.

See gh-8230
2017-02-09 15:54:59 +01:00
Andy Wilkinson 13791cad53 Use DefaultUriBuilderFactory instead of DefaultUriTemplateHandler
Closes gh-8247
2017-02-09 14:00:53 +00:00
Andy Wilkinson 16b7bf7f73 Merge branch '1.5.x' 2017-02-09 13:50:23 +00:00
Andy Wilkinson 601c6aa305 Tidy up code formatting and address some compiler warnings 2017-02-09 13:48:55 +00:00
Andy Wilkinson df08863641 Make ServletRegistrationBean and FilterRegistration bean generic
Closes gh-7666
2017-02-09 13:36:35 +00:00
Andy Wilkinson a8daed8196 Merge branch '1.5.x' 2017-02-09 11:44:27 +00:00
Andy Wilkinson 7dd8e8c4b8 Honour spring.profiles.include even when .active has not been set
393cfe50 expanded the scope of spring.profiles.include so that it
could be used in any property source, and not just in a configuration
file. However, it did so in such a way that it would only take effect
when used outside of a configuration file if spring.profiles.active
was also set.

This commit updates ConfigFileApplicationListener so that included
profiles are activated when spring.profiles.active has not be set.

Closes gh-8244
2017-02-09 11:44:16 +00:00
Stephane Nicoll ef24f797b1 Merge branch '1.5.x' 2017-02-09 10:53:08 +01:00
Stephane Nicoll 9a2793356b Merge pull request #8215 from davinkevin:master
* pr/8215:
  Allow property expansion for *.yaml
2017-02-09 10:52:38 +01:00
Davin Kevin ff40854653 Allow property expansion for *.yaml
Closes gh-8215
2017-02-09 10:51:01 +01:00
Stephane Nicoll 064faf9560 Merge branch '1.5.x' 2017-02-09 10:43:20 +01:00
Stephane Nicoll aa49468171 Allow to define a custom MessageRecoverer
This commit improves `SimpleRabbitListenerContainerFactoryConfigurer` to
use a custom `MessageConverter`. If such a bean is present, it is used
for the default factory that is auto-configured.

Closes gh-8194
2017-02-09 10:43:03 +01:00
Andy Wilkinson c14a550632 Merge branch '1.5.x' 2017-02-08 22:05:06 +00:00