Merge branch '3.2.x' into 3.3.x

Closes gh-42735

Author: mhalbritter

buildSrc/src/main/java/org/springframework/boot/build/antora/AntoraAsciidocAttributes.java

@@ -191,7 +191,8 @@ public synchronized Object put(Object key, Object value) {
 		};
 		try (InputStream in = getClass().getResourceAsStream("antora-asciidoc-attributes.properties")) {
 			properties.load(in);
-		} catch (IOException ex) {
+		}
+		catch (IOException ex) {
 			throw new UncheckedIOException(ex);
 		}
 	}

buildSrc/src/main/java/org/springframework/boot/build/architecture/ArchitectureCheck.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors.
+ * Copyright 2012-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.
@@ -89,7 +89,8 @@ public ArchitectureCheck() {
 				noClassesShouldCallStepVerifierStepVerifyComplete(),
 				noClassesShouldConfigureDefaultStepVerifierTimeout(), noClassesShouldCallCollectorsToList(),
 				noClassesShouldCallURLEncoderWithStringEncoding(), noClassesShouldCallURLDecoderWithStringEncoding(),
-				noClassesShouldLoadResourcesUsingResourceUtils());
+				noClassesShouldLoadResourcesUsingResourceUtils(), noClassesShouldCallStringToUpperCaseWithoutLocale(),
+				noClassesShouldCallStringToLowerCaseWithoutLocale());
 		getRules().addAll(getProhibitObjectsRequireNonNull()
 			.map((prohibit) -> prohibit ? noClassesShouldCallObjectsRequireNonNull() : Collections.emptyList()));
 		getRuleDescriptions().set(getRules().map((rules) -> rules.stream().map(ArchRule::getDescription).toList()));
@@ -189,6 +190,20 @@ public void check(JavaMethod item, ConditionEvents events) {
 		};
 	}
 
