Polishing.

Signed-off-by: Youssef Aouichaoui <[email protected]>

src/main/java/org/springframework/data/elasticsearch/client/elc/IndicesTemplate.java

@@ -265,10 +265,10 @@ private void refreshEntitiesMapping() {
 		ClusterMapping clusterMapping = getClusterMapping();
 		for (ClusterMapping.ClusterMappingEntry mappingEntry : clusterMapping) {
 			// Get entity
-			Class<?> entity = null;
+			ElasticsearchPersistentEntity<?> entity = null;
 			for (ElasticsearchPersistentEntity<?> persistentEntity : this.elasticsearchConverter.getMappingContext().getPersistentEntities()) {
 				if (mappingEntry.getName().equals(persistentEntity.getIndexCoordinates().getIndexName())) {
-					entity = persistentEntity.getType();
+					entity = persistentEntity;
 
 					break;
 				}
@@ -281,7 +281,7 @@ private void refreshEntitiesMapping() {
 			if (mappingEntry.getMappings().containsKey("dynamic_templates")) {
 				Object dynamicTemplates = mappingEntry.getMappings().get("dynamic_templates");
 				if (dynamicTemplates instanceof List<?> value) {
-					getRequiredPersistentEntity(entity).buildDynamicTemplates(value);
+					entity.buildDynamicTemplates(value);
 				}
 			}
 		}

src/test/java/org/springframework/data/elasticsearch/core/index/MappingBuilderIntegrationTests.java

@@ -961,7 +961,7 @@ private static class FieldAliasEntity {
 	}
 
 	@SuppressWarnings("unused")
-	@Document(indexName = "foo")
+	@Document(indexName = "#{@indexNameProvider.indexName()}-foo")
 	@DynamicTemplates(mappingPath = "/mappings/test-dynamic_templates_mappings_three.json")
 	private static class DynamicFieldDocument {
 		@Nullable