Add an ability to resolve property placeholders in BasicPersistentEntity

src/main/java/org/springframework/data/mapping/context/AbstractMappingContext.java

@@ -43,6 +43,7 @@
 import org.springframework.context.ApplicationEventPublisherAware;
 import org.springframework.core.KotlinDetector;
 import org.springframework.core.NativeDetector;
+import org.springframework.core.env.PropertyResolver;
 import org.springframework.data.mapping.MappingException;
 import org.springframework.data.mapping.PersistentEntity;
 import org.springframework.data.mapping.PersistentProperty;
@@ -87,6 +88,7 @@
  * @author Mark Paluch
  * @author Mikael Klamra
  * @author Christoph Strobl
+ * @author Tim Sazon
  */
 public abstract class AbstractMappingContext<E extends MutablePersistentEntity<?, P>, P extends PersistentProperty<P>>
 		implements MappingContext<E, P>, ApplicationEventPublisherAware, ApplicationContextAware, InitializingBean {
@@ -99,6 +101,7 @@ public abstract class AbstractMappingContext<E extends MutablePersistentEntity<?
 	private final PersistentPropertyPathFactory<E, P> persistentPropertyPathFactory;
 
 	private @Nullable ApplicationEventPublisher applicationEventPublisher;
+	private @Nullable PropertyResolver propertyResolver;
 	private EvaluationContextProvider evaluationContextProvider = EvaluationContextProvider.DEFAULT;
 
 	private Set<? extends Class<?>> initialEntitySet = new HashSet<>();
@@ -142,6 +145,10 @@ public void setApplicationContext(ApplicationContext applicationContext) throws
 		if (applicationEventPublisher == null) {
 			this.applicationEventPublisher = applicationContext;
 		}
+
+		if (propertyResolver == null) {
+			this.propertyResolver = applicationContext.getEnvironment();
+		}
 	}
 
 	/**
@@ -373,6 +380,7 @@ protected Optional<E> addPersistentEntity(TypeInformation<?> typeInformation) {
 			entity = createPersistentEntity(typeInformation);
 
 			entity.setEvaluationContextProvider(evaluationContextProvider);
+			entity.setPropertyResolver(propertyResolver);
 
 			// Eagerly cache the entity as we might have to find it during recursive lookups.
 			persistentEntities.put(typeInformation, Optional.of(entity));

src/main/java/org/springframework/data/mapping/model/BasicPersistentEntity.java

@@ -30,6 +30,7 @@
 import java.util.stream.Collectors;
 
 import org.springframework.core.annotation.AnnotatedElementUtils;
+import org.springframework.core.env.PropertyResolver;
 import org.springframework.data.annotation.Immutable;
 import org.springframework.data.annotation.TypeAlias;
 import org.springframework.data.domain.Persistable;
@@ -58,6 +59,7 @@
  * @author Thomas Darimont
  * @author Christoph Strobl
  * @author Mark Paluch
+ * @author Tim Sazon
  */
 public class BasicPersistentEntity<T, P extends PersistentProperty<P>> implements MutablePersistentEntity<T, P> {
 
@@ -78,6 +80,7 @@ public class BasicPersistentEntity<T, P extends PersistentProperty<P>> implement
 	private @Nullable P versionProperty;
 	private PersistentPropertyAccessorFactory propertyAccessorFactory;
 	private EvaluationContextProvider evaluationContextProvider = EvaluationContextProvider.DEFAULT;
+	private @Nullable PropertyResolver propertyResolver;
 
 	private final Lazy<Alias> typeAlias;
 	private final Lazy<IsNewStrategy> isNewStrategy;
@@ -254,6 +257,15 @@ public void setEvaluationContextProvider(EvaluationContextProvider provider) {
 		this.evaluationContextProvider = provider;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mapping.model.MutablePersistentEntity#setPropertyResolver(org.springframework.core.env.PropertyResolver)
+	 */
+	@Override
+	public void setPropertyResolver(@Nullable PropertyResolver propertyResolver) {
+		this.propertyResolver = propertyResolver;
+	}
+
 	/**
 	 * Returns the given property if it is a better candidate for the id property than the current id property.
 	 *
@@ -561,6 +573,14 @@ protected EvaluationContext getEvaluationContext(Object rootObject, ExpressionDe
 		return evaluationContextProvider.getEvaluationContext(rootObject, dependencies);
 	}
 
+	/**
+	 * Returns the {@link PropertyResolver}.
+	 */
+	@Nullable
+	protected PropertyResolver getPropertyResolver() {
+		return propertyResolver;
+	}
+
 	/**
 	 * Returns the default {@link IsNewStrategy} to be used. Will be a {@link PersistentEntityIsNewStrategy} by default.
 	 * Note, that this strategy only gets used if the entity doesn't implement {@link Persistable} as this indicates the

src/main/java/org/springframework/data/mapping/model/MutablePersistentEntity.java

@@ -15,18 +15,21 @@
  */
 package org.springframework.data.mapping.model;
 
+import org.springframework.core.env.PropertyResolver;
 import org.springframework.data.mapping.Association;
 import org.springframework.data.mapping.MappingException;
 import org.springframework.data.mapping.PersistentEntity;
 import org.springframework.data.mapping.PersistentProperty;
 import org.springframework.data.mapping.PersistentPropertyAccessor;
 import org.springframework.data.spel.EvaluationContextProvider;
+import org.springframework.lang.Nullable;
 
 /**
  * Interface capturing mutator methods for {@link PersistentEntity}s.
  *
  * @author Oliver Gierke
  * @author Mark Paluch
+ * @author Tim Sazon
  */
 public interface MutablePersistentEntity<T, P extends PersistentProperty<P>> extends PersistentEntity<T, P> {
 
@@ -66,4 +69,11 @@ public interface MutablePersistentEntity<T, P extends PersistentProperty<P>> ext
 	 * @param provider must not be {@literal null}.
 	 */
 	void setEvaluationContextProvider(EvaluationContextProvider provider);
+
+	/**
+	 * Configures the {@link PropertyResolver} to be used by the entity.
+	 *
+	 * @param propertyResolver can be {@literal null}.
+	 */
+	void setPropertyResolver(@Nullable PropertyResolver propertyResolver);
 }