From befafa8b0f9cb0d525f6615ca8b1eae1d5f1763b Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@vmware.com>
Date: Wed, 7 Dec 2022 11:08:44 +0100
Subject: [PATCH] Correctly consider `KeySpaceResolver` from
 `KeyValueMappingContext`.

Closes #2457
---
 .../redis/core/mapping/RedisMappingContext.java   | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/src/main/java/org/springframework/data/redis/core/mapping/RedisMappingContext.java b/src/main/java/org/springframework/data/redis/core/mapping/RedisMappingContext.java
index 3d526defa..e6c69be6d 100644
--- a/src/main/java/org/springframework/data/redis/core/mapping/RedisMappingContext.java
+++ b/src/main/java/org/springframework/data/redis/core/mapping/RedisMappingContext.java
@@ -63,8 +63,6 @@ public class RedisMappingContext extends KeyValueMappingContext<RedisPersistentE
 	private final MappingConfiguration mappingConfiguration;
 	private final TimeToLiveAccessor timeToLiveAccessor;
 
-	private @Nullable KeySpaceResolver fallbackKeySpaceResolver;
-
 	/**
 	 * Creates new {@link RedisMappingContext} with empty {@link MappingConfiguration}.
 	 */
@@ -82,24 +80,15 @@ public class RedisMappingContext extends KeyValueMappingContext<RedisPersistentE
 		this.mappingConfiguration = mappingConfiguration != null ? mappingConfiguration
 				: new MappingConfiguration(new IndexConfiguration(), new KeyspaceConfiguration());
 
-		setFallbackKeySpaceResolver(new ConfigAwareKeySpaceResolver(this.mappingConfiguration.getKeyspaceConfiguration()));
+		setKeySpaceResolver(new ConfigAwareKeySpaceResolver(this.mappingConfiguration.getKeyspaceConfiguration()));
 		this.timeToLiveAccessor = new ConfigAwareTimeToLiveAccessor(this.mappingConfiguration.getKeyspaceConfiguration(),
 				this);
 		this.setSimpleTypeHolder(SIMPLE_TYPE_HOLDER);
 	}
 
-	/**
-	 * Configures the {@link KeySpaceResolver} to be used if not explicit key space is annotated to the domain type.
-	 *
-	 * @param fallbackKeySpaceResolver can be {@literal null}.
-	 */
-	public void setFallbackKeySpaceResolver(@Nullable KeySpaceResolver fallbackKeySpaceResolver) {
-		this.fallbackKeySpaceResolver = fallbackKeySpaceResolver;
-	}
-
 	@Override
 	protected <T> RedisPersistentEntity<T> createPersistentEntity(TypeInformation<T> typeInformation) {
-		return new BasicRedisPersistentEntity<>(typeInformation, fallbackKeySpaceResolver, timeToLiveAccessor);
+		return new BasicRedisPersistentEntity<>(typeInformation, getKeySpaceResolver(), timeToLiveAccessor);
 	}
 
 	@Override