Merge remote-tracking branch 'origin/4.1.x'

spring-cloud · Oct 17, 2024 · abafced · abafced
2 parents 3402ea8 + 9f01ddd
commit abafced
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/...ng-cloud-commons/src/main/java/org/springframework/cloud/configuration/TlsProperties.java b/...ng-cloud-commons/src/main/java/org/springframework/cloud/configuration/TlsProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2020 the original author or authors.
+ * Copyright 2017-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 package org.springframework.cloud.configuration;
 
+import java.util.Locale;
 import java.util.Map;
 
 import org.springframework.core.io.Resource;
@@ -143,7 +144,7 @@ private String fileExtensionOf(Resource resource) {
 		String name = resource.getFilename();
 		int index = name.lastIndexOf('.');
 
-		return index < 0 ? "" : name.substring(index + 1).toLowerCase();
+		return index < 0 ? "" : name.substring(index + 1).toLowerCase(Locale.ROOT);
 	}
 
 }
diff --git a/src/checkstyle/checkstyle-suppressions.xml b/src/checkstyle/checkstyle-suppressions.xml
@@ -22,4 +22,6 @@
 	<suppress files=".*AutoConfiguration.*" checks="HideUtilityClassConstructor"/>
 	<suppress files=".*AutoConfiguration.*" checks="FinalClass"/>
 	<suppress files=".*ReactiveDiscoveryClient.*" checks="JavadocVariable"/>
+	<suppress files="[\\/]src[\\/](test|testFixtures)[\\/](java|java21)[\\/]" checks="RegexpSinglelineJava" id="toLowerCaseWithoutLocale"/>
+	<suppress files="[\\/]src[\\/](test|testFixtures)[\\/](java|java21)[\\/]" checks="RegexpSinglelineJava" id="toUpperCaseWithoutLocale"/>
 </suppressions>