Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
cf62dc86
Commit
cf62dc86
authored
Oct 14, 2019
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Polish "Correct Mono import in LegacyHealthEndpointCompatibilityConfiguration"
See gh-18571
parent
35dc4817
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
3 deletions
+9
-3
HealthEndpointAutoConfigurationTests.java
...onfigure/health/HealthEndpointAutoConfigurationTests.java
+8
-2
checkstyle.xml
src/checkstyle/checkstyle.xml
+1
-1
No files found.
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/health/HealthEndpointAutoConfigurationTests.java
View file @
cf62dc86
...
@@ -44,6 +44,7 @@ import org.springframework.boot.actuate.health.NamedContributor;
...
@@ -44,6 +44,7 @@ import org.springframework.boot.actuate.health.NamedContributor;
import
org.springframework.boot.actuate.health.ReactiveHealthContributorRegistry
;
import
org.springframework.boot.actuate.health.ReactiveHealthContributorRegistry
;
import
org.springframework.boot.actuate.health.ReactiveHealthEndpointWebExtension
;
import
org.springframework.boot.actuate.health.ReactiveHealthEndpointWebExtension
;
import
org.springframework.boot.actuate.health.ReactiveHealthIndicator
;
import
org.springframework.boot.actuate.health.ReactiveHealthIndicator
;
import
org.springframework.boot.actuate.health.ReactiveHealthIndicatorRegistry
;
import
org.springframework.boot.actuate.health.Status
;
import
org.springframework.boot.actuate.health.Status
;
import
org.springframework.boot.actuate.health.StatusAggregator
;
import
org.springframework.boot.actuate.health.StatusAggregator
;
import
org.springframework.boot.autoconfigure.AutoConfigurations
;
import
org.springframework.boot.autoconfigure.AutoConfigurations
;
...
@@ -294,10 +295,15 @@ class HealthEndpointAutoConfigurationTests {
...
@@ -294,10 +295,15 @@ class HealthEndpointAutoConfigurationTests {
});
});
}
}
@Test
void
runWhenReactorAvailableCreatesReactiveHealthIndicatorRegistryBean
()
{
this
.
contextRunner
.
run
((
context
)
->
assertThat
(
context
).
hasSingleBean
(
ReactiveHealthIndicatorRegistry
.
class
));
}
@Test
// gh-18570
@Test
// gh-18570
void
run
DoesNotFailWithoutReactorOnClasspath
()
{
void
run
WhenReactorUnavailableDoesNotCreateReactiveHealthIndicatorRegistryBean
()
{
this
.
contextRunner
.
withClassLoader
(
new
FilteredClassLoader
(
Mono
.
class
.
getPackage
().
getName
()))
this
.
contextRunner
.
withClassLoader
(
new
FilteredClassLoader
(
Mono
.
class
.
getPackage
().
getName
()))
.
run
((
context
)
->
assertThat
(
context
).
hasNotFailed
(
));
.
run
((
context
)
->
assertThat
(
context
).
doesNotHaveBean
(
ReactiveHealthIndicatorRegistry
.
class
));
}
}
@Configuration
(
proxyBeanMethods
=
false
)
@Configuration
(
proxyBeanMethods
=
false
)
...
...
src/checkstyle/checkstyle.xml
View file @
cf62dc86
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
name=
"com.puppycrawl.tools.checkstyle.checks.imports.IllegalImportCheck"
>
name=
"com.puppycrawl.tools.checkstyle.checks.imports.IllegalImportCheck"
>
<property
name=
"regexp"
value=
"true"
/>
<property
name=
"regexp"
value=
"true"
/>
<property
name=
"illegalPkgs"
<property
name=
"illegalPkgs"
value=
"^sun.*, ^org\.apache\.commons\.(?!compress|dbcp2|lang|lang3|logging|pool2).*, ^com\.google\.common.*, ^org\.flywaydb\.core\.internal.*, ^org\.testcontainers\.shaded.*"
/>
value=
"^sun.*, ^org\.apache\.commons\.(?!compress|dbcp2|lang|lang3|logging|pool2).*, ^com\.google\.common.*, ^
io\.micrometer\.shaded.*, ^
org\.flywaydb\.core\.internal.*, ^org\.testcontainers\.shaded.*"
/>
<property
name=
"illegalClasses"
<property
name=
"illegalClasses"
value=
"^com\.hazelcast\.util\.Base64, ^org\.junit\.rules\.ExpectedException, ^org\.mockito\.InjectMocks, ^org\.slf4j\.LoggerFactory, ^reactor\.core\.support\.Assert"
/>
value=
"^com\.hazelcast\.util\.Base64, ^org\.junit\.rules\.ExpectedException, ^org\.mockito\.InjectMocks, ^org\.slf4j\.LoggerFactory, ^reactor\.core\.support\.Assert"
/>
</module>
</module>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment