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

Merge pull request #13991 from izeye:convert-sla

Browse Source 
* pr/13991:
  Return null immediately when sla is null in convertSla()
This commit is contained in:
Stephane Nicoll
2018-08-03 09:24:19 +02:00
parent 16aff4cd2c 7b6b91aae7
commit 37be894844
1 changed files with 4 additions and 3 deletions
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 {
private static final ServiceLevelAgreementBoundary[] EMPTY_SLA = {};
private MetricsProperties properties;
public PropertiesMeterFilter(MetricsProperties properties) {
@@ -67,7 +65,10 @@ public class PropertiesMeterFilter implements MeterFilter {
}
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))
.filter(Objects::nonNull).mapToLong(Long::longValue).toArray();
return (converted.length != 0) ? converted : null;