From cafa3c7a86dbc702ba841402d87e99488a31432f Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@vmware.com>
Date: Wed, 7 Dec 2022 11:10:36 +0100
Subject: [PATCH] Align with KeyValue KeySpaceResolver changes.

We now use the KeyValue KeySpaceResolver to primarily detect the keyspace to be used instead of a fallback.

See #2457
See #2452
---
 .../core/mapping/BasicRedisPersistentEntity.java     |  6 +++---
 .../data/redis/core/mapping/RedisMappingContext.java |  2 +-
 .../ConfigAwareKeySpaceResolverUnitTests.java        | 12 ++++++------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/springframework/data/redis/core/mapping/BasicRedisPersistentEntity.java b/src/main/java/org/springframework/data/redis/core/mapping/BasicRedisPersistentEntity.java
index 8896857cc..69c8e2242 100644
--- a/src/main/java/org/springframework/data/redis/core/mapping/BasicRedisPersistentEntity.java
+++ b/src/main/java/org/springframework/data/redis/core/mapping/BasicRedisPersistentEntity.java
@@ -41,12 +41,12 @@ public class BasicRedisPersistentEntity<T> extends BasicKeyValuePersistentEntity
 	 * Creates new {@link BasicRedisPersistentEntity}.
 	 *
 	 * @param information must not be {@literal null}.
-	 * @param fallbackKeySpaceResolver can be {@literal null}.
+	 * @param keySpaceResolver can be {@literal null}.
 	 * @param timeToLiveAccessor can be {@literal null}.
 	 */
-	public BasicRedisPersistentEntity(TypeInformation<T> information, @Nullable KeySpaceResolver fallbackKeySpaceResolver,
+	public BasicRedisPersistentEntity(TypeInformation<T> information, @Nullable KeySpaceResolver keySpaceResolver,
 			TimeToLiveAccessor timeToLiveAccessor) {
-		super(information, fallbackKeySpaceResolver);
+		super(information, keySpaceResolver);
 
 		Assert.notNull(timeToLiveAccessor, "TimeToLiveAccessor must not be null");
 		this.timeToLiveAccessor = timeToLiveAccessor;
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 e6c69be6d..dec6fba71 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
@@ -133,7 +133,7 @@ public class RedisMappingContext extends KeyValueMappingContext<RedisPersistentE
 				}
 			}
 
-			return ClassNameKeySpaceResolver.INSTANCE.resolveKeySpace(type);
+			return null;
 		}
 	}
 
diff --git a/src/test/java/org/springframework/data/redis/core/mapping/ConfigAwareKeySpaceResolverUnitTests.java b/src/test/java/org/springframework/data/redis/core/mapping/ConfigAwareKeySpaceResolverUnitTests.java
index 07a748fcc..0f2b19b35 100644
--- a/src/test/java/org/springframework/data/redis/core/mapping/ConfigAwareKeySpaceResolverUnitTests.java
+++ b/src/test/java/org/springframework/data/redis/core/mapping/ConfigAwareKeySpaceResolverUnitTests.java
@@ -19,17 +19,18 @@ import static org.assertj.core.api.Assertions.*;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-
 import org.springframework.data.redis.core.convert.KeyspaceConfiguration;
 import org.springframework.data.redis.core.convert.KeyspaceConfiguration.KeyspaceSettings;
 import org.springframework.data.redis.core.mapping.RedisMappingContext.ConfigAwareKeySpaceResolver;
 
 /**
+ * Unit tests for {@link ConfigAwareKeySpaceResolver}.
+ *
  * @author Christoph Strobl
+ * @author Mark Paluch
  */
 class ConfigAwareKeySpaceResolverUnitTests {
 
-	static final String CUSTOM_KEYSPACE = "car'a'carn";
 	private KeyspaceConfiguration config = new KeyspaceConfiguration();
 	private ConfigAwareKeySpaceResolver resolver;
 
@@ -43,10 +44,9 @@ class ConfigAwareKeySpaceResolverUnitTests {
 		assertThatIllegalArgumentException().isThrownBy(() -> resolver.resolveKeySpace(null));
 	}
 
-	@Test // DATAREDIS-425
-	void resolveShouldUseClassNameAsDefaultKeyspace() {
-		assertThat(resolver.resolveKeySpace(TypeWithoutAnySettings.class))
-				.isEqualTo(TypeWithoutAnySettings.class.getName());
+	@Test // DATAREDIS-425, GH-2457
+	void resolveShouldReturnNullAsDefaultKeyspace() {
+		assertThat(resolver.resolveKeySpace(TypeWithoutAnySettings.class)).isNull();
 	}
 
 	@Test // DATAREDIS-425