Skip to content

Commit 50502b4

Browse files
izeyeizeye
authored
Resolve StringCaseLocaleUsage warnings from Error Prone (#6162)
See gh-5711 Signed-off-by: Johnny Lim <[email protected]>
1 parent d530e64 commit 50502b4

File tree

26 files changed

+75
-49
lines changed

26 files changed

+75
-49
lines changed

‎implementations/micrometer-registry-azure-monitor/src/main/java/io/micrometer/azuremonitor/AzureMonitorMeterRegistry.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import org.slf4j.Logger;
2929
import org.slf4j.LoggerFactory;
3030

31+
import java.util.Locale;
3132
import java.util.concurrent.ThreadFactory;
3233
import java.util.concurrent.TimeUnit;
3334
import java.util.stream.Stream;
@@ -114,7 +115,7 @@ protected void publish() {
114115

115116
private Stream<MetricTelemetry> trackMeter(Meter meter) {
116117
return stream(meter.measure().spliterator(), false).map(ms -> {
117-
MetricTelemetry mt = createMetricTelemetry(meter, ms.getStatistic().toString().toLowerCase());
118+
MetricTelemetry mt = createMetricTelemetry(meter, ms.getStatistic().toString().toLowerCase(Locale.ROOT));
118119
mt.setValue(ms.getValue());
119120
return mt;
120121
});

‎implementations/micrometer-registry-cloudwatch2/src/main/java/io/micrometer/cloudwatch2/CloudWatchMeterRegistry.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public class CloudWatchMeterRegistry extends StepMeterRegistry {
6262
Map<String, StandardUnit> standardUnitByLowercaseValue = new HashMap<>();
6363
for (StandardUnit standardUnit : StandardUnit.values()) {
6464
if (standardUnit != StandardUnit.UNKNOWN_TO_SDK_VERSION) {
65-
standardUnitByLowercaseValue.put(standardUnit.toString().toLowerCase(), standardUnit);
65+
standardUnitByLowercaseValue.put(standardUnit.toString().toLowerCase(Locale.ROOT), standardUnit);
6666
}
6767
}
6868
STANDARD_UNIT_BY_LOWERCASE_VALUE = Collections.unmodifiableMap(standardUnitByLowercaseValue);
@@ -308,7 +308,7 @@ StandardUnit toStandardUnit(@Nullable String unit) {
308308
if (unit == null) {
309309
return StandardUnit.NONE;
310310
}
311-
StandardUnit standardUnit = STANDARD_UNIT_BY_LOWERCASE_VALUE.get(unit.toLowerCase());
311+
StandardUnit standardUnit = STANDARD_UNIT_BY_LOWERCASE_VALUE.get(unit.toLowerCase(Locale.ROOT));
312312
return standardUnit != null ? standardUnit : StandardUnit.NONE;
313313
}
314314

‎implementations/micrometer-registry-datadog/src/test/java/io/micrometer/datadog/DatadogMeterRegistryTest.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import org.junit.jupiter.api.extension.ExtendWith;
2424
import ru.lanwen.wiremock.ext.WiremockResolver;
2525

26+
import java.util.Locale;
2627
import java.util.concurrent.TimeUnit;
2728

2829
import static com.github.tomakehurst.wiremock.client.WireMock.*;
@@ -71,7 +72,7 @@ public boolean enabled() {
7172
server.stubFor(any(anyUrl()));
7273

7374
Counter.builder("my.counter#abc")
74-
.baseUnit(TimeUnit.MICROSECONDS.toString().toLowerCase())
75+
.baseUnit(TimeUnit.MICROSECONDS.toString().toLowerCase(Locale.ROOT))
7576
.description("metric description")
7677
.register(registry)
7778
.increment(Math.PI);
@@ -121,7 +122,7 @@ public boolean enabled() {
121122
server.stubFor(any(anyUrl()));
122123

123124
Counter.builder("my.counter#abc")
124-
.baseUnit(TimeUnit.MICROSECONDS.toString().toLowerCase())
125+
.baseUnit(TimeUnit.MICROSECONDS.toString().toLowerCase(Locale.ROOT))
125126
.description("metric description")
126127
.register(registry)
127128
.increment(Math.PI);

‎implementations/micrometer-registry-dynatrace/src/main/java/io/micrometer/dynatrace/v1/DynatraceMetricDefinition.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import io.micrometer.core.instrument.util.StringEscapeUtils;
2121

2222
import java.util.Collections;
23+
import java.util.Locale;
2324
import java.util.Map;
2425
import java.util.Set;
2526
import java.util.function.Function;
@@ -109,7 +110,7 @@ enum DynatraceUnit {
109110

110111
private static Map<String, DynatraceUnit> UNITS_MAPPING = Collections
111112
.unmodifiableMap(Stream.of(DynatraceUnit.values())
112-
.collect(Collectors.toMap(k -> k.toString().toLowerCase() + "s", Function.identity())));
113+
.collect(Collectors.toMap(k -> k.toString().toLowerCase(Locale.ROOT) + "s", Function.identity())));
113114

114115
@Nullable
115116
static DynatraceUnit fromPlural(@Nullable String plural) {

‎implementations/micrometer-registry-dynatrace/src/main/java/io/micrometer/dynatrace/v2/DynatraceExporterV2.java‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
import java.net.URI;
4040
import java.time.Instant;
4141
import java.util.*;
42+
import java.util.Locale;
4243
import java.util.concurrent.TimeUnit;
4344
import java.util.function.BiFunction;
4445
import java.util.regex.Matcher;
@@ -565,7 +566,7 @@ private String extractMetricKey(String metadataLine) {
565566
* @return The UCUM-compliant string if known, otherwise returns the original unit
566567
*/
567568
private static String mapUnitIfNeeded(String unit) {
568-
return unit != null ? UCUM_TIME_UNIT_MAP.getOrDefault(unit.toLowerCase(), unit) : null;
569+
return unit != null ? UCUM_TIME_UNIT_MAP.getOrDefault(unit.toLowerCase(Locale.ROOT), unit) : null;
569570
}
570571

571572
/**
@@ -576,22 +577,22 @@ private static String mapUnitIfNeeded(String unit) {
576577
private static Map<String, String> ucumTimeUnitMap() {
577578
Map<String, String> mapping = new HashMap<>();
578579
// There are redundant elements in case the toString method of TimeUnit changes
579-
mapping.put(TimeUnit.NANOSECONDS.toString().toLowerCase(), "ns");
580+
mapping.put(TimeUnit.NANOSECONDS.toString().toLowerCase(Locale.ROOT), "ns");
580581
mapping.put("nanoseconds", "ns");
581582
mapping.put("nanosecond", "ns");
582-
mapping.put(TimeUnit.MICROSECONDS.toString().toLowerCase(), "us");
583+
mapping.put(TimeUnit.MICROSECONDS.toString().toLowerCase(Locale.ROOT), "us");
583584
mapping.put("microseconds", "us");
584585
mapping.put("microsecond", "us");
585-
mapping.put(TimeUnit.MILLISECONDS.toString().toLowerCase(), "ms");
586+
mapping.put(TimeUnit.MILLISECONDS.toString().toLowerCase(Locale.ROOT), "ms");
586587
mapping.put("milliseconds", "ms");
587588
mapping.put("millisecond", "ms");
588-
mapping.put(TimeUnit.SECONDS.toString().toLowerCase(), "s");
589+
mapping.put(TimeUnit.SECONDS.toString().toLowerCase(Locale.ROOT), "s");
589590
mapping.put("seconds", "s");
590591
mapping.put("second", "s");
591-
mapping.put(TimeUnit.MINUTES.toString().toLowerCase(), "min");
592+
mapping.put(TimeUnit.MINUTES.toString().toLowerCase(Locale.ROOT), "min");
592593
mapping.put("minutes", "min");
593594
mapping.put("minute", "min");
594-
mapping.put(TimeUnit.HOURS.toString().toLowerCase(), "h");
595+
mapping.put(TimeUnit.HOURS.toString().toLowerCase(Locale.ROOT), "h");
595596
mapping.put("hours", "h");
596597
mapping.put("hour", "h");
597598

‎implementations/micrometer-registry-elastic/src/main/java/io/micrometer/elastic/ElasticMeterRegistry.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import java.util.ArrayList;
3535
import java.util.Date;
3636
import java.util.List;
37+
import java.util.Locale;
3738
import java.util.Optional;
3839
import java.util.concurrent.ThreadFactory;
3940
import java.util.concurrent.TimeUnit;
@@ -346,7 +347,7 @@ String writeDocument(Meter meter, Consumer<StringBuilder> consumer) {
346347
StringBuilder sb = new StringBuilder(actionLine);
347348
String timestamp = generateTimestamp();
348349
String name = getConventionName(meter.getId());
349-
String type = meter.getId().getType().toString().toLowerCase();
350+
String type = meter.getId().getType().toString().toLowerCase(Locale.ROOT);
350351
sb.append("{\"")
351352
.append(config.timestampFieldName())
352353
.append("\":\"")

‎implementations/micrometer-registry-ganglia/src/main/java/io/micrometer/ganglia/GangliaMeterRegistry.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import org.slf4j.LoggerFactory;
3333

3434
import java.io.IOException;
35+
import java.util.Locale;
3536
import java.util.concurrent.ThreadFactory;
3637
import java.util.concurrent.TimeUnit;
3738

@@ -134,7 +135,7 @@ protected void publish() {
134135

135136
private void announceMeter(Meter meter) {
136137
for (Measurement measurement : meter.measure()) {
137-
announce(meter, measurement.getValue(), measurement.getStatistic().toString().toLowerCase());
138+
announce(meter, measurement.getValue(), measurement.getStatistic().toString().toLowerCase(Locale.ROOT));
138139
}
139140
}
140141

‎implementations/micrometer-registry-health/src/main/java/io/micrometer/health/ServiceLevelObjective.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import java.text.DecimalFormatSymbols;
3030
import java.time.Duration;
3131
import java.util.*;
32+
import java.util.Locale;
3233
import java.util.concurrent.ConcurrentLinkedDeque;
3334
import java.util.concurrent.TimeUnit;
3435
import java.util.function.BinaryOperator;
@@ -161,7 +162,7 @@ public double getValue(MeterRegistry registry) {
161162
public String getValueAsString(MeterRegistry registry) {
162163
double value = getValue(registry);
163164
return Double.isNaN(value) ? "no value available"
164-
: getBaseUnit() != null && getBaseUnit().toLowerCase().contains("percent")
165+
: getBaseUnit() != null && getBaseUnit().toLowerCase(Locale.ROOT).contains("percent")
165166
? WHOLE_OR_SHORT_DECIMAL.get().format(value * 100) + "%"
166167
: WHOLE_OR_SHORT_DECIMAL.get().format(value);
167168
}
@@ -366,7 +367,7 @@ public abstract static class NumericQuery {
366367
abstract Double getValue(MeterRegistry registry);
367368

368369
private String thresholdString(double threshold) {
369-
return baseUnit != null && baseUnit.toLowerCase().contains("percent")
370+
return baseUnit != null && baseUnit.toLowerCase(Locale.ROOT).contains("percent")
370371
? WHOLE_OR_SHORT_DECIMAL.get().format(threshold * 100) + "%"
371372
: WHOLE_OR_SHORT_DECIMAL.get().format(threshold);
372373
}

‎implementations/micrometer-registry-influx/src/main/java/io/micrometer/influx/InfluxApiVersion.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
import java.io.UnsupportedEncodingException;
2222
import java.net.URLEncoder;
23+
import java.util.Locale;
2324

2425
/**
2526
* Enum for the version of the InfluxDB API.
@@ -32,8 +33,8 @@ public enum InfluxApiVersion {
3233
V1 {
3334
@Override
3435
String writeEndpoint(final InfluxConfig config) {
35-
String influxEndpoint = config.uri() + "/write?consistency=" + config.consistency().name().toLowerCase()
36-
+ "&precision=ms&db=" + config.db();
36+
String influxEndpoint = config.uri() + "/write?consistency="
37+
+ config.consistency().name().toLowerCase(Locale.ROOT) + "&precision=ms&db=" + config.db();
3738
if (StringUtils.isNotBlank(config.retentionPolicy())) {
3839
influxEndpoint += "&rp=" + config.retentionPolicy();
3940
}

‎implementations/micrometer-registry-influx/src/main/java/io/micrometer/influx/InfluxMeterRegistry.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import java.net.URLEncoder;
3131
import java.util.ArrayList;
3232
import java.util.List;
33+
import java.util.Locale;
3334
import java.util.concurrent.ThreadFactory;
3435
import java.util.concurrent.TimeUnit;
3536
import java.util.stream.Stream;
@@ -175,14 +176,14 @@ Stream<String> writeMeter(Meter m) {
175176
String fieldKey = measurement.getStatistic()
176177
.getTagValueRepresentation()
177178
.replaceAll("(.)(\\p{Upper})", "$1_$2")
178-
.toLowerCase();
179+
.toLowerCase(Locale.ROOT);
179180
fields.add(new Field(fieldKey, value));
180181
}
181182
if (fields.isEmpty()) {
182183
return Stream.empty();
183184
}
184185
Meter.Id id = m.getId();
185-
return Stream.of(influxLineProtocol(id, id.getType().name().toLowerCase(), fields.stream()));
186+
return Stream.of(influxLineProtocol(id, id.getType().name().toLowerCase(Locale.ROOT), fields.stream()));
186187
}
187188

188189
private Stream<String> writeLongTaskTimer(LongTaskTimer timer) {

0 commit comments

Comments
 (0)