Resolve BadImport from Error Prone (#6154)

Signed-off-by: Johnny Lim <[email protected]>

Author: izeye

implementations/micrometer-registry-azure-monitor/src/test/java/io/micrometer/azuremonitor/AzureMonitorNamingConventionTest.java

@@ -15,7 +15,7 @@
  */
 package io.micrometer.azuremonitor;
 
-import io.micrometer.core.instrument.Meter.Type;
+import io.micrometer.core.instrument.Meter;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -26,7 +26,7 @@ class AzureMonitorNamingConventionTest {
 
     @Test
     void testNameContainsDesiredCharacters() {
-        assertThat(namingConvention.name("{[email protected]}", Type.GAUGE)).isEqualTo("_custom_Metric_1_");
+        assertThat(namingConvention.name("{[email protected]}", Meter.Type.GAUGE)).isEqualTo("_custom_Metric_1_");
     }
 
     @Test

implementations/micrometer-registry-new-relic/src/test/java/io/micrometer/newrelic/NewRelicNamingConventionTest.java

@@ -15,7 +15,7 @@
  */
 package io.micrometer.newrelic;
 
-import io.micrometer.core.instrument.Meter.Type;
+import io.micrometer.core.instrument.Meter;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -35,13 +35,13 @@ class NewRelicNamingConventionTest {
 
     @Test
     void name() {
-        String validString = newRelicNamingConvention.name(VALID_NAME, Type.COUNTER);
+        String validString = newRelicNamingConvention.name(VALID_NAME, Meter.Type.COUNTER);
         assertThat(validString).isEqualTo(VALID_NAME);
     }
 
     @Test
     void nameShouldStripInvalidCharacters() {
-        String validString = newRelicNamingConvention.name(INVALID_NAME, Type.COUNTER);
+        String validString = newRelicNamingConvention.name(INVALID_NAME, Meter.Type.COUNTER);
         assertThat(validString).isEqualTo("invalid_name");
     }
 

implementations/micrometer-registry-prometheus/src/test/java/io/micrometer/prometheusmetrics/PrometheusMeterRegistryIntegrationTest.java

@@ -18,7 +18,6 @@
 import com.sun.net.httpserver.HttpServer;
 import io.micrometer.common.lang.Nullable;
 import io.micrometer.core.instrument.*;
-import io.micrometer.core.instrument.Meter.Type;
 import io.micrometer.core.instrument.binder.jvm.JvmInfoMetrics;
 import io.prometheus.metrics.model.registry.PrometheusRegistry;
 import io.prometheus.metrics.tracer.common.SpanContext;
@@ -157,7 +156,7 @@ private void recordMetrics() {
             final int value = i;
             measurements.add(new Measurement(() -> value + 10, Statistic.values()[i]));
         }
-        Meter.builder("test.custom", Type.OTHER, measurements).register(registry);
+        Meter.builder("test.custom", Meter.Type.OTHER, measurements).register(registry);
     }
 
     private void verifyBuildInfo() {

implementations/micrometer-registry-statsd/src/main/java/io/micrometer/statsd/internal/FlavorStatsdLineBuilder.java

@@ -24,8 +24,7 @@
 
 import java.util.Objects;
 import java.util.stream.Collectors;
-
-import static java.util.stream.Stream.of;
+import java.util.stream.Stream;
 
 public abstract class FlavorStatsdLineBuilder implements StatsdLineBuilder {
 
@@ -70,8 +69,8 @@ public String timing(double timeMs) {
 
     protected String tags(@Nullable Statistic stat, @Nullable String otherTags, String keyValueSeparator,
             String preamble) {
-        String tags = of(stat == null ? null : "statistic" + keyValueSeparator + stat.getTagValueRepresentation(),
-                otherTags)
+        String tags = Stream
+            .of(stat == null ? null : "statistic" + keyValueSeparator + stat.getTagValueRepresentation(), otherTags)
             .filter(Objects::nonNull)
             .collect(Collectors.joining(","));
 

implementations/micrometer-registry-wavefront/src/main/java/io/micrometer/wavefront/WavefrontConfig.java

@@ -16,7 +16,6 @@
 package io.micrometer.wavefront;
 
 import com.wavefront.sdk.common.clients.service.token.TokenService;
-import com.wavefront.sdk.common.clients.service.token.TokenService.Type;
 import io.micrometer.common.lang.Nullable;
 import io.micrometer.core.instrument.config.validate.InvalidReason;
 import io.micrometer.core.instrument.config.validate.Validated;
@@ -120,10 +119,12 @@ default String source() {
      */
     default TokenService.Type apiTokenType() {
         return getEnum(this, TokenService.Type.class, "apiTokenType")
-            .invalidateWhen(tokenType -> tokenType == Type.NO_TOKEN && WavefrontMeterRegistry.isDirectToApi(this),
+            .invalidateWhen(
+                    tokenType -> tokenType == TokenService.Type.NO_TOKEN && WavefrontMeterRegistry.isDirectToApi(this),
                     "must be set to something else whenever publishing directly to the Wavefront API",
                     InvalidReason.MISSING)
-            .orElse(WavefrontMeterRegistry.isDirectToApi(this) ? Type.WAVEFRONT_API_TOKEN : Type.NO_TOKEN);
+            .orElse(WavefrontMeterRegistry.isDirectToApi(this) ? TokenService.Type.WAVEFRONT_API_TOKEN
+                    : TokenService.Type.NO_TOKEN);
     }
 
     /**

implementations/micrometer-registry-wavefront/src/test/java/io/micrometer/wavefront/WavefrontConfigTest.java

@@ -15,7 +15,7 @@
  */
 package io.micrometer.wavefront;
 
-import com.wavefront.sdk.common.clients.service.token.TokenService.Type;
+import com.wavefront.sdk.common.clients.service.token.TokenService;
 import io.micrometer.core.Issue;
 import io.micrometer.core.instrument.config.validate.ValidationException;
 import org.junit.jupiter.api.Test;
@@ -52,7 +52,7 @@ void noExceptionAndNoTokenTypeIfTokenMissingButProxyUsed() {
         Map<String, String> wavefrontProps = Map.of("wavefront.uri", "proxy://example.org:2878");
         WavefrontConfig config = wavefrontProps::get;
         assertThatCode(config::apiToken).doesNotThrowAnyException();
-        assertThat(config.apiTokenType()).isSameAs(Type.NO_TOKEN);
+        assertThat(config.apiTokenType()).isSameAs(TokenService.Type.NO_TOKEN);
     }
 
     @Test
@@ -61,7 +61,7 @@ void noExceptionAndWavefrontTokenTypeIfTokenPresentAndDirectAccessUsed() {
                 "s3cr3t");
         WavefrontConfig config = wavefrontProps::get;
         assertThatCode(config::apiToken).doesNotThrowAnyException();
-        assertThat(config.apiTokenType()).isSameAs(Type.WAVEFRONT_API_TOKEN);
+        assertThat(config.apiTokenType()).isSameAs(TokenService.Type.WAVEFRONT_API_TOKEN);
     }
 
     @Test
@@ -77,7 +77,7 @@ void apiTokenFailsIfNoTokenPresentAndDirectAccessUsed() {
     @Test
     void apiTokenTypeFailsIfNoTokenTypeAndDirectAccessUsed() {
         Map<String, String> wavefrontProps = Map.of("wavefront.uri", "https://example.org:2878",
-                "wavefront.apiTokenType", Type.NO_TOKEN.name());
+                "wavefront.apiTokenType", TokenService.Type.NO_TOKEN.name());
         WavefrontConfig config = wavefrontProps::get;
         assertThatCode(config::apiTokenType).isExactlyInstanceOf(ValidationException.class)
             .hasNoCause()
@@ -88,9 +88,9 @@ void apiTokenTypeFailsIfNoTokenTypeAndDirectAccessUsed() {
     @Test
     void apiTokenTypeShouldBeUsedIfDirectAccessUsed() {
         Map<String, String> wavefrontProps = Map.of("wavefront.uri", "https://example.org:2878",
-                "wavefront.apiTokenType", Type.CSP_API_TOKEN.name());
+                "wavefront.apiTokenType", TokenService.Type.CSP_API_TOKEN.name());
         WavefrontConfig config = wavefrontProps::get;
-        assertThat(config.apiTokenType()).isSameAs(Type.CSP_API_TOKEN);
+        assertThat(config.apiTokenType()).isSameAs(TokenService.Type.CSP_API_TOKEN);
     }
 
 }

micrometer-core/src/main/java/io/micrometer/core/instrument/MeterRegistry.java

@@ -20,7 +20,6 @@
 import io.micrometer.common.util.internal.logging.InternalLoggerFactory;
 import io.micrometer.common.util.internal.logging.WarnThenDebugLogger;
 import io.micrometer.core.annotation.Incubating;
-import io.micrometer.core.instrument.Meter.Id;
 import io.micrometer.core.instrument.config.MeterFilter;
 import io.micrometer.core.instrument.config.MeterFilterReply;
 import io.micrometer.core.instrument.config.NamingConvention;
@@ -102,35 +101,36 @@ public abstract class MeterRegistry {
      * supported. Hence, we use CHM to support that iteration without
      * ConcurrentModificationException risk.
      */
-    private final Map<Id, Meter> meterMap = new ConcurrentHashMap<>();
+    private final Map<Meter.Id, Meter> meterMap = new ConcurrentHashMap<>();
 
     /**
      * write/remove guarded by meterMapLock, read in
-     * {@link #getOrCreateMeter(DistributionStatisticConfig, BiFunction, Id, Function)} is
-     * unguarded
+     * {@link #getOrCreateMeter(DistributionStatisticConfig, BiFunction, Meter.Id, Function)}
+     * is unguarded
      */
-    private final Map<Id, Meter> preFilterIdToMeterMap = new HashMap<>();
+    private final Map<Meter.Id, Meter> preFilterIdToMeterMap = new HashMap<>();
 
     /**
      * For reverse looking up pre-filter ID in {@link #preFilterIdToMeterMap} from the
-     * Meter being removed in {@link #remove(Id)}. Guarded by the {@link #meterMapLock}.
+     * Meter being removed in {@link #remove(Meter.Id)}. Guarded by the
+     * {@link #meterMapLock}.
      */
-    private final Map<Meter, Id> meterToPreFilterIdMap = new HashMap<>();
+    private final Map<Meter, Meter.Id> meterToPreFilterIdMap = new HashMap<>();
 
     /**
      * Only needed when MeterFilter configured after Meters registered. Write/remove
-     * guarded by meterMapLock, remove in {@link #unmarkStaleId(Id)} and other operations
-     * unguarded
+     * guarded by meterMapLock, remove in {@link #unmarkStaleId(Meter.Id)} and other
+     * operations unguarded
      */
-    private final Set<Id> stalePreFilterIds = new HashSet<>();
+    private final Set<Meter.Id> stalePreFilterIds = new HashSet<>();
 
     /**
      * Map of meter id whose associated meter contains synthetic counterparts to those
      * synthetic ids. We maintain these associations so that when we remove a meter with
      * synthetics, they can removed as well.
      */
     // Guarded by meterMapLock for both reads and writes
-    private final Map<Id, Set<Id>> syntheticAssociations = new HashMap<>();
+    private final Map<Meter.Id, Set<Meter.Id>> syntheticAssociations = new HashMap<>();
 
     private final AtomicBoolean closed = new AtomicBoolean();
 
@@ -255,7 +255,7 @@ protected <T> TimeGauge newTimeGauge(Meter.Id id, @Nullable T obj, TimeUnit valu
 
         return new TimeGauge() {
             @Override
-            public Id getId() {
+            public Meter.Id getId() {
                 return withUnit;
             }
 
@@ -298,7 +298,7 @@ protected abstract <T> FunctionTimer newFunctionTimer(Meter.Id id, T obj, ToLong
      * measurement.
      * @return A new function counter.
      */
-    protected abstract <T> FunctionCounter newFunctionCounter(Id id, T obj, ToDoubleFunction<T> countFunction);
+    protected abstract <T> FunctionCounter newFunctionCounter(Meter.Id id, T obj, ToDoubleFunction<T> countFunction);
 
     protected List<Tag> getConventionTags(Meter.Id id) {
         return id.getConventionTags(config().namingConvention());
@@ -622,28 +622,28 @@ private <M extends Meter> M registerMeterIfNecessary(Class<M> meterClass, Meter.
         return meterClass.cast(m);
     }
 
-    private Id getMappedId(Id id) {
+    private Meter.Id getMappedId(Meter.Id id) {
         if (id.syntheticAssociation() != null) {
             return id;
         }
-        Id mappedId = id;
+        Meter.Id mappedId = id;
         for (MeterFilter filter : filters) {
             mappedId = filter.map(mappedId);
         }
         return mappedId;
     }
 
     private Meter getOrCreateMeter(@Nullable DistributionStatisticConfig config,
-            BiFunction<Id, /* Nullable Generic */ DistributionStatisticConfig, ? extends Meter> builder, Id originalId,
-            Function<Meter.Id, ? extends Meter> noopBuilder) {
+            BiFunction<Meter.Id, /* Nullable Generic */ DistributionStatisticConfig, ? extends Meter> builder,
+            Meter.Id originalId, Function<Meter.Id, ? extends Meter> noopBuilder) {
 
         Meter m = preFilterIdToMeterMap.get(originalId);
         if (m != null && !isStaleId(originalId)) {
             checkAndWarnAboutDoubleRegistration(m);
             return m;
         }
 
-        Id mappedId = getMappedId(originalId);
+        Meter.Id mappedId = getMappedId(originalId);
         m = meterMap.get(mappedId);
 
         if (m != null) {
@@ -678,9 +678,10 @@ private Meter getOrCreateMeter(@Nullable DistributionStatisticConfig config,
 
                     m = builder.apply(mappedId, config);
 
-                    Id synAssoc = mappedId.syntheticAssociation();
+                    Meter.Id synAssoc = mappedId.syntheticAssociation();
                     if (synAssoc != null) {
-                        Set<Id> associations = syntheticAssociations.computeIfAbsent(synAssoc, k -> new HashSet<>());
+                        Set<Meter.Id> associations = syntheticAssociations.computeIfAbsent(synAssoc,
+                                k -> new HashSet<>());
                         associations.add(mappedId);
                     }
 
@@ -698,7 +699,7 @@ private Meter getOrCreateMeter(@Nullable DistributionStatisticConfig config,
         return m;
     }
 
-    private boolean isStaleId(Id originalId) {
+    private boolean isStaleId(Meter.Id originalId) {
         return !stalePreFilterIds.isEmpty() && stalePreFilterIds.contains(originalId);
     }
 
@@ -707,7 +708,7 @@ private boolean isStaleId(Id originalId) {
      * @param originalId id before any filter mapping has been applied
      * @return {@code true} if the id is stale
      */
-    private boolean unmarkStaleId(Id originalId) {
+    private boolean unmarkStaleId(Meter.Id originalId) {
         return !stalePreFilterIds.isEmpty() && stalePreFilterIds.remove(originalId);
     }
 
@@ -743,8 +744,8 @@ else if (reply == MeterFilterReply.ACCEPT) {
 
     /**
      * Remove a {@link Meter} from this {@link MeterRegistry registry}. This is expected
-     * to be a {@link Meter} with the same {@link Id} returned when registering a meter -
-     * which will have {@link MeterFilter}s applied to it.
+     * to be a {@link Meter} with the same {@link Meter.Id} returned when registering a
+     * meter - which will have {@link MeterFilter}s applied to it.
      * @param meter The meter to remove
      * @return The removed meter, or null if the provided meter is not currently
      * registered.
@@ -758,8 +759,8 @@ public Meter remove(Meter meter) {
 
     /**
      * Remove a {@link Meter} from this {@link MeterRegistry registry} based on its
-     * {@link Id} before applying this registry's {@link MeterFilter}s to the given
-     * {@link Id}.
+     * {@link Meter.Id} before applying this registry's {@link MeterFilter}s to the given
+     * {@link Meter.Id}.
      * @param preFilterId the id of the meter to remove
      * @return The removed meter, or null if the meter is not found
      * @since 1.3.16
@@ -775,9 +776,9 @@ public Meter removeByPreFilterId(Meter.Id preFilterId) {
 
     /**
      * Remove a {@link Meter} from this {@link MeterRegistry registry} based the given
-     * {@link Id} as-is. The registry's {@link MeterFilter}s will not be applied to it.
-     * You can use the {@link Id} of the {@link Meter} returned when registering a meter,
-     * since that will have {@link MeterFilter}s already applied to it.
+     * {@link Meter.Id} as-is. The registry's {@link MeterFilter}s will not be applied to
+     * it. You can use the {@link Meter.Id} of the {@link Meter} returned when registering
+     * a meter, since that will have {@link MeterFilter}s already applied to it.
      * @param mappedId The id of the meter to remove
      * @return The removed meter, or null if no meter matched the provided id.
      * @since 1.1.0
@@ -789,13 +790,13 @@ public Meter remove(Meter.Id mappedId) {
             synchronized (meterMapLock) {
                 final Meter removedMeter = meterMap.remove(mappedId);
                 if (removedMeter != null) {
-                    Id preFilterIdToRemove = meterToPreFilterIdMap.remove(removedMeter);
+                    Meter.Id preFilterIdToRemove = meterToPreFilterIdMap.remove(removedMeter);
                     preFilterIdToMeterMap.remove(preFilterIdToRemove);
                     stalePreFilterIds.remove(preFilterIdToRemove);
 
-                    Set<Id> synthetics = syntheticAssociations.remove(mappedId);
+                    Set<Meter.Id> synthetics = syntheticAssociations.remove(mappedId);
                     if (synthetics != null) {
-                        for (Id synthetic : synthetics) {
+                        for (Meter.Id synthetic : synthetics) {
                             remove(synthetic);
                         }
                     }
@@ -913,7 +914,7 @@ public Config onMeterRemoved(Consumer<Meter> meterRemovedListener) {
          * @since 1.6.0
          */
         @Incubating(since = "1.6.0")
-        public Config onMeterRegistrationFailed(BiConsumer<Id, String> meterRegistrationFailedListener) {
+        public Config onMeterRegistrationFailed(BiConsumer<Meter.Id, String> meterRegistrationFailedListener) {
             meterRegistrationFailedListeners.add(meterRegistrationFailedListener);
             return this;
         }
@@ -1213,23 +1214,23 @@ public boolean isClosed() {
      * @since 1.6.0
      */
     protected void meterRegistrationFailed(Meter.Id id, @Nullable String reason) {
-        for (BiConsumer<Id, String> listener : meterRegistrationFailedListeners) {
+        for (BiConsumer<Meter.Id, String> listener : meterRegistrationFailedListeners) {
             listener.accept(id, reason);
         }
     }
 
     // VisibleForTesting
-    Map<Id, Meter> _getPreFilterIdToMeterMap() {
+    Map<Meter.Id, Meter> _getPreFilterIdToMeterMap() {
         return Collections.unmodifiableMap(preFilterIdToMeterMap);
     }
 
     // VisibleForTesting
-    Map<Meter, Id> _getMeterToPreFilterIdMap() {
+    Map<Meter, Meter.Id> _getMeterToPreFilterIdMap() {
         return Collections.unmodifiableMap(meterToPreFilterIdMap);
     }
 
     // VisibleForTesting
-    Set<Id> _getStalePreFilterIds() {
+    Set<Meter.Id> _getStalePreFilterIds() {
         return Collections.unmodifiableSet(stalePreFilterIds);
     }