Commit Graph

6962 Commits

Author SHA1 Message Date
Brian Clozel
b527d364dc Reinstate single page reference documentation
This commit reinstates the single-page variant for the Spring Boot
reference documentation.

Now the single and multi-page variants are hosted under the same
`"html"` folder, as `"index.html"` and `"single-index.html"`.
Note that files ending in `"index.html`" are treated as index files by
the spring-doc-resources project and their table of contents do not
display a "Back to index" link.

Fixes gh-16295
2019-04-29 09:04:36 +02:00
Stephane Nicoll
9cde736b59 Merge branch '2.1.x' 2019-04-26 12:01:11 +03:00
Stephane Nicoll
3c5ec8a04c Merge branch '2.0.x' into 2.1.x 2019-04-26 11:53:02 +03:00
Stephane Nicoll
ac9ee952c7 Properly merge fix
See gh-16666
2019-04-26 11:52:25 +03:00
dreis2211
cf05959375 Optimize ConfigurationPropertyName.buildToString()
See gh-16658
2019-04-25 17:18:55 +01:00
Phillip Webb
32040e355b Merge branch '2.1.x'
Closes gh-16649
2019-04-24 19:50:41 -07:00
Phillip Webb
d4151e0b51 Polish "Use Jackson configuration with JsonPath"
Polish contribution to use a factory method in `AbstractJsonMarshalTester`
rather than additional constructor arguments.

Also change the `JsonContent` tests so that the `Configuration` constructor
is package private. This keeps JsonPath classes out of our public API, at
the expense of limiting custom JsonPath configurations to just our code.

See gh-16629
2019-04-24 19:45:43 -07:00
Phillip Webb
17aaf26590 Use consistent javadoc style for annotation links
Closes gh-13920
2019-04-24 19:37:59 -07: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
Diego Berrueta
756a7f12a3 Use Jackson configuration with JsonPath
Update `JacksonTester` so that the JsonPath instance is explicitly configured
with both a `JacksonJsonProvider` and a `JacksonMappingProvider`.

Prior to this commit, the handling of special characters was not symmetrical
between the serialization (handled via the JacksonTester) and the parsing (handled
via JsonPath) due to the fact that JsonPath used `SimpleJson` as its parser.

See gh-16629
2019-04-24 18:15:46 -07:00
Andy Wilkinson
4754386361 Merge branch '2.1.x'
Closes gh-16644
2019-04-24 15:09:41 +01:00
Andy Wilkinson
6b20d13b3d Polish "Prevent double update of metrics when CompositeMeterRegistry exists"
See gh-16221
2019-04-24 15:02:58 +01:00
Johnny Lim
cc285d92dd Prevent double update of metrics when CompositeMeterRegistry exists
See gh-16221
2019-04-24 14:54:30 +01: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
Andy Wilkinson
a0999dadb7 Merge branch '2.1.x'
Closes gh-16642
2019-04-24 13:57:52 +01:00
Andy Wilkinson
ba0279be14 Remove race condition in TaskSchedulingAutoConfigurationTests
Closes gh-16640
2019-04-24 11:55:41 +01:00
Andy Wilkinson
eb0b852e99 Merge branch '2.1.x'
Closes gh-16639
2019-04-24 10:47:08 +01:00
Andy Wilkinson
5d77b48aed Polish "Polish Maven Plugin's tests"
See gh-16618
2019-04-24 10:40:13 +01:00
daonan.zhan
52c2c534db Polish Maven Plugin's tests
See gh-16618
2019-04-24 10:40:05 +01:00
Andy Wilkinson
d0b4dab1c8 Merge pull request #16620 from Christoph Dreis
* gh-16620:
  Optimize JarEntry construction

Closes gh-16620
2019-04-23 15:28:26 +01:00
dreis2211
f40b086ef5 Optimize JarEntry construction
This commit avoids calling the underlying ZipEntry.setExtra() method
that is not very inline friendly in cases where there is no extra
information to be set.

See gh-16620
2019-04-23 15:25:56 +01:00
Andy Wilkinson
915bde0e62 Use MIME decoder to read OAuth2 resource server public key
Fixes gh-16624
2019-04-23 12:30:39 +01:00
Andy Wilkinson
dc39540def Merge branch '2.1.x'
Closes gh-16623
2019-04-23 09:52:40 +01:00
Andy Wilkinson
e8955852a3 Add missing GlassFish JAXB dependency management
Closes gh-16619
2019-04-23 09:50:46 +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
Madhura Bhave
23cf8565b1 Polish "Apply server customizer beans automatically"
Closes gh-16584
2019-04-22 15:19:42 -07:00
Sergey Serdyuk
8ff78ed4c3 Apply server customizer beans automatically
See gh-16584
2019-04-22 15:19:34 -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
Stephane Nicoll
d55d6b35d9 Merge branch '2.1.x' 2019-04-19 16:02:10 +02:00
Stephane Nicoll
7b9471836b Polish "Improve DefaultCookieSerializer auto-configuration"
Closes gh-16513
2019-04-19 15:55:13 +02:00
Vedran Pavic
5e02541195 Improve DefaultCookieSerializer auto-configuration
Spring Session's own configuration support (i.e.
SpringHttpSessionConfiguration) will configure the default
DefaultCookieSerializer with rememberMeRequestAttribute if
SpringSessionRememberMeServices bean has been detected in the
application context.

In contrast, Spring Boot's auto-configured DefaultCookieSerializer does
not do this which results in a different out-of-the-box experience for
users that rely on Spring Session's remember-me integration.

This commit improves Spring Session DefaultCookieSerializer
auto-configuration to match Spring Session's behavior and make the
auto-configured DefaultCookieSerializer aware of
SpringSessionRememberMeServices bean.

See gh-16513
2019-04-19 15:54:26 +02:00
Johnny Lim
62549ffb49 Polish
Closes gh-16597
2019-04-19 10:02:46 +02:00
Phillip Webb
b879972d0d Migrate to MergedAnnotations API
Migrate away from `AnnotationUtils` and `AnnotatedElementUtils`
when possible to the new `MergedAnnotations` API.

Closes gh-16551
2019-04-18 15:40:02 -07:00
Madhura Bhave
3ecefdbcdc Add dependency management for okhttp3
Closes gh-6385
2019-04-18 14:14:14 -07:00
Madhura Bhave
eda14fb0f6 Analyze failure if configprop scanning results in two beans
Closes gh-16581
2019-04-18 11:43:53 -07:00
Andy Wilkinson
15f28dcc68 Polish "Determine Spring Boot version correctly when using module path"
See gh-16182
2019-04-18 15:09:17 +01:00
Hendrig Sellik
ec8fb614f7 Determine Spring Boot version correctly when using module path
In Java 9, a package may return null for its implementation version
even when the manifest attribute specifying the version is present
in the jar from which the package was loaded.

This commit updates SpringBootVersion to fall back to
accessing the jar and its manifest attributes directly when the
implementation version of its package is null.

See gh-16182
2019-04-18 15:09:11 +01:00
Andy Wilkinson
ca1a666f58 Polish "Add support for configuring remaining Undertow server options"
See gh-16278
2019-04-18 12:21:28 +01:00
Rafiullah Hamedy
186b1fae6d Add support for configuring remaining Undertow server options
This commit adds support for configuring Undertow's server options that were previously
not configurable via application properties. The additions are the following:

- allow-encoded-slash
- always-set-keep-alive
- decode-url
- max-cookies
- max-headers
- max-parameters,
- url-charset

See gh-16278
2019-04-18 12:19:12 +01:00