Commit Graph

50613 Commits

Author SHA1 Message Date
Stephane Nicoll
1624370986 Merge pull request #8594 from lexandro:master
* pr/8594:
  Polish contribution
  Fix invalid security example in doc
2017-03-17 09:57:35 +01:00
Stephane Nicoll
0ca07fbdc3 Polish contribution
Closes gh-8594
2017-03-17 09:56:45 +01:00
lexandro
36b28540ee Fix invalid security example in doc
Closes gh-8580
2017-03-17 09:51:08 +01:00
Stephane Nicoll
78431478e8 Remove System.out
Closes gh-8647
2017-03-17 09:15:55 +01:00
Madhura Bhave
7d90bbe839 Fix typo 2017-03-16 16:16:36 -07:00
Dave Syer
fe8fa2831a Fix properties parsing for comment chars
Update `OriginTrackedPropertiesLoader` to correctly deal with property
values that happen to contain comment characters.

Prior this this commit, values of the following form would not be
parsed correctly:

	foo=bar!
	bar=spam

Closes gh-8647
2017-03-16 13:43:18 -07:00
Phillip Webb
34de119eba Polish 2017-03-16 13:04:03 -07:00
Stephane Nicoll
698aa94cb4 Fix import 2017-03-16 14:53:38 +01:00
Stephane Nicoll
da7287322b Polish 2017-03-16 12:44:06 +01:00
Stephane Nicoll
b7d3aad54b Merge branch '1.5.x' 2017-03-16 12:43:47 +01:00
Stephane Nicoll
fa3679af71 Merge branch '1.4.x' into 1.5.x 2017-03-16 12:40:12 +01:00
Stephane Nicoll
cd76da9a4c Avoid using immutable collections for configuration proprerties
Closes gh-8620
2017-03-16 12:39:48 +01:00
Stephane Nicoll
0c4c2f4bf4 Harmonize webflux sample test 2017-03-16 11:36:41 +01:00
Stephane Nicoll
6d6d76ca06 Polish
See gh-8543
2017-03-16 09:54:06 +01:00
Madhura Bhave
0b1d32e762 Add tests for TestRestTemplate in reactive env
Closes gh-8543
2017-03-15 14:46:44 -07:00
Andy Wilkinson
1893fdab0d Revert "Upgrade to Jackson 2.9.0.pr1"
This reverts commit 10ae5e8f3f. Health
serialization fails with Jackson 2.9.0 (gh-7695).

See gh-8537
2017-03-15 17:01:12 +00:00
Andy Wilkinson
10ae5e8f3f Upgrade to Jackson 2.9.0.pr1
As part of the upgrade, this commit removes the use of any API that
has been deprecated in 2.9.0.pr1. This includes the config props
endpoint's use of SerializationFeature.WRITE_NULL_MAP_VALUES. This
has been replaced with configuring serialization inclusion to only
include properties with non-null values. This means that all
null-valued properties will no longer be serialized, not just those
that are an entry in a map.

Closes gh-8604
Closes gh-8537
2017-03-15 16:38:08 +00:00
Stephane Nicoll
7ee5e43109 Merge branch '1.5.x' 2017-03-15 15:11:02 +01:00
Stephane Nicoll
22934e097d Merge branch '1.4.x' into 1.5.x 2017-03-15 15:10:37 +01:00
Stephane Nicoll
ed2164b97b Merge pull request #8582 from vpavic:improve-redis-session-config
* pr/8582:
  Improve `RedisSessionConfiguration` conditions
2017-03-15 15:10:02 +01:00
Vedran Pavic
17aad4f00c Improve RedisSessionConfiguration conditions
Closes gh-8582
2017-03-15 15:09:31 +01:00
Stephane Nicoll
883dd5802b Merge branch '1.5.x' 2017-03-15 14:52:37 +01:00
Stephane Nicoll
cc79f6d83d Merge branch '1.4.x' into 1.5.x 2017-03-15 14:52:19 +01:00
Stephane Nicoll
f72e0c08df Add a note to ActiveMQ pooling in the doc
Closes gh-8598
2017-03-15 14:51:55 +01:00
Stephane Nicoll
2a22afdba7 Merge pull request #8621 from izeye:polish-20170315
* pr/8621:
  Polish
