Use PropertyResolver to resolve placeholders in KeySpace

Related tickets spring-projects/spring-data-commons#2369

Author: Tim Sazon

src/main/java/org/springframework/data/keyvalue/core/mapping/BasicKeyValuePersistentEntity.java

@@ -15,6 +15,7 @@
  */
 package org.springframework.data.keyvalue.core.mapping;
 
+import org.springframework.core.env.PropertyResolver;
 import org.springframework.data.mapping.model.BasicPersistentEntity;
 import org.springframework.data.util.TypeInformation;
 import org.springframework.expression.Expression;
@@ -30,6 +31,7 @@
  * @author Christoph Strobl
  * @author Oliver Gierke
  * @author Mark Paluch
+ * @author Timur Sazon
  * @param <T>
  */
 public class BasicKeyValuePersistentEntity<T, P extends KeyValuePersistentProperty<P>>
@@ -91,8 +93,17 @@ private static String resolveKeyspace(@Nullable KeySpaceResolver fallbackKeySpac
 	 */
 	@Override
 	public String getKeySpace() {
-		return keyspaceExpression == null //
+		String keySpace = keyspaceExpression == null //
 				? keyspace //
 				: keyspaceExpression.getValue(getEvaluationContext(null), String.class);
+
+		if (keySpace != null) {
+			PropertyResolver propertyResolver = getPropertyResolver();
+			if (propertyResolver != null) {
+				return propertyResolver.resolvePlaceholders(keySpace);
+			}
+		}
+
+		return keySpace;
 	}
 }

src/test/java/org/springframework/data/keyvalue/core/mapping/BasicKeyValuePersistentEntityUnitTests.java

@@ -27,11 +27,13 @@
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.spel.ExtensionAwareEvaluationContextProvider;
 import org.springframework.data.spel.spi.EvaluationContextExtension;
+import org.springframework.mock.env.MockEnvironment;
 
 /**
  * Unit tests for {@link BasicKeyValuePersistentEntity}.
  *
  * @author Mark Paluch
+ * @author Timur Sazon
  */
 class BasicKeyValuePersistentEntityUnitTests {
 
@@ -64,6 +66,19 @@ void shouldEvaluateEntityWithoutKeyspace() {
 		assertThat(persistentEntity.getKeySpace()).isEqualTo(NoKeyspaceEntity.class.getName());
 	}
 
+	@Test
+	void shouldEvaluateKeyspaceWithPropertyPlaceholders() {
+
+		BasicKeyValuePersistentEntity<?, ?> persistentEntity = (BasicKeyValuePersistentEntity<?, ?>) mappingContext
+				.getPersistentEntity(PropertyEntity.class);
+		persistentEntity.setPropertyResolver(new MockEnvironment().withProperty("test.property", "myValue"));
+
+		assertThat(persistentEntity.getKeySpace()).isEqualTo("myValue");
+	}
+
+	@KeySpace("${test.property}")
+	private static class PropertyEntity {}
+
 	@KeySpace("#{myProperty}")
 	private static class ExpressionEntity {}