Commit Graph

23481 Commits

Author SHA1 Message Date
Andy Wilkinson
cffc870fd6 Fix test failures on Windows
Since the move to JUnit 5, a number of tests were failing on Windows.
The majority were failing due to open file handles preventing the
clean up of the tests' temporary directory. This commit addresses
these failures by updating the tests to close JarFiles, InputStreams,
OutputStreams etc.

A change has also been made to CachingOperationInvokerTests to make
a flakey test more robust. Due to System.currentTimeMillis() being
less precise on Windows than it is on *nix platforms, the test could
fail as it would not sleep for long enough for the TTL period to have
expired.
2019-06-13 09:24:31 +01:00
Andy Wilkinson
c56fbf8c3d Allow Archives to be closed so they can release resources
Closes gh-17126
2019-06-13 09:22:54 +01:00
Stephane Nicoll
4748626f45 Merge pull request #17129 from dlsrb6342
* pr/17129:
  Polish "Use existing properties field"
  Use existing properties field

Closes gh-17129
2019-06-13 09:55:42 +02:00
Stephane Nicoll
46c2da4a19 Polish "Use existing properties field"
See gh-17129
2019-06-13 09:54:51 +02:00
Ingyu Hwang
725cbd9bc8 Use existing properties field
See gh-17129
2019-06-13 09:54:31 +02:00
Phillip Webb
e0aa90cf32 Fix incomplete polish of RedisSessionProperties
Fix polish commit from 919913ae66 to correctly name the property
getter/setters.

See gh-17022
2019-06-12 17:43:11 -07:00
Madhura Bhave
b59dc5bce4 Update examples in documentation in accordance with JUnit 5
See gh-17096
2019-06-12 17:38:32 -07:00
Phillip Webb
1213654c74 Merge pull request #17022 from nosan
* pr/17022:
  Polish "Add session property for ConfigureRedisAction"
  Add session property for ConfigureRedisAction

Closes gh-17022
2019-06-12 17:34:56 -07:00
Phillip Webb
919913ae66 Polish "Add session property for ConfigureRedisAction"
See gh-17022
2019-06-12 17:33:45 -07:00
Dmytro Nosan
a0fabc9851 Add session property for ConfigureRedisAction
Add a new property to `RedisSessionProperties` that allows the default
`ConfigureRedisAction` to be changed. Users can still also configure
the action using a `@Bean`.

See gh-17022
2019-06-12 17:31:39 -07:00
Phillip Webb
2888ddee22 Merge pull request #17091 from L00kian
* pr/17091:
  Polish "Support default headers with RestTemplateBuilder"
  Support default headers with RestTemplateBuilder

Closes gh-17091
2019-06-12 16:36:03 -07:00
Phillip Webb
aad21d1996 Polish "Support default headers with RestTemplateBuilder"
Broaden the scope of customizer support so that instead of focusing
just on headers, we can now customize any outgoing `HttpClientRequest`.
Also update auto-configuration to automatically add any
`RestTemplateRequestCustomizer` beans to the builder.

See gh-17091
2019-06-12 16:34:31 -07:00
Ilya Lukyanovich
43b1a667ce Support default headers with RestTemplateBuilder
Update `RestTemplateBuilder` so that it is easier to apply custom
headers to the outgoing request. The update is particularly useful
for setting the `User-Agent` header, for example so that a GitHub
username can be used when calling `api.github.com`.

See gh-17091
2019-06-12 13:49:39 -07:00
Andy Wilkinson
9b5cb4f9b8 Remove need for public constructor on inner-class
Closes gh-17086
2019-06-12 14:55:40 +01:00
Brian Clozel
7a9d1a1e34 Change default Freemarker template file extension
This commit changes the default file extension for Freemarker templates
from `*.ftl` to `*.ftlh`. This commit also enables by default the
Freemarker setting `"recognize_standard_file_extensions"` to ensure that
HTML escaping is performed by default in Spring Boot applications.

Applications should adapt to this change by changing the file extensions
of existing templates to `.ftlh`.

