Skip to content

Commit abafced

Browse files
committed
Merge remote-tracking branch 'origin/4.1.x'
2 parents 3402ea8 + 9f01ddd commit abafced

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

spring-cloud-commons/src/main/java/org/springframework/cloud/configuration/TlsProperties.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2017-2020 the original author or authors.
2+
* Copyright 2017-2024 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.
@@ -16,6 +16,7 @@
1616

1717
package org.springframework.cloud.configuration;
1818

19+
import java.util.Locale;
1920
import java.util.Map;
2021

2122
import org.springframework.core.io.Resource;
@@ -143,7 +144,7 @@ private String fileExtensionOf(Resource resource) {
143144
String name = resource.getFilename();
144145
int index = name.lastIndexOf('.');
145146

146-
return index < 0 ? "" : name.substring(index + 1).toLowerCase();
147+
return index < 0 ? "" : name.substring(index + 1).toLowerCase(Locale.ROOT);
147148
}
148149

149150
}

src/checkstyle/checkstyle-suppressions.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,6 @@
2222
<suppress files=".*AutoConfiguration.*" checks="HideUtilityClassConstructor"/>
2323
<suppress files=".*AutoConfiguration.*" checks="FinalClass"/>
2424
<suppress files=".*ReactiveDiscoveryClient.*" checks="JavadocVariable"/>
25+
<suppress files="[\\/]src[\\/](test|testFixtures)[\\/](java|java21)[\\/]" checks="RegexpSinglelineJava" id="toLowerCaseWithoutLocale"/>
26+
<suppress files="[\\/]src[\\/](test|testFixtures)[\\/](java|java21)[\\/]" checks="RegexpSinglelineJava" id="toUpperCaseWithoutLocale"/>
2527
</suppressions>

0 commit comments

Comments
 (0)