Commit Graph

25360 Commits

Author SHA1 Message Date
Phillip Webb
3fe2005e06 Use @AfterEach to close the source jar file
Update `JarFileWrapperTests` so that the jar files are closed after each
test.

See gh-22991
2020-08-19 10:22:10 -07:00
Stephane Nicoll
47e5db9e43 Merge pull request #23002 from dreis2211
* pr/23002:
  Mention correct JUnit 5 annotations in Kotlin testing section

Closes gh-23002
2020-08-19 10:08:11 +02:00
dreis2211
06eb7e9777 Mention correct JUnit 5 annotations in Kotlin testing section
See gh-23002
2020-08-19 10:07:40 +02:00
Phillip Webb
2a137a2d8a Remove Mockito from JarFileWrapperTests
Remove Mockto from JarFileWrapperTests since it seems to be failing on
later versions of Java.

See gh-22991
2020-08-18 16:20:05 -07:00
Phillip Webb
4e76138ebc Update copyright year of changed files 2020-08-18 15:37:59 -07:00
Phillip Webb
5997cbd21f Refine AbstractJarFile method visibility
Refine method visibility in an attempt to fix test issues on Java 11+.

See gh-22991
2020-08-18 15:37:37 -07:00
Phillip Webb
aac367e9c5 Attempt to fix memory leak in JarFile class
Create a new `JarFileWrapper` class so that we can wrap and existing
`JarFile` and offer a version that can be safely closed.

Prior to this commit, we provided wrapper functionality in the `JarFile`
class itself. Unfortunately, because we override `close` and also create
a lot of wrappers this caused memory issues when running on Java 11.

With Java 11 `java.util.zip.ZipFile` class uses `FinalizableResource`
for any implementation that overrides `close()`. This means that any
wrapper classes will not be garbage collected until the JVM finalizer
thread runs.

Closes gh-22991
2020-08-18 14:07:03 -07:00
Phillip Webb
460fb3ccb8 Merge pull request #21134 from bendiscz
* pr/21134:
  Polish 'Order metrics auto-configurations correctly'
  Order metrics auto-configurations correctly

Closes gh-21134
2020-08-17 16:11:09 -07:00
Phillip Webb
10da595302 Polish 'Order metrics auto-configurations correctly'
See gh-21134
2020-08-17 16:10:18 -07:00
Martin Benda
02b7ec787e Order metrics auto-configurations correctly
Update metrics auto-configurations so that they are auto-configured
after `CompositeMeterRegistryAutoConfiguration` in order to ensure
the `MeterRegistry` bean has been defined.

Prior to this commit, metrics auto-configurations that depended on a
`MeterRegistry` has `@AutoConfigureAfter(MetricsAutoConfiguration.class)`
which is not sufficient since `MetricsAutoConfiguration` does not export
a `MeterRegistry`.

See gh-21134
2020-08-17 16:03:27 -07:00
Phillip Webb
3271542d98 Add @Interited to @TypeExcludeFilters
Update `@TypeExcludeFilters` so that it is also annotated with
`@Inherited`.

Closes gh-22939
2020-08-14 17:12:31 -07:00
Phillip Webb
89a6f83344 Fix and improve SpringApplicationBuilder javadoc
Update SpringApplicationBuilder.properties method javadoc to fix
inaccuracies and apply more consistency.

Closes gh-22962
2020-08-14 17:06:39 -07:00
Phillip Webb
3e939cbabd Polish method order 2020-08-14 17:02:13 -07:00
Phillip Webb
2fe446335a Merge pull request #22948 from maciejwalkowiak
* pr/22948:
  Fix typo `Assert4J` -> `AssertJ`

Closes gh-22948
2020-08-14 15:10:58 -07:00
Maciej Walkowiak
15de956566 Fix typo Assert4J -> AssertJ
See gh-22948
2020-08-14 15:09:56 -07:00
Stephane Nicoll
70f1216359 Merge pull request #22919 from smlc
* pr/22919:
  Polish "Fix conditions that lead to auto-configure PushGateway"
  Fix conditions that lead to auto-configure PushGateway

Closes gh-22919
2020-08-13 11:48:01 +02:00
Stephane Nicoll
f61a632a37 Polish "Fix conditions that lead to auto-configure PushGateway"
See gh-22919
2020-08-13 11:47:43 +02:00
smlc
c355b95f6c Fix conditions that lead to auto-configure PushGateway
See gh-22919
2020-08-13 11:41:49 +02:00
Andy Wilkinson
4f65f2e9f1 Merge pull request #22765 from izeye
* gh-22765:
  Mention configuration customizers for WebTestClient and RestAssured

Closes gh-22765
2020-08-12 13:14:00 +01:00
Johnny Lim
68e2dd626d Mention configuration customizers for WebTestClient and RestAssured
See gh-22765
2020-08-12 13:13:11 +01:00
Stephane Nicoll
5c14e853cf Merge pull request #22898 from johncfranco
* pr/22898:
  Polish "Harmonize Discover the HTTP Port at Runtime How-To"
  Harmonize Discover the HTTP Port at Runtime How-To

Closes gh-22898
2020-08-12 09:51:03 +02:00
Stephane Nicoll
ee2363fca7 Polish "Harmonize Discover the HTTP Port at Runtime How-To"
See gh-22898
2020-08-12 09:50:44 +02:00
John Franco
303768b2b5 Harmonize Discover the HTTP Port at Runtime How-To
See gh-22898
2020-08-12 09:48:57 +02:00
Madhura Bhave
cdbb7f441a Do not ignore null/empty values from SPRING_APPLICATION_JSON
Fixes gh-21542
2020-08-11 12:22:08 -07:00
Stephane Nicoll
ccffd50285 Document the limitation of default value detection
Closes gh-22685
2020-08-11 16:51:00 +02:00
Stephane Nicoll
64a5aa9340 Polish 2020-08-11 16:41:47 +02:00
Andy Wilkinson
b2c0c958c9 Upgrade to Dependency Management Plugin 1.0.10.RELEASE
Closes gh-22615
2020-08-11 12:14:24 +01:00
Stephane Nicoll
afe99ad64c Merge pull request #21615 from Larisho
* pr/21615:
  Polish "Migrate legacy endpoint that have a dash in their id"
  Migrate legacy endpoint that have a dash in their id