+	private ArchRule noClassesShouldCallStringToLowerCaseWithoutLocale() {
+		return ArchRuleDefinition.noClasses()
+			.should()
+			.callMethod(String.class, "toLowerCase")
+			.because("String.toLowerCase(Locale.ROOT) should be used instead");
+	}
+
+	private ArchRule noClassesShouldCallStringToUpperCaseWithoutLocale() {
+		return ArchRuleDefinition.noClasses()
+			.should()
+			.callMethod(String.class, "toUpperCase")
+			.because("String.toUpperCase(Locale.ROOT) should be used instead");
+	}
+
 	private ArchRule noClassesShouldCallStepVerifierStepVerifyComplete() {
 		return ArchRuleDefinition.noClasses()
 			.should()

buildSrc/src/main/java/org/springframework/boot/build/properties/BuildType.java

@@ -16,6 +16,8 @@
 
 package org.springframework.boot.build.properties;
 
+import java.util.Locale;
+
 /**
  * The type of build being performed.
  *
@@ -34,7 +36,7 @@ public enum BuildType {
 	COMMERCIAL;
 
 	public String toIdentifier() {
-		return toString().replace("_", "").toLowerCase();
+		return toString().replace("_", "").toLowerCase(Locale.ROOT);
 	}
 
 }

buildSrc/src/test/java/org/springframework/boot/build/architecture/ArchitectureCheckTests.java

@@ -163,6 +163,42 @@ void whenClassCallsObjectsRequireNonNullWithSupplierTaskFailsAndWritesReport() t
 		});
 	}
 
+	@Test
+	void whenClassCallsStringToUpperCaseWithoutLocaleFailsAndWritesReport() throws Exception {
+		prepareTask("string/toUpperCase", (architectureCheck) -> {
+			assertThatExceptionOfType(GradleException.class).isThrownBy(architectureCheck::checkArchitecture);
+			assertThat(failureReport(architectureCheck)).isNotEmpty()
+				.content()
+				.contains("because String.toUpperCase(Locale.ROOT) should be used instead");
+		});
+	}
+
+	@Test
+	void whenClassCallsStringToLowerCaseWithoutLocaleFailsAndWritesReport() throws Exception {
+		prepareTask("string/toLowerCase", (architectureCheck) -> {
+			assertThatExceptionOfType(GradleException.class).isThrownBy(architectureCheck::checkArchitecture);
+			assertThat(failureReport(architectureCheck)).isNotEmpty()
+				.content()
+				.contains("because String.toLowerCase(Locale.ROOT) should be used instead");
+		});
+	}
+
+	@Test
+	void whenClassCallsStringToLowerCaseWithLocaleShouldNotFail() throws Exception {
+		prepareTask("string/toLowerCaseWithLocale", (architectureCheck) -> {
+			architectureCheck.checkArchitecture();
+			assertThat(failureReport(architectureCheck)).isEmpty();
+		});
+	}
+
+	@Test
+	void whenClassCallsStringToUpperCaseWithLocaleShouldNotFail() throws Exception {
+		prepareTask("string/toUpperCaseWithLocale", (architectureCheck) -> {
+			architectureCheck.checkArchitecture();
+			assertThat(failureReport(architectureCheck)).isEmpty();
+		});
+	}
+
 	private void prepareTask(String classes, Callback<ArchitectureCheck> callback) throws Exception {
 		File projectDir = new File(this.temp, "project");
 		projectDir.mkdirs();

buildSrc/src/test/java/org/springframework/boot/build/architecture/string/toLowerCase/ToLowerCase.java

@@ -0,0 +1,26 @@
+/*
+ * Copyright 2012-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.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.build.architecture.string.toLowerCase;
+
+class ToLowerCase {
+
+	void exampleMethod() {
+		String test = "Object must not be null";
+		System.out.println(test.toLowerCase());
+	}
+
+}

buildSrc/src/test/java/org/springframework/boot/build/architecture/string/toLowerCaseWithLocale/ToLowerCaseWithLocale.java

@@ -0,0 +1,28 @@
+/*
+ * Copyright 2012-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.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.build.architecture.string.toLowerCaseWithLocale;
+
+import java.util.Locale;
+
+class ToLowerCaseWithLocale {
+
+	void exampleMethod() {
+		String test = "Object must not be null";
+		System.out.println(test.toLowerCase(Locale.ENGLISH));
+	}
+
+}

buildSrc/src/test/java/org/springframework/boot/build/architecture/string/toUpperCase/ToUpperCase.java

@@ -0,0 +1,26 @@
+/*
+ * Copyright 2012-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.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.build.architecture.string.toUpperCase;
+
+class ToUpperCase {
+
+	void exampleMethod() {
+		String test = "Object must not be null";
+		System.out.println(test.toUpperCase());
+	}
+
+}

buildSrc/src/test/java/org/springframework/boot/build/architecture/string/toUpperCaseWithLocale/ToUpperCaseWithLocale.java

@@ -0,0 +1,28 @@
+/*
+ * Copyright 2012-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.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.build.architecture.string.toUpperCaseWithLocale;
+
+import java.util.Locale;
+
+class ToUpperCaseWithLocale {
+
+	void exampleMethod() {
+		String test = "Object must not be null";
+		System.out.println(test.toUpperCase(Locale.ROOT));
+	}
+
+}

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/condition/OnAvailableEndpointCondition.java

@@ -20,6 +20,7 @@
 import java.util.EnumSet;
 import java.util.HashSet;
 import java.util.LinkedHashSet;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
@@ -118,7 +119,7 @@ private ConditionOutcome getMatchOutcome(Environment environment,
 		for (ExposureFilter exposureFilter : exposureFilters) {
 			if (exposuresToCheck.contains(exposureFilter.getExposure()) && exposureFilter.isExposed(endpointId)) {
 				return ConditionOutcome.match(message.because("marked as exposed by a 'management.endpoints."
-						+ exposureFilter.getExposure().name().toLowerCase() + ".exposure' property"));
+						+ exposureFilter.getExposure().name().toLowerCase(Locale.ROOT) + ".exposure' property"));
 			}
 		}
 		return ConditionOutcome.noMatch(message.because("no 'management.endpoints' property marked it as exposed"));
@@ -187,7 +188,7 @@ private static String getCanonicalName(EndpointExposure exposure) {
 			if (EndpointExposure.CLOUD_FOUNDRY.equals(exposure)) {
 				return "cloud-foundry";
 			}
-			return exposure.name().toLowerCase();
+			return exposure.name().toLowerCase(Locale.ROOT);
 		}
 
 		EndpointExposure getExposure() {

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/otlp/OtlpTracingConfigurations.java

@@ -16,6 +16,7 @@
 
 package org.springframework.boot.actuate.autoconfigure.tracing.otlp;
 
+import java.util.Locale;
 import java.util.Map.Entry;
 
 import io.opentelemetry.exporter.otlp.http.trace.OtlpHttpSpanExporter;
@@ -78,7 +79,7 @@ OtlpHttpSpanExporter otlpHttpSpanExporter(OtlpProperties properties,
 			OtlpHttpSpanExporterBuilder builder = OtlpHttpSpanExporter.builder()
 				.setEndpoint(connectionDetails.getUrl())
 				.setTimeout(properties.getTimeout())
-				.setCompression(properties.getCompression().name().toLowerCase());
+				.setCompression(properties.getCompression().name().toLowerCase(Locale.ROOT));
 			for (Entry<String, String> header : properties.getHeaders().entrySet()) {
 				builder.addHeader(header.getKey(), header.getValue());
 			}