2017-03-15 09:02:22 +01:00
Johnny Lim
a3d15ed222 Polish
Closes gh-8621
2017-03-15 09:01:54 +01:00
Stephane Nicoll
1b395ddd9d Merge branch '1.5.x' 2017-03-15 08:57:42 +01:00
Stephane Nicoll
cd8684499d Polish
See gh-8621
2017-03-15 08:57:24 +01:00
Stephane Nicoll
6be2cc30d3 Merge branch '1.4.x' into 1.5.x 2017-03-15 08:54:21 +01:00
Stephane Nicoll
bc157d5b4f Polish
See gh-8621
2017-03-15 08:50:50 +01:00
Phillip Webb
b76ca0bf8f Restructure web auto-configuration
Restructure `org.springframework.boot.autoconfigure.web` to better align
with the new package structure in `spring-boot`.

Auto-configuration is now split into client, servlet and reactive
sub-packages. In addition a new `http` package now handles common
HTTP concerns.

Fixes gh-8616
2017-03-14 22:06:28 -07:00
Phillip Webb
33e54ed723 Relocate org.springframework.boot.web.support
Move `org.springframework.boot.web.support` under the `servlet` package.

Fixes gh-8557
2017-03-14 22:03:03 -07:00
Phillip Webb
9d61882bb1 Polish AbstractServletWebServerFactory
Extract some of the utility methods to package private classes
2017-03-14 21:58:47 -07:00
Phillip Webb
b1c689b9b2 Unify WebServerFactory implementations
Unify common for from the abstract `ServletWebServerFactory` and
`ReactiveWebServerFactory` classes. Common code is now located in
`AbstractConfigurableWebServerFactory`.

Fixes gh-8631
2017-03-14 21:52:40 -07:00
Phillip Webb
099e188f9f Unify WebServerFactoryCustomizers
Replace `ReactiveWebServerCustomizer` and `WebServerFactoryCustomizer`
with a unified `WebServerFactoryCustomizer`.

Fixes gh-8558
2017-03-14 21:43:23 -07:00
Phillip Webb
13db69bf41 Drop superfluous @Order annotation
Remove `@Order` which has no effect on `ImportBeanDefinitionRegistrar`.

Fixes gh-8603
2017-03-14 13:49:18 -07:00
Phillip Webb
4100360ceb Make ReactiveWebServerFactory functional interface
Update `ReactiveWebServerFactory` to contain only a single method.

Fixes gh-8559
2017-03-14 13:45:53 -07:00
Phillip Webb
ca5e566deb Fix Configuration processor test tangle
Move `Metadata` test class to fix a package tangle in the test code.

Fixes gh-8613
2017-03-14 13:45:53 -07:00
Phillip Webb
2a9bbfdb86 Fix FailureAnalyzers tangle
Create a new `SpringBootExceptionReporter` interface so that a direct
link between `SpringApplication` and `FailureAnalyzers` is no longer
needed.

This prevents package tangle warnings and allows for cleaner separation
of concerns.

Fixes gh-8612
2017-03-14 13:45:53 -07:00
Phillip Webb
69b72874ea Extract logging listeners
Separate logging ApplicationListeners classes to a different package
so that the root `logging` package is no longer aware of `context`
concerns.

Fixes gh-8611
2017-03-14 13:45:53 -07:00
Phillip Webb
902905ad10 Fix SpringBootVersion tangle
Update `SpringBootVersion` to no longer reference `SpringApplication`
for the root package.

Fixes gh-8610
2017-03-14 13:45:53 -07:00
Phillip Webb
40b3372884 Polish 2017-03-14 13:45:53 -07:00
Madhura Bhave
bfae0d7739 Merge branch '1.5.x' 2017-03-14 13:37:09 -07:00
Madhura Bhave
0dcebdaf7c Merge branch '1.4.x' into 1.5.x 2017-03-14 13:34:41 -07:00
Madhura Bhave
19da8d8271 Fix UnsupportedOperationException
Fixes gh-8602
2017-03-14 11:59:42 -07:00
Madhura Bhave
517b30acbb Merge branch '1.5.x' 2017-03-14 11:35:53 -07:00
Madhura Bhave
8deb72be80 Fix ResourceServerProperties validation
Only try and validate if clientId is present.

Fixes gh-8565
2017-03-14 11:03:21 -07:00
Madhura Bhave
8743148ccd Fix tests 2017-03-13 13:58:32 -07:00
Madhura Bhave
cb1096dc7f Merge branch '1.5.x' 2017-03-13 13:44:34 -07:00
Madhura Bhave
4607f8bc2f Determine key from configured alias for undertow
Closes gh-8245
2017-03-13 12:37:54 -07:00