From c971c30a330b81f172c9cf37b166691c8113d4dc Mon Sep 17 00:00:00 2001
From: Olga MaciaszekSharma <omaciaszeksh@vmware.com>
Date: Fri, 26 Apr 2024 17:34:52 +0200
Subject: [PATCH] Fix resolving environmentConfigurationPropertyName.

---
 ...onmentBeanFactoryInitializationAotProcessor.java | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/aot/CompositeEnvironmentBeanFactoryInitializationAotProcessor.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/aot/CompositeEnvironmentBeanFactoryInitializationAotProcessor.java
index a221f194..ad3b4bd6 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/aot/CompositeEnvironmentBeanFactoryInitializationAotProcessor.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/aot/CompositeEnvironmentBeanFactoryInitializationAotProcessor.java
@@ -169,16 +169,11 @@ public class CompositeEnvironmentBeanFactoryInitializationAotProcessor
 				if (matcher.find()) {
 					String indexString = matcher.group(3);
 					int index = Integer.parseInt(indexString);
-					// method.addStatement(
-					// "$T[] factoryTypes =
-					// $T.getEnvironmentRepositoryFactoryTypeParams(beanFactory, $S)",
-					// Type.class, CompositeUtils.class, factoryName);
-					// method.addStatement("""
-					// Class<? extends EnvironmentRepositoryProperties> propertiesClass
-					// = (Class<? extends EnvironmentRepositoryProperties>)
-					// factoryTypes[1]""");
+					String environmentConfigurationPropertyName = String
+							.format("spring.cloud.config.server.composite[%d]", index);
 					method.addStatement("$T properties$L = binder.bindOrCreate($S, $T.class)",
-							EnvironmentRepositoryProperties.class, index, beanName, propertiesClass);
+							EnvironmentRepositoryProperties.class, index, environmentConfigurationPropertyName,
+							propertiesClass);
 					method.addStatement("properties$L.setOrder($L)", index, index + 1);
 					method.addStatement(
 							"$T propertiesDefinition$L = "