Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix StatusAggregator static initialization

Browse Source 
Prior to this commit, there was a cycle between `StatusAggregator` and
`SimpleStatusAggregator`, which caused a static initialization bug -
depending on which class (the implementation or its interface) was
loaded first.

This commit turns the static field of the `StatusAggregator` interface
into a static method to avoid this problem.

Fixes gh-21211
This commit is contained in:
Brian Clozel
2020-04-28 21:01:14 +02:00
parent ea5f282e9b
commit ec871d6752
5 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/SimpleStatusAggregatorTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2019 the original author or authors.
* Copyright 2012-2020 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -29,7 +29,14 @@ import static org.assertj.core.api.Assertions.assertThat;
class SimpleStatusAggregatorTests {
@Test
void getAggregateStatusWhenUsingDefaultOrder() {
void getAggregateStatusWhenUsingDefaultInstance() {
StatusAggregator aggregator = StatusAggregator.getDefault();
Status status = aggregator.getAggregateStatus(Status.DOWN, Status.UP, Status.UNKNOWN, Status.OUT_OF_SERVICE);
assertThat(status).isEqualTo(Status.DOWN);
}
@Test
void getAggregateStatusWhenUsingNewDefaultOrder() {
SimpleStatusAggregator aggregator = new SimpleStatusAggregator();
Status status = aggregator.getAggregateStatus(Status.DOWN, Status.UP, Status.UNKNOWN, Status.OUT_OF_SERVICE);
assertThat(status).isEqualTo(Status.DOWN);