diff --git a/spring-data-geode/src/main/java/org/springframework/data/gemfire/mapping/MappingPdxSerializer.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/mapping/MappingPdxSerializer.java
index 53f197f1..98835fde 100644
--- a/spring-data-geode/src/main/java/org/springframework/data/gemfire/mapping/MappingPdxSerializer.java
+++ b/spring-data-geode/src/main/java/org/springframework/data/gemfire/mapping/MappingPdxSerializer.java
@@ -37,8 +37,6 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.core.convert.support.DefaultConversionService;
-import org.springframework.data.convert.EntityInstantiator;
-import org.springframework.data.convert.EntityInstantiators;
 import org.springframework.data.gemfire.util.Filter;
 import org.springframework.data.mapping.MappingException;
 import org.springframework.data.mapping.PersistentEntity;
@@ -46,6 +44,8 @@ import org.springframework.data.mapping.PersistentProperty;
 import org.springframework.data.mapping.PersistentPropertyAccessor;
 import org.springframework.data.mapping.PropertyHandler;
 import org.springframework.data.mapping.model.ConvertingPropertyAccessor;
+import org.springframework.data.mapping.model.EntityInstantiator;
+import org.springframework.data.mapping.model.EntityInstantiators;
 import org.springframework.data.mapping.model.PersistentEntityParameterValueProvider;
 import org.springframework.data.mapping.model.SpELContext;
 import org.springframework.lang.NonNull;
@@ -66,8 +66,8 @@ import org.springframework.util.ObjectUtils;
  * @see org.springframework.context.ApplicationContext
  * @see org.springframework.context.ApplicationContextAware
  * @see org.springframework.core.convert.ConversionService
- * @see org.springframework.data.convert.EntityInstantiator
- * @see org.springframework.data.convert.EntityInstantiators
+ * @see org.springframework.data.mapping.model.EntityInstantiator
+ * @see org.springframework.data.mapping.model.EntityInstantiators
  * @see org.springframework.data.gemfire.util.Filter
  * @see org.springframework.data.mapping.PersistentEntity
  * @see org.springframework.data.mapping.PersistentProperty
@@ -317,7 +317,7 @@ public class MappingPdxSerializer implements PdxSerializer, ApplicationContextAw
 	 *
 	 * @param entityInstantiators {@link EntityInstantiator EntityInstantiators} used to create the instances
 	 * read by this {@link PdxSerializer}; must not be {@literal null}.
-	 * @see org.springframework.data.convert.EntityInstantiator
+	 * @see org.springframework.data.mapping.model.EntityInstantiator
 	 */
 	public void setEntityInstantiators(@NonNull EntityInstantiators entityInstantiators) {
 
@@ -332,7 +332,7 @@ public class MappingPdxSerializer implements PdxSerializer, ApplicationContextAw
 	 *
 	 * @param gemfireInstantiators mapping of {@link Class types} to {@link EntityInstantiator} objects;
 	 * must not be {@literal null}.
-	 * @see org.springframework.data.convert.EntityInstantiator
+	 * @see org.springframework.data.mapping.model.EntityInstantiator
 	 * @see java.util.Map
 	 */
 	public void setEntityInstantiators(@NonNull Map<Class<?>, EntityInstantiator> gemfireInstantiators) {
@@ -343,7 +343,7 @@ public class MappingPdxSerializer implements PdxSerializer, ApplicationContextAw
 	 * Returns the configured {@link EntityInstantiators} handling instantiation for GemFire persistent entities.
 	 *
 	 * @return the configured {@link EntityInstantiators} handling instantiation for GemFire persistent entities.
-	 * @see org.springframework.data.convert.EntityInstantiators
+	 * @see org.springframework.data.mapping.model.EntityInstantiators
 	 */
 	protected EntityInstantiators getEntityInstantiators() {
 		return this.entityInstantiators;
@@ -409,6 +409,7 @@ public class MappingPdxSerializer implements PdxSerializer, ApplicationContextAw
 	 * by this {@link MappingPdxSerializer PDX serializer}.
 	 * @see java.util.function.Predicate
 	 */
+	@SuppressWarnings("unused")
 	public void setExcludeTypeFilters(@Nullable Predicate<Class<?>> excludeTypeFilters) {
 
 		this.excludeTypeFilters = excludeTypeFilters != null
@@ -569,7 +570,7 @@ public class MappingPdxSerializer implements PdxSerializer, ApplicationContextAw
 	 * @see org.apache.geode.pdx.PdxWriter
 	 * @see java.lang.Object
 	 */
-	@SuppressWarnings("unchecked")
+	@SuppressWarnings({ "rawtypes", "unchecked" })
 	boolean doToData(Object value, PdxWriter writer) {
 
 		GemfirePersistentEntity<?> entity = getPersistentEntity(value);
@@ -673,6 +674,7 @@ public class MappingPdxSerializer implements PdxSerializer, ApplicationContextAw
 	 * @see org.springframework.data.convert.EntityInstantiator
 	 * @see org.springframework.data.mapping.PersistentEntity
 	 */
+	@SuppressWarnings("rawtypes")
 	protected EntityInstantiator resolveEntityInstantiator(PersistentEntity entity) {
 		return getEntityInstantiators().getInstantiatorFor(entity);
 	}
diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/mapping/MappingPdxSerializerIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/mapping/MappingPdxSerializerIntegrationTests.java
index 3067b4c9..3bdc6592 100644
--- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/mapping/MappingPdxSerializerIntegrationTests.java
+++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/mapping/MappingPdxSerializerIntegrationTests.java
@@ -55,11 +55,11 @@ import org.apache.geode.pdx.PdxWriter;
 
 import org.springframework.data.annotation.ReadOnlyProperty;
 import org.springframework.data.annotation.Transient;
-import org.springframework.data.convert.EntityInstantiator;
 import org.springframework.data.gemfire.GemfireUtils;
 import org.springframework.data.gemfire.repository.sample.Address;
 import org.springframework.data.gemfire.repository.sample.Person;
 import org.springframework.data.mapping.PersistentEntity;
+import org.springframework.data.mapping.model.EntityInstantiator;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/mapping/MappingPdxSerializerUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/mapping/MappingPdxSerializerUnitTests.java
index 509bab99..bcc7486a 100644
--- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/mapping/MappingPdxSerializerUnitTests.java
+++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/mapping/MappingPdxSerializerUnitTests.java
@@ -55,8 +55,6 @@ import org.springframework.core.convert.ConversionService;
 import org.springframework.core.convert.support.DefaultConversionService;
 import org.springframework.core.convert.support.GenericConversionService;
 import org.springframework.core.type.ClassMetadata;
-import org.springframework.data.convert.EntityInstantiator;
-import org.springframework.data.convert.EntityInstantiators;
 import org.springframework.data.domain.Page;
 import org.springframework.data.gemfire.GemfireTemplate;
 import org.springframework.data.gemfire.repository.sample.Account;
@@ -74,6 +72,8 @@ import org.springframework.data.gemfire.test.support.MapBuilder;
 import org.springframework.data.mapping.MappingException;
 import org.springframework.data.mapping.PersistentEntity;
 import org.springframework.data.mapping.PersistentProperty;
+import org.springframework.data.mapping.model.EntityInstantiator;
+import org.springframework.data.mapping.model.EntityInstantiators;
 import org.springframework.data.mapping.model.ParameterValueProvider;
 
 /**