Merge branch 'main' of https://github.com/spring-projects/spring-data-commons into remote-unused-import

Signed-off-by: Tran Ngoc Nhan <ngocnhan.tran1996@gmail.com>

# Conflicts:
#	src/main/java/org/springframework/data/util/TypeContributor.java

Author: ngocnhan-tran1996

.github/workflows/codeql.yml

@@ -0,0 +1,21 @@
+# GitHub Actions for CodeQL Scanning
+
+name: "CodeQL Advanced"
+
+on:
+  push:
+  pull_request:
+  workflow_dispatch:
+  schedule:
+    # https://docs.github.com/en/actions/writing-workflows/choosing-when-your-workflow-runs/events-that-trigger-workflows#schedule
+    - cron: '0 5 * * *'
+
+permissions: read-all
+
+jobs:
+  codeql-analysis-call:
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+    uses: spring-io/github-actions/.github/workflows/codeql-analysis.yml@1

.github/workflows/project.yml

@@ -10,6 +10,11 @@ on:
   pull_request_target:
     types: [opened, edited, reopened]
 
+permissions:
+  contents: read
+  issues: write
+  pull-requests: write
+
 jobs:
   Inbox:
     runs-on: ubuntu-latest

Jenkinsfile

@@ -9,7 +9,7 @@ pipeline {
 
 	triggers {
 		pollSCM 'H/10 * * * *'
-		upstream(upstreamProjects: "spring-data-build/4.0.x", threshold: hudson.model.Result.SUCCESS)
+		upstream(upstreamProjects: "spring-data-build/main", threshold: hudson.model.Result.SUCCESS)
 	}
 
 	options {

ci/pipeline.properties

@@ -1,6 +1,6 @@
 # Java versions
-java.main.tag=24.0.1_9-jdk-noble
-java.next.tag=24.0.1_9-jdk-noble
+java.main.tag=25-jdk-noble
+java.next.tag=25-jdk-noble
 
 # Docker container images - standard
 docker.java.main.image=library/eclipse-temurin:${java.main.tag}
@@ -14,6 +14,7 @@ docker.mongodb.8.0.version=8.0.9
 # Supported versions of Redis
 docker.redis.6.version=6.2.13
 docker.redis.7.version=7.2.4
+docker.valkey.8.version=8.1.1
 
 # Docker environment settings
 docker.java.inside.basic=-v $HOME:/tmp/jenkins-home

pom.xml

@@ -31,7 +31,7 @@
 	<properties>
 
 		<scala>2.11.7</scala>
-		<xmlbeam>1.4.25</xmlbeam>
+		<xmlbeam>1.4.26</xmlbeam>
 		<java-module-name>spring.data.commons</java-module-name>
 		<kotlin.api.target>1.8</kotlin.api.target>
 	</properties>
@@ -70,6 +70,11 @@
 			<artifactId>jackson-databind</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>tools.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<optional>true</optional>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-web</artifactId>
@@ -319,6 +324,13 @@
 			<scope>test</scope>
 		</dependency>
 
+		<dependency>
+			<groupId>org.jmolecules</groupId>
+			<artifactId>jmolecules-ddd</artifactId>
+			<version>${jmolecules}</version>
+			<optional>true</optional>
+		</dependency>
+
 		<dependency>
 			<groupId>org.jmolecules.integrations</groupId>
 			<artifactId>jmolecules-spring</artifactId>

src/main/antora/modules/ROOT/nav.adoc

@@ -21,6 +21,7 @@
 * xref:custom-conversions.adoc[]
 * xref:entity-callbacks.adoc[]
 * xref:is-new-state-detection.adoc[]
+* xref:aot.adoc[]
 * xref:kotlin.adoc[]
 ** xref:kotlin/requirements.adoc[]
 ** xref:kotlin/null-safety.adoc[]

src/main/antora/modules/ROOT/pages/aot.adoc

@@ -0,0 +1,75 @@
+= Ahead of Time Optimizations
+
+This chapter covers Spring Data's Ahead of Time (AOT) optimizations that build upon {spring-framework-docs}/core/aot.html[Spring's Ahead of Time Optimizations].
+
+[[aot.bestpractices]]
+== Best Practices
+
+=== Annotate your Domain Types
+
+During application startup, Spring scans the classpath for domain classes for early processing of entities.
+By annotating your domain types with Spring Data Store specific `@Table`, `@Document` or `@Entity` annotations you can aid initial entity scanning and ensure that those types are registered with `ManagedTypes` for Runtime Hints.
+Classpath scanning is not possible in native image arrangements and so Spring has to use `ManagedTypes` for the initial entity set.
+
+[[aot.code-gen]]
+== Ahead of Time Code Generation
+
+Ahead of time code generation is not limited to usage with GraalVM Native Image but also offers benefits when working with regular deployments and can help optimize startup performance on the jvm.
+
+If Ahead of Time compilation is enabled Spring Data can (depending on the actual Module in use) contribute several components during the AOT phase of your build.
+
+* Bytecode for generated Type/Property Accessors
+* Sourcecode for the defined Repository Interfaces
+* Repository Metadata in JSON format
+
+Each of the above is enabled by default.
+However, there users may fine tune the configuration with following options.
+
+[options = "autowidth",cols="1,1"]
+|===
+|`spring.aot.data.accessors.enabled`
+|Boolean flag to control contribution of Bytecode for generated Type/Property Accessors
+
+|`spring.aot.data.accessors.include`
+|Comma separated list of FQCN for which to contribute Bytecode for generated Type/Property Accessors.
+Ant-style include patterns matching package names (e.g. `com.acme.**`) or type names inclusion.
+Inclusion pattern matches are evaluated before exclusions for broad exclusion and selective inclusion.
+
+|`spring.aot.data.accessors.exclude`
+|Comma separated list of FQCN for which to skip contribution of Bytecode for generated Type/Property Accessors.
+Ant-style exclude patterns matching package names (e.g. `com.acme.**`) or type names exclusion.
+Exclusion pattern matches are evaluated after inclusions for broad exclusion and selective inclusion.
+
+|`spring.aot.repositories.enabled`
+|Boolean flag to control contribution of Source Code for Repository Interfaces
+
+|`spring.aot.[module-name].repositories.enabled`
+|Boolean flag to control contribution of Source Code for Repository Interfaces for a certain module (eg. `jdbc`, `jpa`, `mongodb`, `cassandra`)
+|===
+
+[[aot.repositories]]
+== Ahead of Time Repositories
+
+AOT Repositories are an extension to AOT processing by pre-generating eligible query method implementations.
+Query methods are opaque to developers regarding their underlying queries being executed in a query method call.
+AOT repositories contribute query method implementations based on derived, annotated, and named queries that are known at build-time.
+This optimization moves query method processing from runtime to build-time, which can lead to a significant performance improvement as query methods do not need to be analyzed reflectively upon each application start.
+
+The resulting AOT repository fragment follows the naming scheme of `<Repository FQCN>Impl_AotRepository` and is placed in the same package as the repository interface.
+
+[[aot.hints]]
+== Native Image Runtime Hints
+
+Running an application as a native image requires additional information compared to a regular JVM runtime.
+Spring Data contributes {spring-framework-docs}/core/aot.html#aot.hints[Runtime Hints] during AOT processing for native image usage.
+These are in particular hints for:
+
+* Auditing
+* `ManagedTypes` to capture the outcome of class-path scans
+* Repositories
+** Reflection hints for entities, return types, and Spring Data annotations
+** Repository fragments
+** Querydsl `Q` classes
+** Kotlin Coroutine support
+* Web support (Jackson Hints for `PagedModel`)
+

src/main/antora/modules/ROOT/pages/is-new-state-detection.adoc

@@ -23,8 +23,4 @@ See the {spring-data-commons-javadoc-base}/org/springframework/data/domain/Persi
 _Note: Properties of `Persistable` will get detected and persisted if you use `AccessType.PROPERTY`.
 To avoid that, use `@Transient`._
 
-|Providing a custom `EntityInformation` implementation
-|You can customize the `EntityInformation` abstraction used in the repository base implementation by creating a subclass of the module specific repository factory and overriding the `getEntityInformation(…)` method.
-You then have to register the custom implementation of module specific repository factory as a Spring bean.
-Note that this should rarely be necessary.
 |===

src/main/antora/modules/ROOT/pages/repositories/core-extensions-web.adoc

@@ -290,9 +290,9 @@ By default, the assembler points to the controller method it was invoked in, but
 == Spring Data Jackson Modules
 
 The core module, and some of the store specific ones, ship with a set of Jackson Modules for types, like `org.springframework.data.geo.Distance` and `org.springframework.data.geo.Point`, used by the Spring Data domain. +
-Those Modules are imported once xref:repositories/core-extensions.adoc#core.web[web support] is enabled and `com.fasterxml.jackson.databind.ObjectMapper` is available.
+Those modules are imported once xref:repositories/core-extensions.adoc#core.web[web support] is enabled and `tools.jackson.databind.ObjectMapper` is available.
 
-During initialization `SpringDataJacksonModules`, like the `SpringDataJacksonConfiguration`, get picked up by the infrastructure, so that the declared ``com.fasterxml.jackson.databind.Module``s are made available to the Jackson `ObjectMapper`.
+During initialization `SpringDataJackson3Modules`, like the `SpringDataJackson3Configuration`, get picked up by the infrastructure, so that the declared ``tools.jackson.databind.JacksonModule``s are made available to the Jackson `ObjectMapper`.
 
 Data binding mixins for the following domain types are registered by the common infrastructure.
 
@@ -306,10 +306,15 @@ org.springframework.data.geo.Polygon
 
 [NOTE]
 ====
-The individual module may provide additional `SpringDataJacksonModules`. +
+The individual module may provide additional `SpringDataJackson3Modules`. +
 Please refer to the store specific section for more details.
 ====
 
+[NOTE]
+====
+Jackson 2 support is deprecated and will be removed in a future release.
+====
+
 [[core.web.binding]]
 == Web Databinding Support
 
@@ -341,7 +346,7 @@ Nested projections are supported as described in xref:repositories/projections.a
 If the method returns a complex, non-interface type, a Jackson `ObjectMapper` is used to map the final value.
 
 For Spring MVC, the necessary converters are registered automatically as soon as `@EnableSpringDataWebSupport` is active and the required dependencies are available on the classpath.
-For usage with `RestTemplate`, register a `ProjectingJackson2HttpMessageConverter` (JSON) or `XmlBeamHttpMessageConverter` manually.
+For usage with `RestTemplate`, register a `ProjectingJacksonHttpMessageConverter` (JSON) or `XmlBeamHttpMessageConverter` manually.
 
 For more information, see the https://github.com/spring-projects/spring-data-examples/tree/main/web/projection[web projection example] in the canonical https://github.com/spring-projects/spring-data-examples[Spring Data Examples repository].
 

src/main/antora/modules/ROOT/pages/repositories/create-instances.adoc

@@ -27,6 +27,39 @@ class ApplicationConfiguration {
 
 NOTE: The preceding example uses the JPA-specific annotation, which you would change according to the store module you actually use. The same applies to the definition of the `EntityManagerFactory` bean. See the sections covering the store-specific configuration.
 
+[[repositories.create-instances.java-config.placeholders-and-patterns]]
+=== Property Placeholders and Ant-style Patterns
+
+The `basePackages` and `value` attributes in `@Enable{store}Repositories` support `${…}` property placeholders which are resolved against the `Environment` as well as Ant-style package patterns such as `"org.example.+++**+++"`.
+
+The following example specifies the `app.scan.packages` property placeholder for the implicit `value` attribute in `@Enable{store}Repositories`.
+
+[tabs]
+======
+Java::
++
+[source,java,indent=0,subs="verbatim,quotes,attributes,specialchars"]
+----
+@Configuration
+@Enable{store}Repositories("${app.scan.packages}")    // <1>
+public class ApplicationConfiguration {
+  // …
+}
+----
+<1> `app.scan.packages` property placeholder to be resolved against the `Environment`
+
+Kotlin::
++
+[source,kotlin,indent=0,subs="verbatim,quotes,attributes,specialchars"]
+----
+@Enable{store}Repositories(["\${app.scan.packages}"]) // <1>
+class ApplicationConfiguration {
+  // …
+}
+----
+<1> `app.scan.packages` property placeholder to be resolved against the `Environment`
+======
+
 ifeval::[{include-xml-namespaces} != false]
 [[repositories.create-instances.spring]]
 [[repositories.create-instances.xml]]