Polish

core/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/CollectionBinderTests.java

@@ -119,10 +119,10 @@ void bindToCollectionWhenNonSequentialShouldThrowException() {
 			.satisfies((ex) -> {
 				Set<ConfigurationProperty> unbound = ((UnboundConfigurationPropertiesException) ex.getCause())
 					.getUnboundProperties();
-				assertThat(unbound).hasSize(1);
-				ConfigurationProperty property = unbound.iterator().next();
-				assertThat(property.getName()).hasToString("foo[3]");
-				assertThat(property.getValue()).isEqualTo("3");
+				assertThat(unbound).singleElement().satisfies((property) -> {
+					assertThat(property.getName()).hasToString("foo[3]");
+					assertThat(property.getValue()).isEqualTo("3");
+				});
 			});
 	}
 
@@ -139,10 +139,10 @@ void bindToCollectionWhenNonKnownIndexedChildNotBoundThrowsException() {
 			.satisfies((ex) -> {
 				Set<ConfigurationProperty> unbound = ((UnboundConfigurationPropertiesException) ex.getCause())
 					.getUnboundProperties();
-				assertThat(unbound).hasSize(1);
-				ConfigurationProperty property = unbound.iterator().next();
-				assertThat(property.getName()).hasToString("foo[1].missing");
-				assertThat(property.getValue()).isEqualTo("bad");
+				assertThat(unbound).singleElement().satisfies((property) -> {
+					assertThat(property.getName()).hasToString("foo[1].missing");
+					assertThat(property.getValue()).isEqualTo("bad");
+				});
 			});
 	}
 
@@ -155,10 +155,10 @@ void bindToNestedCollectionWhenNonKnownIndexed() {
 		source.put("foo[0].string", "test");
 		this.sources.add(source);
 		List<ExampleCollectionBean> list = this.binder.bind("foo", Bindable.listOf(ExampleCollectionBean.class)).get();
-		assertThat(list).hasSize(1);
-		ExampleCollectionBean bean = list.get(0);
-		assertThat(bean.getItems()).containsExactly("a", "b", "d");
-		assertThat(bean.getString()).isEqualTo("test");
+		assertThat(list).singleElement().satisfies((bean) -> {
+			assertThat(bean.getItems()).containsExactly("a", "b", "d");
+			assertThat(bean.getString()).isEqualTo("test");
+		});
 	}
 
 	@Test
@@ -173,10 +173,10 @@ void bindToNonScalarCollectionWhenNonSequentialShouldThrowException() {
 			.satisfies((ex) -> {
 				Set<ConfigurationProperty> unbound = ((UnboundConfigurationPropertiesException) ex.getCause())
 					.getUnboundProperties();
-				assertThat(unbound).hasSize(1);
-				ConfigurationProperty property = unbound.iterator().next();
-				assertThat(property.getName()).hasToString("foo[4].value");
-				assertThat(property.getValue()).isEqualTo("4");
+				assertThat(unbound).singleElement().satisfies((property) -> {
+					assertThat(property.getName()).hasToString("foo[4].value");
+					assertThat(property.getValue()).isEqualTo("4");
+				});
 			});
 	}
 

documentation/spring-boot-docs/src/docs/antora/modules/reference/pages/features/external-config.adoc

@@ -1173,7 +1173,7 @@ Beans used for property conversion are requested very early during the applicati
 Typically, any dependency that you require may not be fully initialized at creation time.
 ====
 
-TIP: You may want to rename your custom javadoc:org.springframework.core.convert.ConversionService[] if it is not required for configuration keys coercion and only rely on custom converters qualified with javadoc:org.springframework.boot.context.properties.ConfigurationPropertiesBinding[format=annotation].
+TIP: You may want to rename your custom javadoc:org.springframework.core.convert.ConversionService[] if it is not required for configuration keys coercion and only relies on custom converters qualified with javadoc:org.springframework.boot.context.properties.ConfigurationPropertiesBinding[format=annotation].
 When qualifying a `@Bean` method with `@ConfigurationPropertiesBinding`, the method should be `static` to avoid "`bean is not eligible for getting processed by all BeanPostProcessors`" warnings.
 
 

module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitTemplateConfigurer.java

@@ -33,7 +33,7 @@
  * properties.
  * <p>
  * Can be injected into application code and used to define a custom
- * {@code RabbitTemplateConfigurer} whose configuration is based upon that produced by
+ * {@code RabbitTemplate} whose configuration is based upon that produced by
  * auto-configuration.
  *
  * @author Stephane Nicoll

module/spring-boot-http-converter/src/main/java/org/springframework/boot/http/converter/autoconfigure/HttpMessageConvertersProperties.java

@@ -31,7 +31,7 @@
 public class HttpMessageConvertersProperties {
 
 	/**
-	 * The charset to use for String conversion.
+	 * Charset to use for String conversion.
 	 */
 	private Charset stringEncodingCharset = StandardCharsets.UTF_8;
 

module/spring-boot-observation/src/main/java/org/springframework/boot/observation/autoconfigure/ObservationHandlerGroup.java

@@ -65,7 +65,7 @@ default int compareTo(ObservationHandlerGroup other) {
 	Class<?> handlerType();
 
 	/**
-	 * Static factory method to create a {@link ObservationHandlerGroup} with members of
+	 * Static factory method to create an {@link ObservationHandlerGroup} with members of
 	 * the given handler type.
 	 * @param <H> the handler type
 	 * @param handlerType the handler type

module/spring-boot-observation/src/main/java/org/springframework/boot/observation/autoconfigure/ObservationHandlerGroups.java

@@ -29,7 +29,7 @@
 import org.springframework.util.MultiValueMap;
 
 /**
- * A collection {@link ObservationHandlerGroup} instance and supporting registration
+ * A collection of {@link ObservationHandlerGroup} instances and supporting registration
  * logic.
  *
  * @author Andy Wilkinson

module/spring-boot-tracing/src/main/java/org/springframework/boot/tracing/autoconfigure/TracingAndMeterObservationHandlerGroup.java

@@ -32,7 +32,7 @@
 /**
  * {@link ObservationHandlerGroup} that considers both {@link TracingObservationHandler}
  * and {@link MeterObservationHandler} types as members. This group takes precedence over
- * any regular {@link MeterObservationHandler} group in order to use ensure
+ * any regular {@link MeterObservationHandler} group in order to ensure
  * {@link TracingAwareMeterObservationHandler} wrapping is applied during registration.
  *
  * @author Phillip Webb

module/spring-boot-tracing/src/test/java/org/springframework/boot/tracing/autoconfigure/zipkin/ZipkinConfigurationsOpenTelemetryConfigurationTests.java

@@ -44,11 +44,12 @@ class ZipkinConfigurationsOpenTelemetryConfigurationTests {
 
 	@Test
 	void backsOffWithoutEncoding() {
-		new ApplicationContextRunner().withUserConfiguration(OpenTelemetryConfiguration.class).run((context) -> {
-			assertThat(context).hasNotFailed();
-			assertThat(context).doesNotHaveBean(ZipkinSpanExporter.class);
-			assertThat(context).doesNotHaveBean(BytesEncoder.class);
-		});
+		new ApplicationContextRunner().withConfiguration(AutoConfigurations.of(OpenTelemetryConfiguration.class))
+			.run((context) -> {
+				assertThat(context).hasNotFailed();
+				assertThat(context).doesNotHaveBean(ZipkinSpanExporter.class);
+				assertThat(context).doesNotHaveBean(BytesEncoder.class);
+			});
 	}
 
 	@Test