root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '2.0.x'

This commit is contained in:
Madhura Bhave 2018-08-15 16:58:21 -07:00
parent 5ae4b43877 ff2b392324
commit 64f9d33956
3 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointTests.java
View File

@ -315,14 +315,14 @@ public class ConfigurationPropertiesReportEndpointTests {
this.simpleBoolean = simpleBoolean;
}
public void setMixedBoolean(Boolean mixedBoolean) {
this.mixedBoolean = mixedBoolean;
}
public boolean isMixedBoolean() {
return (this.mixedBoolean != null) ? this.mixedBoolean : false;
}
public void setMixedBoolean(Boolean mixedBoolean) {
this.mixedBoolean = mixedBoolean;
}
public String getmIxedCase() {
return this.mIxedCase;
}

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()));
}

4
spring-boot-project/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc
View File

@ -1496,8 +1496,8 @@ server] to use can be provided using:
==== JMX
Micrometer provides a hierarchical mapping to
{micrometer-registry-documentation}/jmx[JMX], primarily as a cheap and portable way to
view metrics locally.By default, metrics are exported to the `metrics` JMX domain. The
domain to use can be provided provided using:
view metrics locally. By default, metrics are exported to the `metrics` JMX domain. The
domain to use can be provided using:
[source,properties,indent=0]
----