Merge remote-tracking branch 'origin/main' into native-image-for-server

Author: OlgaMaciaszek

docs/modules/ROOT/pages/server/environment-repository/aws-secrets-manager.adoc

@@ -78,7 +78,7 @@ Note that if the default label is not set and a request does not define a label,
 
 Note that if the staging label contains a slash (`/`), then the label in the HTTP URL should instead be specified with the special string `(\{special-string})` (to avoid ambiguity with other URL paths) the same way <<_git_backend,Git backend's section>> describes it.
 
-Use `spring.cloud.config.server.aws-secretsmanager.ignore-label` property to ignore the `{label}` parameter of the HTTP resource as well as `spring.cloud.config.server.aws-secretsmanager.default-label` property. The repository will use secrets as if labelled version support is disabled.
+Use `spring.cloud.config.server.aws-secretsmanager.ignore-label` property to ignore the `\{label}` parameter of the HTTP resource as well as `spring.cloud.config.server.aws-secretsmanager.default-label` property. The repository will use secrets as if labelled version support is disabled.
 
 [source,yaml]
 ----

spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/AwsSecretsManagerEnvironmentRepositoryTests.java

@@ -88,9 +88,11 @@ public class AwsSecretsManagerEnvironmentRepositoryTests {
 	private final AwsSecretsManagerEnvironmentRepository labeledRepository = new AwsSecretsManagerEnvironmentRepository(
 			smClient, configServerProperties, labeledEnvironmentProperties);
 
-	private final AwsSecretsManagerEnvironmentProperties ignoreLabelEnvironmentProperties = new AwsSecretsManagerEnvironmentProperties() {{
-		setIgnoreLabel(true);
-	}};
+	private final AwsSecretsManagerEnvironmentProperties ignoreLabelEnvironmentProperties = new AwsSecretsManagerEnvironmentProperties() {
+		{
+			setIgnoreLabel(true);
+		}
+	};
 
 	private final AwsSecretsManagerEnvironmentRepository ignoreLabelRepository = new AwsSecretsManagerEnvironmentRepository(
 			smClient, configServerProperties, ignoreLabelEnvironmentProperties);
@@ -1849,24 +1851,23 @@ public void testFindOneWithExistingApplicationAndExistingProfileAndExistingLabel
 
 		String fooDefaultPropertiesName = "aws:secrets:/secret/foo-default/";
 		PropertySource fooDefaultProperties = new PropertySource(fooDefaultPropertiesName,
-			getFooDefaultReleaseProperties());
+				getFooDefaultReleaseProperties());
 
 		String applicationProdPropertiesName = "aws:secrets:/secret/application-prod/";
 		PropertySource applicationProdProperties = new PropertySource(applicationProdPropertiesName,
-			getApplicationProdReleaseProperties());
+				getApplicationProdReleaseProperties());
 
 		String applicationDefaultPropertiesName = "aws:secrets:/secret/application-default/";
 		PropertySource applicationDefaultProperties = new PropertySource(applicationDefaultPropertiesName,
-			getApplicationDefaultReleaseProperties());
+				getApplicationDefaultReleaseProperties());
 
 		String applicationPropertiesName = "aws:secrets:/secret/application/";
 		PropertySource applicationProperties = new PropertySource(applicationPropertiesName,
-			getApplicationReleaseProperties());
+				getApplicationReleaseProperties());
 
 		Environment expectedEnv = new Environment(application, profiles, null, null, null);
-		expectedEnv.addAll(Arrays.asList(
-			fooProdProperties, applicationProdProperties, fooDefaultProperties,
-			applicationDefaultProperties, fooProperties, applicationProperties));
+		expectedEnv.addAll(Arrays.asList(fooProdProperties, applicationProdProperties, fooDefaultProperties,
+				applicationDefaultProperties, fooProperties, applicationProperties));
 
 		putSecrets(expectedEnv);