Polish (#6602)

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

Author: izeye

benchmarks/benchmarks-core/src/jmh/java/io/micrometer/benchmark/compare/CompareHistogramsWithOtherLibraries.java

@@ -22,7 +22,7 @@
 //CHECKSTYLE:OFF
 import com.google.common.collect.Iterators;
 import com.google.common.primitives.Doubles;
-////CHECKSTYLE:ON
+//CHECKSTYLE:ON
 import io.micrometer.core.instrument.Clock;
 import io.micrometer.core.instrument.DistributionSummary;
 import io.micrometer.core.instrument.distribution.DistributionStatisticConfig;

benchmarks/benchmarks-core/src/jmh/java/io/micrometer/benchmark/compare/CompareOTLPHistograms.java

@@ -29,7 +29,7 @@
 import org.openjdk.jmh.runner.options.OptionsBuilder;
 //CHECKSTYLE:OFF
 import com.google.common.collect.Iterators;
-////CHECKSTYLE:ON
+//CHECKSTYLE:ON
 import io.micrometer.common.lang.Nullable;
 import io.micrometer.core.instrument.Clock;
 import io.micrometer.core.instrument.DistributionSummary;

implementations/micrometer-registry-dynatrace/src/test/java/io/micrometer/dynatrace/v1/DynatraceExporterV1Test.java

@@ -28,7 +28,6 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 
-import java.io.IOException;
 import java.lang.reflect.Field;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
@@ -190,19 +189,12 @@ void writeMeterWithGaugeWhenChangingFiniteToNaNShouldWork() {
         AtomicBoolean first = new AtomicBoolean(true);
         meterRegistry.gauge("my.gauge", first, (b) -> b.getAndSet(false) ? GAUGE_VALUE : Double.NaN);
         Gauge gauge = meterRegistry.find("my.gauge").gauge();
-        Stream<DynatraceCustomMetric> stream = exporter.writeMeter(gauge);
-        List<DynatraceCustomMetric> metrics = stream.collect(Collectors.toList());
-        assertThat(metrics).hasSize(1);
-        DynatraceCustomMetric metric = metrics.get(0);
-        DynatraceTimeSeries timeSeries = metric.getTimeSeries();
-        try {
+        assertThat(exporter.writeMeter(gauge)).singleElement().satisfies(metric -> {
+            DynatraceTimeSeries timeSeries = metric.getTimeSeries();
             Map<String, Object> map = mapper.readValue(timeSeries.asJson(), Map.class);
-            List<List<Number>> dataPoints = (List<List<Number>>) map.get("dataPoints");
-            assertThat(dataPoints.get(0).get(1).doubleValue()).isEqualTo(GAUGE_VALUE);
-        }
-        catch (IOException ex) {
-            throw new RuntimeException(ex);
-        }
+            assertThat((List<List<Number>>) map.get("dataPoints")).singleElement()
+                .satisfies(dataPoint -> assertThat(dataPoint.get(1).doubleValue()).isEqualTo(GAUGE_VALUE));
+        });
     }
 
     @Test

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

@@ -65,16 +65,16 @@ public void register(Iterable<? extends Row<?>> rows, boolean overwrite) {
             // intermediate variable.
             Stream<Meter.Id> idStream = StreamSupport.stream(rows.spliterator(), false).map(row -> {
                 Row r = row;
-                Meter.Id prefilteredId = commonId.withTags(r.uniqueTags);
-                Meter.Id rowId = registry.getMappedId(prefilteredId);
+                Meter.Id preFilteredId = commonId.withTags(r.uniqueTags);
+                Meter.Id rowId = registry.getMappedId(preFilteredId);
                 boolean previouslyDefined = oldRows.contains(rowId);
 
                 if (overwrite && previouslyDefined) {
-                    registry.removeByPreFilterId(prefilteredId);
+                    registry.removeByPreFilterId(preFilteredId);
                 }
 
                 if (overwrite || !previouslyDefined) {
-                    registry.gauge(prefilteredId, r.obj, new StrongReferenceGaugeFunction<>(r.obj, r.valueFunction));
+                    registry.gauge(preFilteredId, r.obj, new StrongReferenceGaugeFunction<>(r.obj, r.valueFunction));
                 }
 
                 return rowId;

micrometer-core/src/test/java/io/micrometer/core/instrument/binder/kafka/KafkaMetricsTest.java

@@ -579,7 +579,7 @@ void shouldReturnNaNForNullMetricValue(CapturedOutput output) {
         kafkaMetricMap.put(aMetricModified.metricName(), aMetricModified);
         kafkaMetrics.checkAndBindMetrics(registry);
         assertThat(registry.find("kafka.test.a").gauge().value()).isNaN();
-        assertThat(output).doesNotContain("Failed to apply the value function for the gauge").hasSize(0);
+        assertThat(output).isEmpty();
     }
 
     private MetricName createMetricName(String name) {

micrometer-jetty12/src/test/java/io/micrometer/jetty12/server/TimedHandlerTest.java

@@ -292,7 +292,7 @@ protected void onComplete(final Request request, final Throwable failure) {
             }
         }
 
-        public boolean awaitOnComplete(long timeout, TimeUnit unit) throws InterruptedException {
+        boolean awaitOnComplete(long timeout, TimeUnit unit) throws InterruptedException {
             return onCompleteLatch.await(timeout, unit);
         }
 

micrometer-test/src/main/java/io/micrometer/core/instrument/InstrumentationVerificationTests.java

@@ -90,11 +90,11 @@ static class AfterBeforeParameterResolver implements BeforeEachMethodAdapter, Pa
                 // JUnit 5.12 and before
                 "org.junit.jupiter.params.ParameterizedTestParameterResolver"));
 
-        private ParameterResolver parameterisedTestParameterResolver = null;
+        private ParameterResolver parameterizedTestParameterResolver = null;
 
         @Override
         public void invokeBeforeEachMethod(ExtensionContext context, ExtensionRegistry registry) {
-            parameterisedTestParameterResolver = registry.getExtensions(ParameterResolver.class)
+            parameterizedTestParameterResolver = registry.getExtensions(ParameterResolver.class)
                 .stream()
                 .filter(this::isParameterizedTestMethodParameterResolver)
                 .findFirst()
@@ -107,15 +107,15 @@ public boolean supportsParameter(ParameterContext parameterContext, ExtensionCon
                 throws ParameterResolutionException {
             if (isExecutedOnAfterOrBeforeMethod(parameterContext)) {
                 ParameterContext pContext = getMappedContext(parameterContext, extensionContext);
-                return parameterisedTestParameterResolver.supportsParameter(pContext, extensionContext);
+                return parameterizedTestParameterResolver.supportsParameter(pContext, extensionContext);
             }
             return false;
         }
 
         @Override
         public Object resolveParameter(ParameterContext parameterContext, ExtensionContext extensionContext)
                 throws ParameterResolutionException {
-            return parameterisedTestParameterResolver
+            return parameterizedTestParameterResolver
                 .resolveParameter(getMappedContext(parameterContext, extensionContext), extensionContext);
         }