Closes gh-21615
2020-08-10 16:02:35 +02:00
Stephane Nicoll
dd9c9fd171 Polish "Migrate legacy endpoint that have a dash in their id"
See gh-21615
2020-08-10 14:53:18 +02:00
Gabriele Bianchet-David
0f9f10f97e Migrate legacy endpoint that have a dash in their id
See gh-21615
2020-08-10 14:42:46 +02:00
Stephane Nicoll
8962d6ca21 Polish 2020-08-10 14:31:16 +02:00
Stephane Nicoll
8836dc96ac Merge pull request #22777 from davidbilge
* pr/22777:
  Polish "Propagate the cause that led Reactor"s debug agent to fail"
  Propagate the cause that led Reactor"s debug agent to fail

Closes gh-22777
2020-08-10 14:23:08 +02:00
Stephane Nicoll
333af3d4e7 Polish "Propagate the cause that led Reactor"s debug agent to fail"
See gh-22777
2020-08-10 14:21:44 +02:00
davidbilge
12c419054a Propagate the cause that led Reactor"s debug agent to fail
Prior to this commit, DebugAgentEnvironmentPostProcessor throws a
RuntimeException with a generic error message if its initialization
fails. The causing exception is discarded, which makes error analysis
unnecessarily difficult.

This commit attaches the cause to the newly thrown RuntimeException.

See gh-22777
2020-08-10 14:21:26 +02:00
Madhura Bhave
f39f33bb8d Fix documentation related to the health endpoint's inner details
Closes gh-22490
2020-08-06 17:57:56 -07:00
Phillip Webb
fdd6a89a61 Polish 2020-08-06 10:14:01 -07:00
Andy Wilkinson
07699ea6ff Retry when dependency resolution fails in ModifiedClassPathClassLoader
Closes gh-22763
2020-08-06 15:12:20 +01:00
Andy Wilkinson
63f7c75b61 Polish 2020-08-06 13:34:01 +01:00
Andy Wilkinson
b53f54f2cf Add tip about using AopTestUtils.getTargetProxy with proxied spy beans
Closes gh-22281
2020-08-06 09:21:11 +01:00
Stephane Nicoll
6232ece61d Upgrade Java 8 version in CI image
Closes gh-22752
2020-08-06 09:38:19 +02:00
Stephane Nicoll
63718d4e72 Merge branch '2.1.x' into 2.2.x 2020-08-06 09:37:55 +02:00
Stephane Nicoll
64264b5240 Upgrade Java 8 version in CI image
Closes gh-22755
2020-08-06 09:37:04 +02:00
Andy Wilkinson
bfe250e5d3 Clarify docs on schema and data SQL scripts with Flyway and Liquibase
Closes gh-20920
2020-08-05 18:14:39 +01:00
Andy Wilkinson
71ffb44a3c Remove WebClient's in-memory buffer size limit for endpoint tests
Previously, the endpoints' responses could occasionally exceed
WebClient's in-memory buffer limt, for example if the threads endpoint
was reporting a large number of threads or the threads had large
stacks.

This commit disables WebClient's in-memory buffer size limit so that
the tests passing is not dependent on the size of the endpoints'
responses.

Closes gh-22743
2020-08-05 17:37:44 +01:00
Andy Wilkinson
2238b0d797 Try to make FileSystemWatcherTests.waitsForQuietPeriod() more robust
Previously, waitsForQuietPeriod would iterate 10 times, touching a new
file and then sleeping for 100ms at it did so. With a quiet period of
200ms, this was intended to result in a single change set containing
10 files. However, the test would fail occasionally as multiple change
sets were detected. The test is multi-threaded and is, therefore, at
the mercy of the scheduler. If the thread that is iterating and
touching the files takes over 200ms to be scheduled – exceeding the
watcher's quiet period – the watcher may detect a change set while the
changes are still being made. Eliminating this possibilty would require
the test to participate in the watcher's synchronization, which would
require some changes to its implementation. Instead, this commit
aims to avoid the problem by sleeping for 1/10 of the time (10ms) and
expecting a single change set of 100 files. The hope is that the much
shorter sleep time will result in the file touching thread being
scheduled well within the 200ms quiet period.

Closes gh-22732
2020-08-05 09:00:49 +01:00
Andy Wilkinson
4424055793 Merge branch '2.1.x' into 2.2.x 2020-08-04 14:57:55 +01:00
Andy Wilkinson
8f03fb4c75 Upgrade to Gradle Enterprise Maven Extension 1.6.1
Closes gh-22717
2020-08-04 14:57:36 +01:00
Andy Wilkinson
5152147571 Merge branch '2.1.x' into 2.2.x
Closes gh-22723
2020-08-04 13:37:53 +01:00
Andy Wilkinson
9da0372330 Upgrade to Gradle Enterprise Maven Extension 1.6.1
Closes gh-22717
2020-08-04 13:37:40 +01:00
Andy Wilkinson
c2ea114b61 Merge pull request #21388 from aivinog1
* gh-21388:
  Polish "Test the launch script when executed directly"
  Test the launch script when executed directly

Closes gh-21388
2020-08-04 11:30:13 +01:00