Merge branch '2.6.x' into 2.7.x

Closes gh-32818

spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/usingannotatedtypes/MyProperties.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2022 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,7 +16,7 @@
 
 package org.springframework.boot.docs.features.externalconfig.typesafeconfigurationproperties.usingannotatedtypes;
 
-class SomeProperties {
+class MyProperties {
 
 	Object getRemoteAddress() {
 		return null;

spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/usingannotatedtypes/MyService.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2022 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.
@@ -21,9 +21,9 @@ import org.springframework.stereotype.Service;
 @Service
 public class MyService {
 
-	private final SomeProperties properties;
+	private final MyProperties properties;
 
-	public MyService(SomeProperties properties) {
+	public MyService(MyProperties properties) {
 		this.properties = properties;
 	}
 

spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/usingannotatedtypes/MyProperties.kt

@@ -16,7 +16,7 @@
 
 package org.springframework.boot.docs.features.externalconfig.typesafeconfigurationproperties.usingannotatedtypes
 
-class SomeProperties {
+class MyProperties {
 
 	val remoteAddress: Any?
 		get() = null

spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/usingannotatedtypes/MyService.kt

@@ -19,7 +19,7 @@ package org.springframework.boot.docs.features.externalconfig.typesafeconfigurat
 import org.springframework.stereotype.Service
 
 @Service
-class MyService(val properties: SomeProperties) {
+class MyService(val properties: MyProperties) {
 
 	fun openConnection() {
 		val server = Server(properties.remoteAddress)