Commit Graph

9960 Commits

Author SHA1 Message Date
Andy Wilkinson
3e88c366ec Polish "Avoid property name collisions when serializing AuditEvent to JSON"
See gh-7990
2017-01-19 12:39:14 +00:00
Johannes Edmeier
fcf36ed091 Avoid property name collisions when serializing AuditEvent to JSON
Previously, in case the data for the audit event contained an entry
with the key "type", the member `type` from the AuditEvent would be
overwritten when rendering to JSON due to the use of @JsonAnyGetter on
the data property.

This commit removes @JsonAnyGetter so that the data map is rendered as
a separate property in the JSON.

Closes gh-7990
2017-01-19 12:33:15 +00:00
Andy Wilkinson
3fcdd310d3 Upgrade to Neo4j OGM 2.1.1
Closes gh-8025
2017-01-19 12:30:55 +00:00
Andy Wilkinson
f93d4a0cbf Add explicit aliases for exclude and excludeName on SpringBootApplication
Previously, SpringBootApplication relied on implicity aliasing of
exclude and excludeName that worked because the two attributes have
the same names as the equivalent attributes on
EnableAutoConfiguration.

This commit updates SpringBootApplication to make the aliases explicit
and also adds tests to EnableAutoConfigurationImportSelectorTests to
verify that the aliasing is working as intended.

Closes gh-7951
2017-01-19 12:29:46 +00:00
Stephane Nicoll
c41ff17dd7 Provide relevant default values for Enums
This commits adds manual metadata for enums that have a default value
since the annotation processor is not able to detect that yet.

Closes gh-7890
2017-01-19 13:19:13 +01:00
Andy Wilkinson
c31a2d8101 Merge branch '1.4.x' into 1.5.x 2017-01-19 11:03:33 +00:00
Andy Wilkinson
80a1e1ae64 Polishing 2017-01-19 11:03:18 +00:00
Andy Wilkinson
4e70cd2934 Merge branch '1.4.x' into 1.5.x 2017-01-19 10:58:34 +00:00
Andy Wilkinson
b7a02e7237 Update TestRestTemplate to apply template handler to URIs
Previously, TestRestTemplate would only apply the UriTemplateHandler
to Strings and not to URIs. When using the auto-configured
TestRestTemplate, this prevented relative URIs from being
made absolute using LocalHostUriTemplateHandler.

The commit updates TestRestTemplate to turn URIs into Strings before
passing them to the delegate RestTemplate. Turning them into Strings
ensures that the delegate calls the UriTemplateHandler.

Closes gh-7891
2017-01-19 10:39:02 +00:00
Andy Wilkinson
531cf5d4f6 Merge branch '1.4.x' into 1.5.x 2017-01-19 09:28:14 +00:00
Andy Wilkinson
6a0fb8e44c Update DevTools' ResourceLoader to delegate to user's custom loader
Previously, when DevTools' was used it would set the application
context's ResourceLoader and overwrite any custom ResourceLoader that
had been configured. On the rare occasion when the user had customized
the ResourceLoader this meant that the customization was lost and
certain resources would become unavailable.

This commit updates DevTools' ResourceLoader to delegate a custom
ResourceLoader if one has been configured. If one has not been
configured it delegates as before, i.e. to
WebApplicationContextResourceLoader for web applications and to
DefaultResourceLoader for all others apps.

Closes gh-8010
2017-01-19 09:28:09 +00:00
Phillip Webb
1d55f5f6cd Merge branch 'gh-7579' into 1.5.x 2017-01-18 21:01:38 -08:00
Phillip Webb
10dbf3c571 Use @Validated as trigger for JSR-330 validation
Update `ConfigurationPropertiesBindingPostProcessor` so that
`@Validated` is expected to be used to trigger JSR-330 validation.

Any existing configuration classes that use JSR-330 annotations but
don't have `@Validated` will currently still be validated, but will
now log a warning. This should give users a chance to add the requested
annotations before the next Spring Boot release where we will use them
as the exclusive signal that validation is required.

Closes gh-7579
2017-01-18 21:01:07 -08:00
Phillip Webb
f42ebe428c Remove JSR-330 configuration annotations
Replace JSR-330 validation annotations from all internal
`@ConfigurationProperties` classes with standard Asserts.

Prior to this commit validation of our own configuration properties
would only occur when the user happens to have compliant JSR-330
implementation on their classpath.

See gh-7579
2017-01-18 20:51:35 -08:00
Phillip Webb
0a6456a748 Always use prefix config annotation attribute
Update use of `@ConfigurationProperties` to prefer the more explicit
`prefix` attribute, rather than `value`.

See gh-7579
2017-01-18 20:49:53 -08:00
Phillip Webb
43d432a527 Polish 2017-01-18 20:35:41 -08:00
Phillip Webb
d1a8d136a7 Merge branch '1.4.x' into 1.5.x 2017-01-18 13:56:42 -08:00
Phillip Webb
b28d537c78 Disable unwanted m2e activations
Add m2e activation properties to disable unwanted Eclipse facets.
2017-01-18 13:48:49 -08:00
Stephane Nicoll
158ce3c376 Merge branch '1.4.x' into 1.5.x 2017-01-18 16:36:23 +01:00
Stephane Nicoll
b242543545 Backport missing 3rd party starter reference 2017-01-18 16:34:11 +01:00
Stephane Nicoll
3cf4d75aaa Merge branch '1.4.x' into 1.5.x 2017-01-18 16:25:46 +01:00
Stephane Nicoll
b7d3e91e38 Merge pull request #8014 from larsgrefer:patch-1
* pr/8014:
  Add OkHttp starter reference
