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

Return null immediately when sla is null in convertSla() 

Closes gh-13991
This commit is contained in:
Johnny Lim 2018-08-03 08:35:45 +09:00 committed by Stephane Nicoll
parent 16aff4cd2c
commit 7b6b91aae7
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/PropertiesMeterFilter.java
View File

@ -39,8 +39,6 @@ import org.springframework.util.StringUtils;
*/ */
public class PropertiesMeterFilter implements MeterFilter { public class PropertiesMeterFilter implements MeterFilter {
private static final ServiceLevelAgreementBoundary[] EMPTY_SLA = {};
private MetricsProperties properties; private MetricsProperties properties;
public PropertiesMeterFilter(MetricsProperties properties) { public PropertiesMeterFilter(MetricsProperties properties) {
@ -67,7 +65,10 @@ public class PropertiesMeterFilter implements MeterFilter {
} }
private long[] convertSla(Meter.Type meterType, ServiceLevelAgreementBoundary[] sla) { private long[] convertSla(Meter.Type meterType, ServiceLevelAgreementBoundary[] sla) {
long[] converted = Arrays.stream((sla != null) ? sla : EMPTY_SLA) if (sla == null) {
return null;
}
long[] converted = Arrays.stream(sla)
.map((candidate) -> candidate.getValue(meterType)) .map((candidate) -> candidate.getValue(meterType))
.filter(Objects::nonNull).mapToLong(Long::longValue).toArray(); .filter(Objects::nonNull).mapToLong(Long::longValue).toArray();
return (converted.length != 0) ? converted : null; return (converted.length != 0) ? converted : null;