Closes gh-15131
2019-06-12 15:52:04 +02:00
Andy Wilkinson
048be1813e Ensure JarFile created for nested entry InputStream is closed
Closes gh-17127
2019-06-12 14:22:17 +01:00
Andy Wilkinson
29d1cd3b2d Merge branch '2.1.x'
Closes gh-17124
2019-06-12 13:01:40 +01:00
Andy Wilkinson
c12ccfb342 Close JarFile if failure occurs during construction
Fixes gh-17123
2019-06-12 12:59:14 +01:00
Andy Wilkinson
5e3c86ab8d Merge branch '2.1.x'
Closes gh-17122
2019-06-12 12:53:49 +01:00
Andy Wilkinson
4222c5b8ce Prevent URLResource and JarURLConnection from leaking an InputStream
Fixes gh-17121
2019-06-12 12:53:16 +01:00
Andy Wilkinson
5375681fa5 Merge branch '2.1.x'
Closes gh-17120
2019-06-12 12:41:09 +01:00
Andy Wilkinson
df9a6a0f4f Wait for up to 30s for access logs to be written during shutdown
Closes gh-17119
2019-06-12 12:40:11 +01:00
Andy Wilkinson
405b4ad441 Merge branch '2.1.x'
Closes gh-17118
2019-06-12 12:28:19 +01:00
Andy Wilkinson
2833f60344 Avoid leaving streams open when writing libraries
Fixes gh-17115
2019-06-12 12:28:07 +01:00
Andy Wilkinson
38552065e8 Merge branch '2.1.x'
Closes gh-17114
2019-06-12 11:37:05 +01:00
Andy Wilkinson
7103eab2e6 Close JarFiles when looking for Class-Path manifest entries
Fixes gh-17095
2019-06-12 11:36:34 +01:00
Andy Wilkinson
a084cc3f6c Merge branch '2.1.x'
Closes gh-17112
2019-06-12 08:21:28 +01:00
Andy Wilkinson
9c7f24785c Merge pull request #17111 from dreis2211
* gh-17111:
  Make dependency available for javadoc generation

Closes gh-17111
2019-06-12 08:21:04 +01:00
dreis2211
23b09ecca6 Make dependency available for javadoc generation
See gh-17111
2019-06-12 08:18:26 +01:00
Madhura Bhave
176aabb487 Merge branch '2.1.x' 2019-06-11 17:21:40 -07:00
Madhura Bhave
fa4c433c92 Polish 2019-06-11 17:21:13 -07:00
Madhura Bhave
6b3329b274 Add support for annotations on constructor parameter binding
Closes gh-17109
2019-06-11 16:46:29 -07:00
Andy Wilkinson
e6151a6478 Polish 2019-06-11 18:57:58 +01:00
Phillip Webb
08dbb2d8c4 Polish 2019-06-11 09:23:50 -07:00
Phillip Webb
199606da4e Merge pull request #17069 from izeye
* pr/17069:
  Add missing @Test annotations

Closes gh-17069
2019-06-11 09:22:10 -07:00
Johnny Lim
3b3a92c563 Add missing @Test annotations
This commit also restores assertion accidentally removed in
commit 44d832158a.

See gh-17069
2019-06-11 09:21:31 -07:00
Phillip Webb
1d5647b922 Merge pull request #17106 from ielatif
* pr/17106:
  Fix deployment tests JUnit 5 checkstyle issues

Closes gh-17106
2019-06-11 09:02:58 -07:00
Issam El-atif
35dc7982d2 Fix deployment tests JUnit 5 checkstyle issues
See gh-17106
2019-06-11 09:02:04 -07:00
Andy Wilkinson
c11f25bf8b Merge branch '2.1.x'
Closes gh-17104
2019-06-11 10:52:03 +01:00
Andy Wilkinson
95d0e26c35 Fix command DevTools uses to shut down in-memory Derby DB
Closes gh-17099
2019-06-11 10:29:09 +01:00
Phillip Webb
b3d5cd538d Add JUnit 5 checkstyle rules
Add a rule to enforce JUnit 5 usage and conventions.

Closes gh-17093
2019-06-10 16:16:45 -07:00
Madhura Bhave
2560b54f7c Add configuration support for Opaque Token authentication
Closes gh-15872
2019-06-10 14:24:32 -07:00
Phillip Webb
8d44e31898 Fix composite property source filtering
Update `ConfigFileApplicationListener` so that property filtering works
against the original `PropertySource`, rather than the underling `Map`.

Prior to this commit, it was impossible for a `CompositePropertySource`
to be used as the `defaultPropertySource`.

Closes gh-17011
2019-06-10 09:55:30 -07:00
Andy Wilkinson
75e45fd239 Switch to @DisableWithoutTestcontainers
Closes gh-17092
2019-06-10 12:49:12 +01:00
Andy Wilkinson
d9c93bd354 Merge branch '2.1.x' 2019-06-08 08:20:21 +01:00
Andy Wilkinson
a243b56ade Merge branch '2.0.x' into 2.1.x 2019-06-08 08:18:56 +01:00
Andy Wilkinson
9d28238598 Update formatting of spring-boot-samples 2019-06-08 08:16:44 +01:00
Phillip Webb
7ed0faa574 Merge branch '2.1.x'
Closes gh-17088
2019-06-07 21:03:13 -07:00
Phillip Webb
80e5762457 Merge branch '2.0.x' into 2.1.x
Closes gh-17087
2019-06-07 20:59:29 -07:00
Phillip Webb
da1d4b8c3b Run root nohttp checkstyle on CI
Closes gh-17081
2019-06-07 20:57:02 -07:00