.mvn/wrapper/maven-wrapper.properties

@@ -1,2 +1,2 @@
-#Thu Nov 07 09:47:19 CET 2024
-distributionUrl=https\://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
+#Thu Jul 17 13:59:50 CEST 2025
+distributionUrl=https\://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip

pom.xml

@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-keyvalue</artifactId>
-	<version>4.0.0-M3</version>
+	<version>4.0.0-SNAPSHOT</version>
 
 	<name>Spring Data KeyValue</name>
 
 	<parent>
 		<groupId>org.springframework.data.build</groupId>
 		<artifactId>spring-data-parent</artifactId>
-		<version>4.0.0-M3</version>
+		<version>4.0.0-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 
 	<properties>
-		<springdata.commons>4.0.0-M3</springdata.commons>
+		<springdata.commons>4.0.0-SNAPSHOT</springdata.commons>
 		<java-module-name>spring.data.keyvalue</java-module-name>
 	</properties>
 
@@ -107,8 +107,20 @@
 	</profiles>
 
 	<repositories>
-
-
+		<repository>
+			<id>spring-snapshot</id>
+			<url>https://repo.spring.io/snapshot</url>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+		</repository>
+		<repository>
+			<id>spring-milestone</id>
+			<url>https://repo.spring.io/milestone</url>
+		</repository>
 	</repositories>
 
 </project>

src/main/antora/resources/antora-resources/antora.yml

@@ -3,19 +3,20 @@ prerelease: ${antora-component.prerelease}
 
 asciidoc:
   attributes:
-    copyright-year: ${current.year}
-    version: ${project.version}
-    springversionshort: ${spring.short}
-    springversion: ${spring}
     attribute-missing: 'warn'
-    commons: ${springdata.commons.docs}
+    chomp: 'all'
+    version: '${project.version}'
+    copyright-year: '${current.year}'
+    springversionshort: '${spring.short}'
+    springversion: '${spring}'
+    commons: '${springdata.commons.docs}'
     include-xml-namespaces: false
-    spring-data-commons-docs-url: https://docs.spring.io/spring-data/commons/reference
-    spring-data-commons-javadoc-base: https://docs.spring.io/spring-data/commons/docs/${springdata.commons}/api/
-    springdocsurl: https://docs.spring.io/spring-framework/reference/{springversionshort}
-    springjavadocurl: https://docs.spring.io/spring-framework/docs/${spring}/javadoc-api
+    spring-data-commons-docs-url: '${documentation.baseurl}/spring-data/commons/reference/${springdata.commons.short}'
+    spring-data-commons-javadoc-base: '{spring-data-commons-docs-url}/api/java'
+    springdocsurl: '${documentation.baseurl}/spring-framework/reference/{springversionshort}'
     spring-framework-docs: '{springdocsurl}'
+    springjavadocurl: '${documentation.spring-javadoc-url}'
     spring-framework-javadoc: '{springjavadocurl}'
-    springhateoasversion: ${spring-hateoas}
-    releasetrainversion: ${releasetrain}
+    springhateoasversion: '${spring-hateoas}'
+    releasetrainversion: '${releasetrain}'
     store: KeyValue

src/main/java/org/springframework/data/keyvalue/core/mapping/KeyValuePersistentEntity.java

@@ -16,10 +16,15 @@
 package org.springframework.data.keyvalue.core.mapping;
 
 import org.jspecify.annotations.Nullable;
+
+import org.springframework.data.mapping.PersistentEntity;
 import org.springframework.data.mapping.model.MutablePersistentEntity;
 
 /**
+ * KeyValue-specific extension of {@link PersistentEntity} declaring a {@literal keySpace}.
+ *
  * @author Christoph Strobl
+ * @author Mark Paluch
  * @param <T>
  */
 public interface KeyValuePersistentEntity<T, P extends KeyValuePersistentProperty<P>>
@@ -32,4 +37,24 @@ public interface KeyValuePersistentEntity<T, P extends KeyValuePersistentPropert
 	 */
 	@Nullable
 	String getKeySpace();
+
+	/**
+	 * Returns the required {@literal keySpace} or throws an {@link IllegalStateException} if the {@literal keySpace} is
+	 * not defined.
+	 *
+	 * @return the {@literal keySpace} property of this {@link PersistentEntity}.
+	 * @throws IllegalStateException if the {@literal keySpace} is not defined.
+	 * @since 4.0
+	 */
+	default String getRequiredKeySpace() {
+
+		String keySpace = getKeySpace();
+
+		if (keySpace != null) {
+			return keySpace;
+		}
+
+		throw new IllegalStateException(String.format("Required keySpace not defined for %s", getType()));
+	}
+
 }

src/main/resources/notice.txt

@@ -1,4 +1,4 @@
-Spring Data KeyValue 4.0 M3 (2025.1.0)
+Spring Data KeyValue 4.0 M6 (2025.1.0)
 Copyright (c) 2015-2019 Pivotal Software, Inc.
 
 This product is licensed to you under the Apache License, Version 2.0
@@ -11,3 +11,6 @@ these subcomponents is subject to the terms and conditions of the
 subcomponent's license, as noted in the license.txt file.
 
 
+
+
+

src/test/java/org/springframework/data/keyvalue/core/mapping/BasicKeyValuePersistentEntityUnitTests.java

@@ -35,12 +35,12 @@
  */
 class BasicKeyValuePersistentEntityUnitTests {
 
-	private KeyValueMappingContext<? extends KeyValuePersistentEntity<?, ?>, ? extends KeyValuePersistentProperty<?>> mappingContext = new KeyValueMappingContext<>();
+	KeyValueMappingContext<? extends KeyValuePersistentEntity<?, ?>, ? extends KeyValuePersistentProperty<?>> mappingContext = new KeyValueMappingContext<>();
 
 	@Test // DATAKV-268
 	void shouldDeriveKeyspaceFromClassName() {
 
-		assertThat(mappingContext.getPersistentEntity(KeyspaceEntity.class).getKeySpace())
+		assertThat(mappingContext.getPersistentEntity(KeyspaceEntity.class).getRequiredKeySpace())
 				.isEqualTo(KeyspaceEntity.class.getName());
 	}
 
@@ -54,7 +54,7 @@ void shouldEvaluateKeyspaceExpression() {
 		persistentEntity.setEvaluationContextProvider(
 				new ExtensionAwareEvaluationContextProvider(Collections.singletonList(new SampleExtension())));
 
-		assertThat(persistentEntity.getKeySpace()).isEqualTo("some_foo");
+		assertThat(persistentEntity.getRequiredKeySpace()).isEqualTo("some_foo");
 	}
 
 	@Test // DATAKV-268
@@ -64,7 +64,7 @@ void shouldEvaluateEntityWithoutKeyspace() {
 		persistentEntity.setEvaluationContextProvider(
 				new ExtensionAwareEvaluationContextProvider(Collections.singletonList(new SampleExtension())));
 
-		assertThat(persistentEntity.getKeySpace()).isEqualTo(NoKeyspaceEntity.class.getName());
+		assertThat(persistentEntity.getRequiredKeySpace()).isEqualTo(NoKeyspaceEntity.class.getName());
 	}
 
 	@Test // GH-461