Skip to content

Commit 0e7c354

Browse files
committed
Prohibit usage of Micrometer nullability annotations
Closes gh-30881
1 parent 8fe47aa commit 0e7c354

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/web/servlet/WebMvcMetricsFilterTests.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2021 the original author or authors.
2+
* Copyright 2012-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -47,7 +47,6 @@
4747
import io.micrometer.core.instrument.config.MeterFilterReply;
4848
import io.micrometer.core.instrument.simple.SimpleConfig;
4949
import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
50-
import io.micrometer.core.lang.NonNull;
5150
import io.micrometer.prometheus.PrometheusConfig;
5251
import io.micrometer.prometheus.PrometheusMeterRegistry;
5352
import io.prometheus.client.CollectorRegistry;
@@ -357,8 +356,7 @@ PrometheusMeterRegistry prometheus(Clock clock) {
357356
clock);
358357
r.config().meterFilter(new MeterFilter() {
359358
@Override
360-
@NonNull
361-
public MeterFilterReply accept(@NonNull Meter.Id id) {
359+
public MeterFilterReply accept(Meter.Id id) {
362360
for (Tag tag : id.getTags()) {
363361
if (tag.getKey().equals("uri")
364362
&& (tag.getValue().contains("histogram") || tag.getValue().contains("percentiles"))) {

src/checkstyle/checkstyle.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
name="com.puppycrawl.tools.checkstyle.checks.imports.IllegalImportCheck">
1414
<property name="regexp" value="true" />
1515
<property name="illegalPkgs"
16-
value="^sun.*, ^org\.apache\.commons\.(?!compress|dbcp2|logging|pool2).*, ^com\.datastax\.oss\.driver\.shaded.*, ^com\.google\.common.*, ^io\.micrometer\.shaded.*, ^org\.flywaydb\.core\.internal.*, ^org\.jetbrains\.annotations.*, ^org\.testcontainers\.shaded.*" />
16+
value="^sun.*, ^org\.apache\.commons\.(?!compress|dbcp2|logging|pool2).*, ^com\.datastax\.oss\.driver\.shaded.*, ^com\.google\.common.*, ^io\.micrometer\.core\.lang.*, ^io\.micrometer\.shaded.*, ^org\.flywaydb\.core\.internal.*, ^org\.jetbrains\.annotations.*, ^org\.testcontainers\.shaded.*" />
1717
<property name="illegalClasses"
1818
value="^com\.hazelcast\.util\.Base64, ^org\.junit\.rules\.ExpectedException, ^org\.mockito\.InjectMocks, ^org\.slf4j\.LoggerFactory, ^org.springframework.context.annotation.ScannedGenericBeanDefinition, ^reactor\.core\.support\.Assert"/>
1919
</module>

0 commit comments

Comments
 (0)