Skip to content

Commit fbc0b7a

Browse files
authored
Merge pull request #61 from AlexProgrammerDE/fix/locale-root-case-conversion
Use Locale.ROOT for toLowerCase/toUpperCase calls
2 parents 712eb3f + d0cd0fe commit fbc0b7a

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

configlib-core/src/main/java/de/exlll/configlib/RootSerializer.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import de.exlll.configlib.ConfigurationProperties.EnvVarResolutionConfiguration;
44

55
import java.util.List;
6+
import java.util.Locale;
67
import java.util.Map;
78
import java.util.Set;
89
import java.util.function.Consumer;
@@ -86,7 +87,7 @@ private void preprocessEnvVarMap(String prefix, Map<Object, Object> map) {
8687
: prefix + '_' + key;
8788
envVar = envVarConfig.caseSensitive()
8889
? envVar
89-
: envVar.toUpperCase();
90+
: envVar.toUpperCase(Locale.ROOT);
9091
final String envVarVal = environment.getValue(envVar);
9192
preprocessRecursively(val, envVar, envVarVal, entry::setValue);
9293
}
@@ -100,7 +101,7 @@ private void preprocessEnvVarList(String prefix, List<Object> list) {
100101
: prefix + '_' + i;
101102
envVar = envVarConfig.caseSensitive()
102103
? envVar
103-
: envVar.toUpperCase();
104+
: envVar.toUpperCase(Locale.ROOT);
104105
final String envVarVal = environment.getValue(envVar);
105106
final int index = i;
106107
preprocessRecursively(val, envVar, envVarVal, o -> list.set(index, o));

configlib-core/src/main/java/de/exlll/configlib/Serializers.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ private static String buildExceptionMessage(
264264
.formatted(
265265
sourceTypeName,
266266
value,
267-
sourceTypeName.toLowerCase(),
267+
sourceTypeName.toLowerCase(Locale.ROOT),
268268
coercionType
269269
);
270270
}

configlib-core/src/test/java/de/exlll/configlib/SerializersTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1111,7 +1111,7 @@ private static String buildExceptionMessage(
11111111
%s '%s' cannot be deserialized to type String because %s-to-string \
11121112
coercion has not been configured. If you want to allow this type of coercion, \
11131113
add the deserialization coercion type '%s' via a ConfigurationProperties object.\
1114-
""".formatted(sourceTypeName, value, sourceTypeName.toLowerCase(), deserializationCoercingType);
1114+
""".formatted(sourceTypeName, value, sourceTypeName.toLowerCase(Locale.ROOT), deserializationCoercingType);
11151115
}
11161116

11171117
@Test

0 commit comments

Comments
 (0)