2017-01-18 16:25:20 +01:00
Lars Grefer
f5d1b7807c Add OkHttp starter reference
Closes gh-8014
2017-01-18 16:24:23 +01:00
Andy Wilkinson
baeb9c3495 Merge pull request #7902 from Alessandro Falappa
* gh-7902:
  Make start/stop run-levels configurable in INIT-INFO of launch.script
2017-01-18 14:25:05 +00:00
Alessandro Falappa
ec537b307e Make start/stop run-levels configurable in INIT-INFO of launch.script
See gh-7008
Closes gh-7902
2017-01-18 14:24:29 +00:00
Andy Wilkinson
353829c4e5 Merge pull request #8009 from Quentin Caillard
* gh-8009:
  Correct typo in comment in spring-boot-dependencies
2017-01-18 14:19:16 +00:00
Quentin Caillard
0a46bff4b2 Correct typo in comment in spring-boot-dependencies
Closes gh-8009
2017-01-18 14:18:41 +00:00
Andy Wilkinson
0ae297299b Merge pull request #8002 from Christoph Dreis
* gh-8002:
  Improve performance of RelaxedNames
2017-01-18 14:16:11 +00:00
dreis
93f97719f0 Improve performance of RelaxedNames
Closes gh-8002
2017-01-18 14:07:19 +00:00
Andy Wilkinson
ba8f7214d8 Merge branch '1.4.x' into 1.5.x 2017-01-18 13:39:48 +00:00
Andy Wilkinson
0e72ef1a10 Improve diagnostics for in StarterDependenciesIntegrationTests
The root cause of the build failure something has a null message which
means there's no information available about why the build failed.
Instead of calling fail when a BuildException occurs, this commit
wraps it in a RuntimeException and rethrows it. This should make the
entire chain of exceptions available when a failure occurs.
2017-01-18 13:38:10 +00:00
Andy Wilkinson
29adf2d85e Ensure that test closes InputStream that reads contents of output files 2017-01-17 21:16:20 +00:00
Andy Wilkinson
5c9aa41c07 Update InMemoryRichGaugeRepository to support increments
Closes gh-2902
2017-01-17 17:15:26 +00:00
Andy Wilkinson
cb7ae2e60a Add a deployment test for WebSphere Liberty Profile
Closes gh-7419
2017-01-17 17:03:41 +00:00
Andy Wilkinson
69f362baca Use properties for versions of plugins managed in spring-boot-dependencies
Closes gh-4952
2017-01-17 16:43:36 +00:00
Andy Wilkinson
e19400ba4c Merge pull request #7973 from Kazuki Shimizu
* gh-7973:
  Use constructor injection in DataSourceInitializer
2017-01-17 16:14:20 +00:00
Kazuki Shimizu
19e117c9cb Use constructor injection in DataSourceInitializer
Closes gh-7973
2017-01-17 16:13:10 +00:00
Andy Wilkinson
8d67a2fabc Merge pull request #7436 from Eddú Meléndez
* gh-7436:
  Simplify Jackson dependency management by importing its bom
2017-01-17 16:04:12 +00:00
Eddú Meléndez
7c33125eb0 Simplify Jackson dependency management by importing its bom
Closes gh-7436
2017-01-17 15:59:22 +00:00
Andy Wilkinson
bb2058bf66 Merge branch '1.4.x' into 1.5.x 2017-01-17 15:44:28 +00:00
Andy Wilkinson
2a5586fbcf Ensure that JarResourceManager correctly handles path without leading /
Previously, JarResourceManager assumed that the path would begin with
a / but this isn't always the case. For example, it may be an empty
string. This could lead to a malformed jar:file: URL that used ! as
the separator rather than the required !/.

This commit updates JarResourceManager to prepend / to any path that
does not being with one before using it to construct the URL.

Closes gh-7717
2017-01-17 15:40:53 +00:00
Andy Wilkinson
7fa33cddd7 Merge branch '1.4.x' into 1.5.x 2017-01-17 15:00:01 +00:00
Andy Wilkinson
a02c2d4155 Improve the documentation of Health.Status constants
Closes gh-7784
2017-01-17 14:59:53 +00:00
Andy Wilkinson
d76e1ef95e Merge branch '1.4.x' into 1.5.x 2017-01-17 14:44:43 +00:00
Andy Wilkinson
9695e0a9d1 Document breakpoint config for remote debug tunnel and IntelliJ IDEA
Closes gh-7732
See gh-5047
2017-01-17 14:43:38 +00:00
Andy Wilkinson
2973d3ed4b Polishing 2017-01-17 14:35:30 +00:00
Andy Wilkinson
ed18478054 Give FileWritingMessageHandler more time to sort itself out
See 3927dca3
2017-01-17 14:26:14 +00:00
Andy Wilkinson
c71abbf6cd Merge branch '1.4.x' into 1.5.x 2017-01-17 14:25:33 +00:00
Andy Wilkinson
0463350d2e Document that spring(Profile|Property) cannot be used with scan=true
Closes gh-5611
2017-01-17 14:23:43 +00:00
Andy Wilkinson
682d0f524f Test insecure, insensitive endpoint with property that's always available
The user property is only available on Unix-like platforms (due to
the USER environment variable). This commit updates the test to
explicitly set a specific property and then check that it's accessible
via the env endpoint rather than using one that is OS-specific.

See gh-7868
See gh-7881
2017-01-17 13:17:32 +00:00