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

Polish

Browse Source 
Closes gh-14067
This commit is contained in:
Johnny Lim
2018-08-15 10:43:12 +09:00
committed by Madhura Bhave
parent ca4ca15ef2
commit 5f3f1a1f11
3 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnWebApplicationCondition.java
View File

@@ -62,14 +62,14 @@ class OnWebApplicationCondition extends SpringBootCondition {
private ConditionOutcome isWebApplication(ConditionContext context,
AnnotatedTypeMetadata metadata, boolean required) {
Type type = deduceType(metadata);
if (Type.SERVLET == type) {
switch (deduceType(metadata)) {
case SERVLET:
return isServletWebApplication(context);
}
else if (Type.REACTIVE == type) {
case REACTIVE:
return isReactiveWebApplication(context);
}
else {
default:
return isAnyWebApplication(context, required);
}
}
@@ -88,10 +88,7 @@ class OnWebApplicationCondition extends SpringBootCondition {
return new ConditionOutcome(reactiveOutcome.isMatch(),
message.because(reactiveOutcome.getMessage()));
}
boolean finalOutcome = (required
? servletOutcome.isMatch() && reactiveOutcome.isMatch()
: servletOutcome.isMatch() || reactiveOutcome.isMatch());
return new ConditionOutcome(finalOutcome,
return new ConditionOutcome(servletOutcome.isMatch() || reactiveOutcome.isMatch(),
message.because(servletOutcome.getMessage()).append("and")
.append(reactiveOutcome.getMessage()));
}