diff --git a/src/main/java/org/springframework/data/keyvalue/core/mapping/AnnotationBasedKeySpaceResolver.java b/src/main/java/org/springframework/data/keyvalue/core/mapping/AnnotationBasedKeySpaceResolver.java index d4d9c12..f0fd7f9 100644 --- a/src/main/java/org/springframework/data/keyvalue/core/mapping/AnnotationBasedKeySpaceResolver.java +++ b/src/main/java/org/springframework/data/keyvalue/core/mapping/AnnotationBasedKeySpaceResolver.java @@ -31,7 +31,7 @@ import org.springframework.util.ClassUtils; * @author Oliver Gierke * @author Mark Paluch */ -enum AnnotationBasedKeySpaceResolver implements KeySpaceResolver { +public enum AnnotationBasedKeySpaceResolver implements KeySpaceResolver { INSTANCE; diff --git a/src/main/java/org/springframework/data/keyvalue/core/mapping/PrefixKeyspaceResolver.java b/src/main/java/org/springframework/data/keyvalue/core/mapping/PrefixKeyspaceResolver.java new file mode 100644 index 0000000..c784e5b --- /dev/null +++ b/src/main/java/org/springframework/data/keyvalue/core/mapping/PrefixKeyspaceResolver.java @@ -0,0 +1,46 @@ +/* + * Copyright 2022 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.springframework.data.keyvalue.core.mapping; + +import org.springframework.util.Assert; + +/** + * {@link KeySpaceResolver} prefixing the {@literal keyspace} with a static prefix after determining the keyspace from a + * delegate {@link KeySpaceResolver}. + * + * @author Mark Paluch + * @since 3.0 + */ +public class PrefixKeyspaceResolver implements KeySpaceResolver { + + private final String prefix; + private final KeySpaceResolver delegate; + + public PrefixKeyspaceResolver(String prefix, KeySpaceResolver delegate) { + + Assert.notNull(prefix, "Prefix must not be null"); + Assert.notNull(delegate, "Delegate KeySpaceResolver must not be null"); + + this.prefix = prefix; + this.delegate = delegate; + } + + @Override + public String resolveKeySpace(Class type) { + return prefix + delegate.resolveKeySpace(type); + } + +} diff --git a/src/main/java/org/springframework/data/keyvalue/core/mapping/context/KeyValueMappingContext.java b/src/main/java/org/springframework/data/keyvalue/core/mapping/context/KeyValueMappingContext.java index ae97e55..a5b4632 100644 --- a/src/main/java/org/springframework/data/keyvalue/core/mapping/context/KeyValueMappingContext.java +++ b/src/main/java/org/springframework/data/keyvalue/core/mapping/context/KeyValueMappingContext.java @@ -54,10 +54,19 @@ public class KeyValueMappingContext, P this.fallbackKeySpaceResolver = fallbackKeySpaceResolver; } + /** + * @return the current fallback KeySpaceResolver. Can be {@literal null}. + * @since 3.0 + */ + @Nullable + public KeySpaceResolver getFallbackKeySpaceResolver() { + return fallbackKeySpaceResolver; + } + @Override @SuppressWarnings("unchecked") protected E createPersistentEntity(TypeInformation typeInformation) { - return (E) new BasicKeyValuePersistentEntity(typeInformation, fallbackKeySpaceResolver); + return (E) new BasicKeyValuePersistentEntity(typeInformation, getFallbackKeySpaceResolver()); } @Override diff --git a/src/test/java/org/springframework/data/keyvalue/core/mapping/PrefixKeyspaceResolverUnitTests.java b/src/test/java/org/springframework/data/keyvalue/core/mapping/PrefixKeyspaceResolverUnitTests.java new file mode 100644 index 0000000..36ce01b --- /dev/null +++ b/src/test/java/org/springframework/data/keyvalue/core/mapping/PrefixKeyspaceResolverUnitTests.java @@ -0,0 +1,36 @@ +/* + * Copyright 2022 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.springframework.data.keyvalue.core.mapping; + +import static org.assertj.core.api.Assertions.*; + +import org.junit.jupiter.api.Test; + +/** + * Unit tests for {@link PrefixKeyspaceResolver}. + * + * @author Mark Paluch + */ +class PrefixKeyspaceResolverUnitTests { + + @Test // gh-461 + void shouldApplyPrefix() { + + var resolver = new PrefixKeyspaceResolver("foo", Class::getSimpleName); + + assertThat(resolver.resolveKeySpace(Object.class)).isEqualTo("fooObject"); + } +}