Skip to content

Commit befafa8

Browse files
committed
Correctly consider KeySpaceResolver from KeyValueMappingContext.
Closes #2457
1 parent d0a5b4f commit befafa8

File tree

1 file changed

+2
-13
lines changed

1 file changed

+2
-13
lines changed

src/main/java/org/springframework/data/redis/core/mapping/RedisMappingContext.java

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,6 @@ public class RedisMappingContext extends KeyValueMappingContext<RedisPersistentE
6363
private final MappingConfiguration mappingConfiguration;
6464
private final TimeToLiveAccessor timeToLiveAccessor;
6565

66-
private @Nullable KeySpaceResolver fallbackKeySpaceResolver;
67-
6866
/**
6967
* Creates new {@link RedisMappingContext} with empty {@link MappingConfiguration}.
7068
*/
@@ -82,24 +80,15 @@ public RedisMappingContext(@Nullable MappingConfiguration mappingConfiguration)
8280
this.mappingConfiguration = mappingConfiguration != null ? mappingConfiguration
8381
: new MappingConfiguration(new IndexConfiguration(), new KeyspaceConfiguration());
8482

85-
setFallbackKeySpaceResolver(new ConfigAwareKeySpaceResolver(this.mappingConfiguration.getKeyspaceConfiguration()));
83+
setKeySpaceResolver(new ConfigAwareKeySpaceResolver(this.mappingConfiguration.getKeyspaceConfiguration()));
8684
this.timeToLiveAccessor = new ConfigAwareTimeToLiveAccessor(this.mappingConfiguration.getKeyspaceConfiguration(),
8785
this);
8886
this.setSimpleTypeHolder(SIMPLE_TYPE_HOLDER);
8987
}
9088

91-
/**
92-
* Configures the {@link KeySpaceResolver} to be used if not explicit key space is annotated to the domain type.
93-
*
94-
* @param fallbackKeySpaceResolver can be {@literal null}.
95-
*/
96-
public void setFallbackKeySpaceResolver(@Nullable KeySpaceResolver fallbackKeySpaceResolver) {
97-
this.fallbackKeySpaceResolver = fallbackKeySpaceResolver;
98-
}
99-
10089
@Override
10190
protected <T> RedisPersistentEntity<T> createPersistentEntity(TypeInformation<T> typeInformation) {
102-
return new BasicRedisPersistentEntity<>(typeInformation, fallbackKeySpaceResolver, timeToLiveAccessor);
91+
return new BasicRedisPersistentEntity<>(typeInformation, getKeySpaceResolver(), timeToLiveAccessor);
10392
}
10493

10594
@Override

0 commit comments

Comments
 (0)