Merge pull request #13991 from izeye:convert-sla

* pr/13991:
  Return null immediately when sla is null in convertSla()
pull/14003/head
Stephane Nicoll 6 years ago
commit 37be894844

@ -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;

Loading…
Cancel
Save