- * When applied at the class level, all test methods within that class will be enabled if Elasticsearch is available. - *
- * If a test method is disabled via this annotation, that does not prevent the test class from being instantiated.
- * Rather, it prevents the execution of the test method and method-level lifecycle callbacks such as {@code @BeforeEach}
- * methods, {@code @AfterEach} methods, and corresponding extension APIs.
- *
- * @author Prakhar Gupta
- * @author Mark Paluch
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.TYPE, ElementType.METHOD})
-@ExtendWith(ElasticsearchAvailableCondition.class)
-public @interface EnabledOnElasticsearch {
-
- /**
- * URL pointing at the Elasticsearch instance to check.
- */
- String url() default "http://localhost:9200/";
-
-}
diff --git a/geode/README.md b/geode/README.md
deleted file mode 100755
index 51469670f..000000000
--- a/geode/README.md
+++ /dev/null
@@ -1,22 +0,0 @@
-Spring Data For GemFire and Apache Geode Examples
-=========================================================
-
-This project provides a number of examples to get you started using Spring Data for Apache Geode or Pivotal GemFire. These examples are designed to work with [Spring Data for Pivotal GemFire](http://projects.spring.io/spring-data-gemfire) 2.0.9-RELEASE or higher and are organized into the following sub projects:
-
-It is important to note that all examples will follow the prescribed Maven directory structure.
-
-Examples:
-
-* **events** - In this example the test will make use of event handlers and async event queue to handle events.
-* **expiration-eviction** - In these examples the server is configured to delete entries after a certain idle period or after a Time-To-Live period (expiration0 or remove data from memory when certain thresholds are reached (eviction).
-* **function-invocation** - In this example the server will have 3 functions registered. The client will invoke each of the functions.
-* **queries** - In this example a client will query the data in various ways using OQl, continuous queries, and Apache Lucene indexes.
-* **security** - In this example the servers and clients are set up with security (username/password) authentication using Geode Security and Apache Shiro.
-* **storage** - In this example the server is configured to store data off of hte JVM heap using the `@EnableOffHeap` annotation and to compress region data using SnappyCompressor`.
-* **transactions** - In this example the client will perform operations within a transaction. First, it will do a successful transaction where entries are saved to the server, and then a failed transaction where all changes are reverted.
-* **wan** - In these example two servers are deployed. One server populates itself with data, and the other server gets populated with that data via WAN replication.
-
-# Running The Examples
-
-Each example has at least one test file located in the test directory. The examples are driven by the tests, so simply run the test either through your IDE or via the commandline.
-The logging level of the examples is set to "error", so there will be no output. To see output, simply find the `logback.xml` file located in src/test/resources and set the loglevel to "info".
\ No newline at end of file
diff --git a/geode/events/README.md b/geode/events/README.md
deleted file mode 100755
index 129331623..000000000
--- a/geode/events/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Events Example
-
-In this example you will how to handle events using Async event queue, Cache Listeners, Cache Loaders, and Cache Writers.
-
-NOTE: Inorder to see output, you must change the loglevel from "error" to "info" in the `logback.xml` file located under src/test/resources.
\ No newline at end of file
diff --git a/geode/events/pom.xml b/geode/events/pom.xml
deleted file mode 100755
index b8cd23977..000000000
--- a/geode/events/pom.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
* EntityManager em = ... // Obtain EntityManager
diff --git a/jpa/example/src/main/java/example/springdata/jpa/custom/UserRepositoryImplJdbc.java b/jpa/example/src/main/java/example/springdata/jpa/custom/UserRepositoryImplJdbc.java
index 911979d14..1e156e2d6 100644
--- a/jpa/example/src/main/java/example/springdata/jpa/custom/UserRepositoryImplJdbc.java
+++ b/jpa/example/src/main/java/example/springdata/jpa/custom/UserRepositoryImplJdbc.java
@@ -28,7 +28,7 @@
import org.springframework.stereotype.Component;
/**
- * Class with the implementation of the custom repository code. Uses JDBC in this case. For basic programatic setup see
+ * Class with the implementation of the custom repository code. Uses JDBC in this case. For basic programmatic setup see
* {@link UserRepositoryImpl} for examples.
*
* As you need to hand the instance a {@link javax.sql.DataSource} or
diff --git a/jpa/example/src/main/java/example/springdata/jpa/customall/ExtendedJpaRepository.java b/jpa/example/src/main/java/example/springdata/jpa/customall/ExtendedJpaRepository.java
index 5d012cee6..2648a8547 100644
--- a/jpa/example/src/main/java/example/springdata/jpa/customall/ExtendedJpaRepository.java
+++ b/jpa/example/src/main/java/example/springdata/jpa/customall/ExtendedJpaRepository.java
@@ -15,7 +15,7 @@
*/
package example.springdata.jpa.customall;
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
import org.springframework.data.jpa.repository.support.JpaEntityInformation;
import org.springframework.data.jpa.repository.support.SimpleJpaRepository;
diff --git a/jpa/example/src/main/java/example/springdata/jpa/customall/User.java b/jpa/example/src/main/java/example/springdata/jpa/customall/User.java
index bb6cef977..3ed8697fe 100644
--- a/jpa/example/src/main/java/example/springdata/jpa/customall/User.java
+++ b/jpa/example/src/main/java/example/springdata/jpa/customall/User.java
@@ -15,9 +15,9 @@
*/
package example.springdata.jpa.customall;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
/**
* Sample user class.
diff --git a/geode/transactions/src/main/java/example/springdata/geode/client/transactions/EmailAddress.java b/jpa/example/src/main/java/example/springdata/jpa/pagination/Author.java
old mode 100755
new mode 100644
similarity index 63%
rename from geode/transactions/src/main/java/example/springdata/geode/client/transactions/EmailAddress.java
rename to jpa/example/src/main/java/example/springdata/jpa/pagination/Author.java
index 6b565073d..a6d92c174
--- a/geode/transactions/src/main/java/example/springdata/geode/client/transactions/EmailAddress.java
+++ b/jpa/example/src/main/java/example/springdata/jpa/pagination/Author.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2020-2021 the original author or authors.
+ * Copyright 2023 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.
@@ -13,22 +13,23 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package example.springdata.geode.client.transactions;
+package example.springdata.jpa.pagination;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
import lombok.Data;
/**
- * Value object to represent email addresses.
- *
- * @author Udo Kohlmeyer
- * @author Patrick Johnson
+ * @author Christoph Strobl
*/
@Data
-public class EmailAddress {
-
- private String value;
+@Entity
+@Table(name = "authors")
+public class Author {
- public EmailAddress(String value) {
- this.value = value;
- }
+ @Id
+ private String id;
+ private String firstName;
+ private String lastName;
}
diff --git a/geode/queries/src/main/java/example/springdata/geode/client/queries/EmailAddress.java b/jpa/example/src/main/java/example/springdata/jpa/pagination/Book.java
old mode 100755
new mode 100644
similarity index 56%
rename from geode/queries/src/main/java/example/springdata/geode/client/queries/EmailAddress.java
rename to jpa/example/src/main/java/example/springdata/jpa/pagination/Book.java
index e7d803743..9d6906d74
--- a/geode/queries/src/main/java/example/springdata/geode/client/queries/EmailAddress.java
+++ b/jpa/example/src/main/java/example/springdata/jpa/pagination/Book.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2020-2021 the original author or authors.
+ * Copyright 2023 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.
@@ -13,25 +13,28 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package example.springdata.geode.client.queries;
+package example.springdata.jpa.pagination;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
import lombok.Data;
-import java.io.Serializable;
+import java.util.Date;
/**
- * Value object to represent email addresses.
- *
- * @author Udo Kohlmeyer
- * @author Patrick Johnson
+ * @author Christoph Strobl
*/
@Data
-public class EmailAddress implements Serializable {
-
- private String value;
+@Entity
+@Table(name = "books")
+public class Book {
- public EmailAddress(String value) {
+ @Id private String id;
+ private String title;
+ private String isbn10;
+ private Date publicationDate;
- this.value = value;
- }
+ @ManyToOne Author author;
}
diff --git a/jpa/example/src/main/java/example/springdata/jpa/pagination/BookRepository.java b/jpa/example/src/main/java/example/springdata/jpa/pagination/BookRepository.java
new file mode 100644
index 000000000..67df6d2e0
--- /dev/null
+++ b/jpa/example/src/main/java/example/springdata/jpa/pagination/BookRepository.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2023 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 example.springdata.jpa.pagination;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.ScrollPosition;
+import org.springframework.data.domain.Slice;
+import org.springframework.data.domain.Window;
+import org.springframework.data.repository.ListCrudRepository;
+
+/**
+ * @author Christoph Strobl
+ */
+public interface BookRepository extends ListCrudRepository {
+
+ /**
+ * Uses an {@literal offset} based pagination that first sorts the entries by their {@link Book#getPublicationDate()
+ * publication_date} and then limits the result by dropping the number of rows specified in the
+ * {@link Pageable#getOffset() offset} clause. To retrieve {@link Page#getTotalElements()} an additional count query
+ * is executed.
+ *
+ * @param title
+ * @param pageable
+ * @return
+ */
+ Page findByTitleContainsOrderByPublicationDate(String title, Pageable pageable);
+
+ /**
+ * Uses an {@literal offset} based slicing that first sorts the entries by their {@link Book#getPublicationDate()
+ * publication_date} and then limits the result by dropping the number of rows specified in the
+ * {@link Pageable#getOffset() offset} clause.
+ *
+ * @param title
+ * @param pageable
+ * @return
+ */
+ Slice findBooksByTitleContainsOrderByPublicationDate(String title, Pageable pageable);
+
+ /**
+ * Depending on the provided {@link ScrollPosition} either {@link org.springframework.data.domain.OffsetScrollPosition
+ * offset} or {@link org.springframework.data.domain.KeysetScrollPosition keyset} scrolling is possible. Scrolling
+ * through results requires a stable {@link org.springframework.data.domain.Sort} which is different from what
+ * {@link Pageable#getSort()} offers. The {@literal limit} is defined via the {@literal Top} keyword.
+ *
+ * @param title
+ * @param scrollPosition
+ * @return
+ */
+ Window findTop2ByTitleContainsOrderByPublicationDate(String title, ScrollPosition scrollPosition);
+}
diff --git a/geode/function-invocation/src/main/java/example/springdata/geode/client/function/server/FunctionServer.java b/jpa/example/src/main/java/example/springdata/jpa/pagination/PagingRepoConfig.java
old mode 100755
new mode 100644
similarity index 60%
rename from geode/function-invocation/src/main/java/example/springdata/geode/client/function/server/FunctionServer.java
rename to jpa/example/src/main/java/example/springdata/jpa/pagination/PagingRepoConfig.java
index 422ec296e..779303309
--- a/geode/function-invocation/src/main/java/example/springdata/geode/client/function/server/FunctionServer.java
+++ b/jpa/example/src/main/java/example/springdata/jpa/pagination/PagingRepoConfig.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2020-2021 the original author or authors.
+ * Copyright 2023 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.
@@ -13,19 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package example.springdata.geode.client.function.server;
+package example.springdata.jpa.pagination;
-import org.springframework.boot.WebApplicationType;
import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
/**
- * @author Patrick Johnson
+ * @author Christoph Strobl
*/
@SpringBootApplication
-public class FunctionServer {
-
- public static void main(String[] args) {
- new SpringApplicationBuilder(FunctionServer.class).web(WebApplicationType.NONE).build().run(args);
- }
-}
+@EnableJpaRepositories(basePackageClasses = BookRepository.class)
+class PagingRepoConfig {}
diff --git a/jpa/example/src/main/java/example/springdata/jpa/projections/Customer.java b/jpa/example/src/main/java/example/springdata/jpa/projections/Customer.java
index 63dca0000..a74bba793 100644
--- a/jpa/example/src/main/java/example/springdata/jpa/projections/Customer.java
+++ b/jpa/example/src/main/java/example/springdata/jpa/projections/Customer.java
@@ -18,9 +18,9 @@
import lombok.Data;
import lombok.RequiredArgsConstructor;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
/**
* @author Oliver Gierke
diff --git a/jpa/example/src/main/java/example/springdata/jpa/simple/SimpleConfiguration.java b/jpa/example/src/main/java/example/springdata/jpa/simple/SimpleConfiguration.java
index 5b3c378ac..f509ade1e 100644
--- a/jpa/example/src/main/java/example/springdata/jpa/simple/SimpleConfiguration.java
+++ b/jpa/example/src/main/java/example/springdata/jpa/simple/SimpleConfiguration.java
@@ -16,9 +16,11 @@
package example.springdata.jpa.simple;
import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.scheduling.annotation.EnableAsync;
/**
* @author Oliver Gierke
*/
@SpringBootApplication
+@EnableAsync
class SimpleConfiguration {}
diff --git a/jpa/example/src/main/java/example/springdata/jpa/simple/SimpleUserRepository.java b/jpa/example/src/main/java/example/springdata/jpa/simple/SimpleUserRepository.java
index 3f666faa3..9f5c77a85 100644
--- a/jpa/example/src/main/java/example/springdata/jpa/simple/SimpleUserRepository.java
+++ b/jpa/example/src/main/java/example/springdata/jpa/simple/SimpleUserRepository.java
@@ -20,26 +20,27 @@
import java.util.concurrent.CompletableFuture;
import java.util.stream.Stream;
+import org.springframework.data.domain.Limit;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Slice;
import org.springframework.data.domain.Sort;
import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.CrudRepository;
+import org.springframework.data.repository.ListCrudRepository;
import org.springframework.scheduling.annotation.Async;
/**
- * Simple repository interface for {@link User} instances. The interface is used to declare so called query methods,
- * methods to retrieve single entities or collections of them.
+ * Simple repository interface for {@link User} instances. The interface is used to declare the so-called query methods,
+ * i.e. methods to retrieve single entities or collections of them.
*
* @author Oliver Gierke
* @author Thomas Darimont
* @author Christoph Strobl
*/
-public interface SimpleUserRepository extends CrudRepository {
+public interface SimpleUserRepository extends ListCrudRepository {
/**
* Find the user with the given username. This method will be translated into a query using the
- * {@link javax.persistence.NamedQuery} annotation at the {@link User} class.
+ * {@link jakarta.persistence.NamedQuery} annotation at the {@link User} class.
*
* @param username
* @return
@@ -63,6 +64,17 @@ public interface SimpleUserRepository extends CrudRepository {
*/
List findByLastname(String lastname);
+ /**
+ * Find at most the number of users defined via maxResults with the given lastname.
+ * This method will be translated into a query by constructing it directly from the method name as there is no other
+ * query declared.
+ *
+ * @param lastname
+ * @param maxResults the maximum number of results returned.
+ * @return
+ */
+ List findByLastname(String lastname, Limit maxResults);
+
/**
* Returns all users with the given firstname. This method will be translated into a query using the one declared in
* the {@link Query} annotation declared one.
@@ -73,6 +85,17 @@ public interface SimpleUserRepository extends CrudRepository {
@Query("select u from User u where u.firstname = :firstname")
List findByFirstname(String firstname);
+ /**
+ * Returns at most the number of users defined via {@link Limit} with the given firstname. This method will be
+ * translated into a query using the one declared in the {@link Query} annotation declared one.
+ *
+ * @param firstname
+ * @param maxResults the maximum number of results returned.
+ * @return
+ */
+ @Query("select u from User u where u.firstname = :firstname")
+ List findByFirstname(String firstname, Limit maxResults);
+
/**
* Returns all users with the given name as first- or lastname. This makes the query to method relation much more
* refactoring-safe as the order of the method parameters is completely irrelevant.
diff --git a/jpa/example/src/main/java/example/springdata/jpa/simple/User.java b/jpa/example/src/main/java/example/springdata/jpa/simple/User.java
index 6b089352e..32d8d9be7 100644
--- a/jpa/example/src/main/java/example/springdata/jpa/simple/User.java
+++ b/jpa/example/src/main/java/example/springdata/jpa/simple/User.java
@@ -15,9 +15,9 @@
*/
package example.springdata.jpa.simple;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.NamedQuery;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.NamedQuery;
import org.springframework.data.jpa.domain.AbstractPersistable;
diff --git a/jpa/example/src/test/java/example/springdata/jpa/basics/BasicFactorySetup.java b/jpa/example/src/test/java/example/springdata/jpa/basics/BasicFactorySetup.java
index 210af8cbb..9079c0134 100644
--- a/jpa/example/src/test/java/example/springdata/jpa/basics/BasicFactorySetup.java
+++ b/jpa/example/src/test/java/example/springdata/jpa/basics/BasicFactorySetup.java
@@ -20,9 +20,9 @@
import example.springdata.jpa.simple.SimpleUserRepository;
import example.springdata.jpa.simple.User;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Persistence;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.Persistence;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
diff --git a/jpa/example/src/test/java/example/springdata/jpa/basics/BasicSample.java b/jpa/example/src/test/java/example/springdata/jpa/basics/BasicSample.java
index 151b8765a..2f3622cc7 100644
--- a/jpa/example/src/test/java/example/springdata/jpa/basics/BasicSample.java
+++ b/jpa/example/src/test/java/example/springdata/jpa/basics/BasicSample.java
@@ -3,9 +3,9 @@
*
* Licenseimport static org.junit.Assert.*;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Persistence;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.Persistence;
import org.junit.After;
import org.junit.Before;
@@ -23,8 +23,8 @@
import example.springdata.jpa.simple.User;
-import javax.persistence.EntityManager;
-import javax.persistence.Persistence;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Persistence;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
diff --git a/jpa/example/src/test/java/example/springdata/jpa/customall/UserRepositoryCustomizationTests.java b/jpa/example/src/test/java/example/springdata/jpa/customall/UserRepositoryCustomizationTests.java
index 0ed3a5542..00e0f95b6 100644
--- a/jpa/example/src/test/java/example/springdata/jpa/customall/UserRepositoryCustomizationTests.java
+++ b/jpa/example/src/test/java/example/springdata/jpa/customall/UserRepositoryCustomizationTests.java
@@ -24,7 +24,7 @@
import org.springframework.transaction.annotation.Transactional;
/**
- * Intergration test showing the usage of a custom method implemented for all repositories
+ * Integration test showing the usage of a custom method implemented for all repositories
*
* @author Oliver Gierke
* @author Divya Srivastava
diff --git a/jpa/example/src/test/java/example/springdata/jpa/pagination/PaginationTests.java b/jpa/example/src/test/java/example/springdata/jpa/pagination/PaginationTests.java
new file mode 100644
index 000000000..017cbeb84
--- /dev/null
+++ b/jpa/example/src/test/java/example/springdata/jpa/pagination/PaginationTests.java
@@ -0,0 +1,209 @@
+/*
+ * Copyright 2025 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
+ *
+ * http://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 example.springdata.jpa.pagination;
+
+import static org.assertj.core.api.Assertions.*;
+
+import jakarta.persistence.EntityManager;
+
+import java.util.List;
+import java.util.Random;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.data.jpa.test.autoconfigure.DataJpaTest;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.domain.KeysetScrollPosition;
+import org.springframework.data.domain.OffsetScrollPosition;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.ScrollPosition;
+import org.springframework.data.domain.Slice;
+import org.springframework.data.domain.Window;
+import org.springframework.data.support.WindowIterator;
+import org.springframework.data.util.Streamable;
+
+import com.github.javafaker.Faker;
+
+/**
+ * Show different types of paging styles using {@link Page}, {@link Slice} and {@link Window}.
+ *
+ * @author Christoph Strobl
+ * @author Mark Paluch
+ */
+@DataJpaTest
+class PaginationTests {
+
+ @Configuration
+ @EnableAutoConfiguration
+ static class Config {
+
+ }
+
+ @Autowired BookRepository books;
+
+ @BeforeEach
+ void setUp() {
+
+ Faker faker = new Faker();
+
+ // create some sample data
+ List authorList = createAuthors(faker);
+ createBooks(faker, authorList);
+ }
+
+ /**
+ * Page through the results using an offset/limit approach where the server skips over the number of results specified
+ * via {@link Pageable#getOffset()}. The {@link Page} return type will run an additional {@literal count} query to
+ * read the total number of matching rows on each request.
+ */
+ @Test
+ void pageThroughResultsWithSkipAndLimit() {
+
+ Page page;
+ Pageable pageRequest = PageRequest.of(0, 2);
+
+ do {
+
+ page = books.findByTitleContainsOrderByPublicationDate("the", pageRequest);
+ assertThat(page.getContent().size()).isGreaterThanOrEqualTo(1).isLessThanOrEqualTo(2);
+
+ pageRequest = page.nextPageable();
+ } while (page.hasNext());
+ }
+
+ /**
+ * Run through the results using an offset/limit approach where the server skips over the number of results specified
+ * via {@link Pageable#getOffset()}. No additional {@literal count} query to read the total number of matching rows is
+ * issued. Still {@link Slice} requests, but does not emit, one row more than specified via {@link Page#getSize()} to
+ * feed {@link Slice#hasNext()}
+ */
+ @Test
+ void sliceThroughResultsWithSkipAndLimit() {
+
+ Slice slice;
+ Pageable pageRequest = PageRequest.of(0, 2);
+
+ do {
+
+ slice = books.findBooksByTitleContainsOrderByPublicationDate("the", pageRequest);
+ assertThat(slice.getContent().size()).isGreaterThanOrEqualTo(1).isLessThanOrEqualTo(2);
+
+ pageRequest = slice.nextPageable();
+ } while (slice.hasNext());
+ }
+
+ /**
+ * Scroll through the results using an offset/limit approach where the server skips over the number of results
+ * specified via {@link OffsetScrollPosition#getOffset()}.
+ *
+ * This approach is similar to the {@link #sliceThroughResultsWithSkipAndLimit() slicing one}.
+ */
+ @Test
+ void scrollThroughResultsWithSkipAndLimit() {
+
+ Window window;
+ ScrollPosition scrollPosition = ScrollPosition.offset();
+
+ do {
+
+ window = books.findTop2ByTitleContainsOrderByPublicationDate("the", scrollPosition);
+ assertThat(window.getContent().size()).isGreaterThanOrEqualTo(1).isLessThanOrEqualTo(2);
+
+ scrollPosition = window.positionAt(window.getContent().size() - 1);
+ } while (window.hasNext());
+ }
+
+ /**
+ * Scroll through the results using an offset/limit approach where the server skips over the number of results
+ * specified via {@link OffsetScrollPosition#getOffset()} using {@link WindowIterator}.
+ *
+ * This approach is similar to the {@link #sliceThroughResultsWithSkipAndLimit() slicing one}.
+ */
+ @Test
+ void scrollThroughResultsUsingWindowIteratorWithSkipAndLimit() {
+
+ WindowIterator iterator = WindowIterator
+ .of(scrollPosition -> books.findTop2ByTitleContainsOrderByPublicationDate("the-crazy-book-", scrollPosition))
+ .startingAt(ScrollPosition.offset());
+
+ List allBooks = Streamable.of(() -> iterator).stream().toList();
+ assertThat(allBooks).hasSize(50);
+ }
+
+ /**
+ * Scroll through the results using an index based approach where the {@link KeysetScrollPosition#getKeys() keyset}
+ * keeps track of already seen values to resume scrolling by altering the where clause to only return rows after the
+ * values contained in the keyset. Set {@literal logging.level.org.hibernate.SQL=debug} to show the modified query in
+ * the log.
+ */
+ @Test
+ void scrollThroughResultsWithKeyset() {
+
+ Window window;
+ ScrollPosition scrollPosition = ScrollPosition.keyset();
+ do {
+
+ window = books.findTop2ByTitleContainsOrderByPublicationDate("the", scrollPosition);
+ assertThat(window.getContent().size()).isGreaterThanOrEqualTo(1).isLessThanOrEqualTo(2);
+
+ scrollPosition = window.positionAt(window.getContent().size() - 1);
+ } while (window.hasNext());
+ }
+
+ // --> Test Data
+
+ @Autowired EntityManager em;
+
+ private List createAuthors(Faker faker) {
+
+ List authors = IntStream.range(0, 10).mapToObj(id -> {
+
+ Author author = new Author();
+ author.setId("author-%s".formatted(id));
+ author.setFirstName(faker.name().firstName());
+ author.setLastName(faker.name().lastName());
+
+ em.persist(author);
+ return author;
+ }).collect(Collectors.toList());
+ return authors;
+ }
+
+ private List createBooks(Faker faker, List authors) {
+
+ Random rand = new Random();
+ return IntStream.range(0, 100).mapToObj(id -> {
+
+ Book book = new Book();
+ book.setId("book-%03d".formatted(id));
+ book.setTitle((id % 2 == 0 ? "the-crazy-book-" : "") + faker.book().title());
+ book.setIsbn10(UUID.randomUUID().toString().substring(0, 10));
+ book.setPublicationDate(faker.date().past(5000, TimeUnit.DAYS));
+ book.setAuthor(authors.get(rand.nextInt(authors.size())));
+
+ em.persist(book);
+ return book;
+ }).collect(Collectors.toList());
+ }
+}
diff --git a/jpa/example/src/test/java/example/springdata/jpa/simple/SimpleUserRepositoryTests.java b/jpa/example/src/test/java/example/springdata/jpa/simple/SimpleUserRepositoryTests.java
index 3cf1b6d1e..5fcfdc773 100644
--- a/jpa/example/src/test/java/example/springdata/jpa/simple/SimpleUserRepositoryTests.java
+++ b/jpa/example/src/test/java/example/springdata/jpa/simple/SimpleUserRepositoryTests.java
@@ -27,6 +27,7 @@
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
+import java.util.stream.IntStream;
import java.util.stream.Stream;
import org.junit.jupiter.api.Assertions;
@@ -36,6 +37,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.dao.InvalidDataAccessApiUsageException;
+import org.springframework.data.domain.Limit;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Sort;
import org.springframework.transaction.annotation.Propagation;
@@ -83,6 +85,22 @@ void findSavedUserByLastname() {
assertThat(repository.findByLastname("lastname")).contains(user);
}
+ @Test
+ void findLimitedNumberOfUsersViaDerivedQuery() {
+
+ IntStream.range(0, 10).forEach($ -> repository.save(new User(user.getFirstname(), user.getLastname())));
+
+ assertThat(repository.findByLastname("lastname", Limit.of(5))).hasSize(5);
+ }
+
+ @Test
+ void findLimitedNumberOfUsersViaAnnotatedQuery() {
+
+ IntStream.range(0, 10).forEach($ -> repository.save(new User(user.getFirstname(), user.getLastname())));
+
+ assertThat(repository.findByFirstname(user.getFirstname(), Limit.of(5))).hasSize(5);
+ }
+
@Test
void findByFirstnameOrLastname() {
@@ -154,7 +172,7 @@ void findFirst2ByOrderByLastnameAsc() {
var user2 = new User();
user2.setLastname("lastname-2");
- // we deliberatly save the items in reverse
+ // we deliberately save the items in reverse
repository.saveAll(Arrays.asList(user2, user1, user0));
var result = repository.findFirst2ByOrderByLastnameAsc();
@@ -253,7 +271,7 @@ void rejectsStreamExecutionIfNoSurroundingTransactionActive() {
/**
* Here we demonstrate the usage of {@link CompletableFuture} as a result wrapper for asynchronous repository query
* methods. Note, that we need to disable the surrounding transaction to be able to asynchronously read the written
- * data from from another thread within the same test method.
+ * data from another thread within the same test method.
*/
@Test
@Transactional(propagation = Propagation.NOT_SUPPORTED)
diff --git a/jpa/example/src/test/java/example/springdata/jpa/simple/VirtualThreadsTests.java b/jpa/example/src/test/java/example/springdata/jpa/simple/VirtualThreadsTests.java
new file mode 100644
index 000000000..915d2131d
--- /dev/null
+++ b/jpa/example/src/test/java/example/springdata/jpa/simple/VirtualThreadsTests.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright 2023 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
+ *
+ * http://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 example.springdata.jpa.simple;
+
+import static org.assertj.core.api.Assertions.*;
+
+import java.util.List;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledForJreRange;
+import org.junit.jupiter.api.condition.JRE;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.core.task.SimpleAsyncTaskExecutor;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * Integration test showing the basic usage of {@link SimpleUserRepository} with Virtual Threads.
+ *
+ * @author Mark Paluch
+ */
+@Transactional
+@SpringBootTest(properties = "spring.threads.virtual.enabled=true")
+@EnabledForJreRange(min = JRE.JAVA_21)
+class VirtualThreadsTests {
+
+ @Autowired SimpleUserRepository repository;
+ private User user;
+
+ @BeforeEach
+ void setUp() {
+
+ user = new User();
+ user.setUsername("foobar");
+ user.setFirstname("firstname");
+ user.setLastname("lastname");
+ }
+
+ /**
+ * This repository invocation runs on a dedicated virtual thread.
+ */
+ @Test
+ @Transactional(propagation = Propagation.NOT_SUPPORTED)
+ void supportsVirtualThreads() throws Exception {
+
+ BlockingQueue thread = new LinkedBlockingQueue<>();
+ repository.save(new User("Customer1", "Foo"));
+ repository.save(new User("Customer2", "Bar"));
+
+ try (SimpleAsyncTaskExecutor executor = new SimpleAsyncTaskExecutor()) {
+ executor.setVirtualThreads(true);
+
+ var future = executor.submit(() -> {
+ thread.add(Thread.currentThread().toString());
+ return repository.findAll();
+ });
+
+ List users = future.get();
+ String threadName = thread.poll(1, TimeUnit.SECONDS);
+
+ assertThat(threadName).contains("VirtualThread");
+ assertThat(users).hasSize(2);
+ }
+
+ repository.deleteAll();
+ }
+
+ /**
+ * Here we demonstrate the usage of {@link CompletableFuture} as a result wrapper for asynchronous repository query
+ * methods running on Virtual Threads. Note, that we need to disable the surrounding transaction to be able to
+ * asynchronously read the written data from another thread within the same test method.
+ */
+ @Test
+ @Transactional(propagation = Propagation.NOT_SUPPORTED)
+ void asyncUsesVirtualThreads() throws Exception {
+
+ BlockingQueue thread = new LinkedBlockingQueue<>();
+ repository.save(new User("Customer1", "Foo"));
+ repository.save(new User("Customer2", "Bar"));
+
+ var future = repository.readAllBy().thenAccept(users -> {
+
+ assertThat(users).hasSize(2);
+ thread.add(Thread.currentThread().toString());
+ });
+
+ future.join();
+ String threadName = thread.poll(1, TimeUnit.SECONDS);
+
+ assertThat(threadName).contains("VirtualThread");
+
+ repository.deleteAll();
+ }
+}
diff --git a/jpa/graalvm-native/README.adoc b/jpa/graalvm-native/README.adoc
new file mode 100644
index 000000000..1048cc279
--- /dev/null
+++ b/jpa/graalvm-native/README.adoc
@@ -0,0 +1,48 @@
+== Spring Data Jpa - GraalVM native image
+
+This example compiles a basic Spring Data Jpa application into a GraalVM native image.
+
+=== Install GraalVM & native image tooling
+
+Download and install GraalVM using https://sdkman.io/[SDKMAN!].
+
+```
+$> sdk install java .r17-grl
+$> gu install native-image
+```
+
+=== Compile to native image
+
+The maven build uses a dedicated profile `native` to trigger the native image creation.
+
+```
+$> maven clean package -P native
+```
+
+This will create the native executable in the target folder.
+
+=== Run the image
+
+Run the image directly from your console as shown below.
+This will print results of crud functions invoked via a `CommandLineRunner`.
+
+```
+$> ./target/spring-data-jpa-graalvm-native
+
+ . ____ _ __ _ _
+ /\\ / ___'_ __ _ _(_)_ __ __ _ \ \ \ \
+( ( )\___ | '_ | '_| | '_ \/ _` | \ \ \ \
+ \\/ ___)| |_)| | | | | || (_| | ) ) ) )
+ ' |____| .__|_| |_|_| |_\__, | / / / /
+ =========|_|==============|___/=/_/_/_/
+ :: Spring Boot :: (v3.0.0-SNAPSHOT)
+
+INFO 82562 --- [ main] e.s.j.g.GraalvmNativeApplication : Starting GraalvmNativeApplication using Java 17.0.4 with PID 51404
+INFO 51404 --- [ main] j.LocalContainerEntityManagerFactoryBean : Initialized JPA EntityManagerFactory for persistence unit 'default'
+INFO 51404 --- [ main] c.example.data.jpa.DataJpaApplication : Started DataJpaApplication in 0.079 seconds (process running for 0.097)
+insertAuthors(): author1 = Author{name='Josh Long'}
+insertAuthors(): author2 = Author{name='Martin Kleppmann'}
+listAllAuthors(): author = Author{name='Josh Long'}
+ Book{title='Reactive Spring'}
+...
+```
diff --git a/jpa/graalvm-native/pom.xml b/jpa/graalvm-native/pom.xml
new file mode 100644
index 000000000..1f3173f60
--- /dev/null
+++ b/jpa/graalvm-native/pom.xml
@@ -0,0 +1,65 @@
+
+ 4.0.0
+
+ spring-data-jpa-graalvm-native
+
+
+ org.springframework.data.examples
+ spring-data-examples
+ 4.0.0-SNAPSHOT
+ ../../pom.xml
+
+
+ Spring Data JPA - GraalVM Native Image
+
+
+
+ org.springframework.boot
+ spring-boot-starter-data-jpa
+
+
+
+ com.h2database
+ h2
+ runtime
+
+
+
+
+
+
+
+ org.graalvm.buildtools
+ native-maven-plugin
+
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+
+
+ org.hibernate.orm
+ hibernate-maven-plugin
+ ${hibernate.version}
+
+
+
+ true
+ true
+ true
+
+
+
+ enhance
+
+
+
+
+
+
+
+
+
diff --git a/jpa/graalvm-native/src/main/java/com/example/data/jpa/AuthorRepository.java b/jpa/graalvm-native/src/main/java/com/example/data/jpa/AuthorRepository.java
new file mode 100644
index 000000000..7154a86a9
--- /dev/null
+++ b/jpa/graalvm-native/src/main/java/com/example/data/jpa/AuthorRepository.java
@@ -0,0 +1,32 @@
+/*
+ * 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 com.example.data.jpa;
+
+import java.util.Optional;
+
+import com.example.data.jpa.model.Author;
+
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.ListCrudRepository;
+
+public interface AuthorRepository extends ListCrudRepository {
+
+ Optional findByNameContainingIgnoreCase(String partialName);
+
+ @Query("SELECT a FROM Author a WHERE a.name = :name")
+ Optional queryFindByName(String name);
+
+}
diff --git a/jpa/graalvm-native/src/main/java/com/example/data/jpa/CLR.java b/jpa/graalvm-native/src/main/java/com/example/data/jpa/CLR.java
new file mode 100644
index 000000000..a8d48e575
--- /dev/null
+++ b/jpa/graalvm-native/src/main/java/com/example/data/jpa/CLR.java
@@ -0,0 +1,101 @@
+/*
+ * 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 com.example.data.jpa;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Set;
+
+import com.example.data.jpa.model.Author;
+import com.example.data.jpa.model.Book;
+
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+@Component
+class CLR implements CommandLineRunner {
+
+ private final AuthorRepository authorRepository;
+
+ CLR(AuthorRepository authorRepository) {
+ this.authorRepository = authorRepository;
+ }
+
+ @Override
+ @Transactional
+ public void run(String... args) {
+ var authors = insertAuthors();
+ listAllAuthors();
+ findById(authors);
+ findByPartialName();
+ queryFindByName();
+ deleteAll();
+ }
+
+ private void deleteAll() {
+ this.authorRepository.deleteAll();
+ long count = this.authorRepository.count();
+ System.out.printf("deleteAll(): count = %d%n", count);
+ }
+
+ private void queryFindByName() {
+ Author author1 = this.authorRepository.queryFindByName("Josh Long").orElse(null);
+ Author author2 = this.authorRepository.queryFindByName("Martin Kleppmann").orElse(null);
+
+ System.out.printf("queryFindByName(): author1 = %s%n", author1);
+ System.out.printf("queryFindByName(): author2 = %s%n", author2);
+ }
+
+ private void findByPartialName() {
+ Author author1 = this.authorRepository.findByNameContainingIgnoreCase("sh lo").orElse(null);
+ Author author2 = this.authorRepository.findByNameContainingIgnoreCase("in kl").orElse(null);
+
+ System.out.printf("findByPartialName(): author1 = %s%n", author1);
+ System.out.printf("findByPartialName(): author2 = %s%n", author2);
+ }
+
+ private void findById(List authors) {
+ Author author1 = this.authorRepository.findById(authors.get(0).getId()).orElse(null);
+ Author author2 = this.authorRepository.findById(authors.get(1).getId()).orElse(null);
+
+ System.out.printf("findById(): author1 = %s%n", author1);
+ System.out.printf("findById(): author2 = %s%n", author2);
+ }
+
+ private void listAllAuthors() {
+ List authors = this.authorRepository.findAll();
+ for (Author author : authors) {
+ System.out.printf("listAllAuthors(): author = %s%n", author);
+ for (Book book : author.getBooks()) {
+ System.out.printf("\t%s%n", book);
+ }
+ }
+ }
+
+ private List insertAuthors() {
+ Author author1 = this.authorRepository.save(new Author(null, "Josh Long",
+ Set.of(new Book(null, "Reactive Spring"), new Book(null, "Cloud Native Java"))));
+ Author author2 = this.authorRepository.save(
+ new Author(null, "Martin Kleppmann", Set.of(new Book(null, "Designing Data Intensive Applications"))));
+
+ System.out.printf("insertAuthors(): author1 = %s%n", author1);
+ System.out.printf("insertAuthors(): author2 = %s%n", author2);
+
+ return Arrays.asList(author1, author2);
+ }
+
+}
diff --git a/geode/security/src/main/java/example/springdata/geode/client/security/server/SecurityEnabledServer.java b/jpa/graalvm-native/src/main/java/com/example/data/jpa/DataJpaApplication.java
old mode 100755
new mode 100644
similarity index 59%
rename from geode/security/src/main/java/example/springdata/geode/client/security/server/SecurityEnabledServer.java
rename to jpa/graalvm-native/src/main/java/com/example/data/jpa/DataJpaApplication.java
index 1a7738733..25c848175
--- a/geode/security/src/main/java/example/springdata/geode/client/security/server/SecurityEnabledServer.java
+++ b/jpa/graalvm-native/src/main/java/com/example/data/jpa/DataJpaApplication.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2020-2021 the original author or authors.
+ * 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.
@@ -13,20 +13,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package example.springdata.geode.client.security.server;
+package com.example.data.jpa;
-import org.springframework.boot.WebApplicationType;
+import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.builder.SpringApplicationBuilder;
-/**
- * @author Patrick Johnson
- */
@SpringBootApplication
-public class SecurityEnabledServer {
+public class DataJpaApplication {
- public static void main(String[] args) {
- new SpringApplicationBuilder(SecurityEnabledServer.class).web(WebApplicationType.NONE).build().run(args);
+ public static void main(String[] args) throws InterruptedException {
+ SpringApplication.run(DataJpaApplication.class, args);
}
}
diff --git a/jpa/graalvm-native/src/main/java/com/example/data/jpa/model/Author.java b/jpa/graalvm-native/src/main/java/com/example/data/jpa/model/Author.java
new file mode 100644
index 000000000..73ec2886f
--- /dev/null
+++ b/jpa/graalvm-native/src/main/java/com/example/data/jpa/model/Author.java
@@ -0,0 +1,87 @@
+/*
+ * 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 com.example.data.jpa.model;
+
+import java.util.Objects;
+import java.util.Set;
+
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
+
+@Entity
+public class Author {
+
+ @Id
+ @GeneratedValue
+ private Long id;
+
+ private String name;
+
+ @OneToMany(cascade = CascadeType.ALL)
+ private Set books;
+
+ protected Author() {
+ }
+
+ public Author(Long id, String name, Set books) {
+ this.id = id;
+ this.name = name;
+ this.books = books;
+ }
+
+ public Long getId() {
+ return id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public Set getBooks() {
+ return books;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+ Author author = (Author) o;
+ return Objects.equals(id, author.id) && Objects.equals(name, author.name)
+ && Objects.equals(books, author.books);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(id, name, books);
+ }
+
+ @Override
+ public String toString() {
+ return "Author{" + "name='" + name + '\'' + '}';
+ }
+
+}
diff --git a/jpa/graalvm-native/src/main/java/com/example/data/jpa/model/Book.java b/jpa/graalvm-native/src/main/java/com/example/data/jpa/model/Book.java
new file mode 100644
index 000000000..2e7c256d4
--- /dev/null
+++ b/jpa/graalvm-native/src/main/java/com/example/data/jpa/model/Book.java
@@ -0,0 +1,75 @@
+/*
+ * 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 com.example.data.jpa.model;
+
+import java.util.Objects;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+
+@Entity
+public class Book {
+
+ @Id
+ @GeneratedValue
+ private Long id;
+
+ private String title;
+
+ protected Book() {
+ }
+
+ public Book(Long id, String title) {
+ this.id = id;
+ this.title = title;
+ }
+
+ public Long getId() {
+ return id;
+ }
+
+ public String getTitle() {
+ return title;
+ }
+
+ public void setTitle(String title) {
+ this.title = title;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+ Book book = (Book) o;
+ return Objects.equals(id, book.id) && Objects.equals(title, book.title);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(id, title);
+ }
+
+ @Override
+ public String toString() {
+ return "Book{" + "title='" + title + '\'' + '}';
+ }
+
+}
diff --git a/jpa/graalvm-native/src/main/resources/application.properties b/jpa/graalvm-native/src/main/resources/application.properties
new file mode 100644
index 000000000..e69de29bb
diff --git a/jpa/graalvm-native/src/main/resources/schema.sql b/jpa/graalvm-native/src/main/resources/schema.sql
new file mode 100644
index 000000000..14e51639f
--- /dev/null
+++ b/jpa/graalvm-native/src/main/resources/schema.sql
@@ -0,0 +1,12 @@
+create table author
+(
+ id bigint auto_increment primary key,
+ name varchar not null
+);
+
+create table book
+(
+ id bigint auto_increment primary key,
+ author bigint not null references author (id),
+ title varchar not null
+);
diff --git a/jpa/graalvm-native/src/test/java/com/example/data/jpa/DataJpaApplicationTests.java b/jpa/graalvm-native/src/test/java/com/example/data/jpa/DataJpaApplicationTests.java
new file mode 100644
index 000000000..aedc738b1
--- /dev/null
+++ b/jpa/graalvm-native/src/test/java/com/example/data/jpa/DataJpaApplicationTests.java
@@ -0,0 +1,14 @@
+package com.example.data.jpa;
+
+import org.junit.jupiter.api.Test;
+
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest
+class DataJpaApplicationTests {
+
+ @Test
+ void contextLoads() {
+ }
+
+}
diff --git a/jpa/interceptors/pom.xml b/jpa/interceptors/pom.xml
index dabd464b6..18fd01cee 100644
--- a/jpa/interceptors/pom.xml
+++ b/jpa/interceptors/pom.xml
@@ -6,7 +6,7 @@
org.springframework.data.examples
spring-data-jpa-examples
- 2.0.0.BUILD-SNAPSHOT
+ 4.0.0-SNAPSHOT
../pom.xml
diff --git a/jpa/interceptors/src/main/java/example/springdata/jpa/interceptors/Customer.java b/jpa/interceptors/src/main/java/example/springdata/jpa/interceptors/Customer.java
index 4d89fdee9..02b026b30 100644
--- a/jpa/interceptors/src/main/java/example/springdata/jpa/interceptors/Customer.java
+++ b/jpa/interceptors/src/main/java/example/springdata/jpa/interceptors/Customer.java
@@ -15,16 +15,26 @@
*/
package example.springdata.jpa.interceptors;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
@Entity
public class Customer {
- @Id @GeneratedValue Long id;
+ @Id
+ @GeneratedValue
+ Long id;
String firstname;
String lastname;
+ @Override
+ public String toString() {
+ return "Customer{" +
+ "id=" + id +
+ ", firstname='" + firstname + '\'' +
+ ", lastname='" + lastname + '\'' +
+ '}';
+ }
}
diff --git a/jpa/interceptors/src/test/java/example/springdata/jpa/interceptors/InterceptorIntegrationTest.java b/jpa/interceptors/src/test/java/example/springdata/jpa/interceptors/InterceptorIntegrationTest.java
index 6ccace00c..976c07f74 100644
--- a/jpa/interceptors/src/test/java/example/springdata/jpa/interceptors/InterceptorIntegrationTest.java
+++ b/jpa/interceptors/src/test/java/example/springdata/jpa/interceptors/InterceptorIntegrationTest.java
@@ -30,12 +30,13 @@ class InterceptorIntegrationTest {
@Autowired CustomerRepository repository;
@Test
- void foo() {
+ void demonstrateInterceptor() {
var customer = new Customer();
customer.firstname = "Dave";
customer.lastname = "Matthews";
+ // observer Log output from ApplicationConfiguration.interceptor
repository.save(customer);
}
}
diff --git a/jpa/jpa21/README.md b/jpa/jpa21/README.md
index 89be21eed..3683ef2ff 100644
--- a/jpa/jpa21/README.md
+++ b/jpa/jpa21/README.md
@@ -5,7 +5,7 @@ This project contains samples of JPA 2.1 specific features of Spring Data JPA.
## Support for declarative Fetch Graphs customization
You can customize the loading of entity associations via EntityGraphs. JPA 2.1 provides the `NamedEntityGraph` annotation
-that allows you define fetching behavior in a flexible way.
+that allows you to define fetching behavior in a flexible way.
In Spring Data JPA we support to specify which fetch-graph to use for a repository query method via the `EntityGraph` annotation.
@@ -15,7 +15,7 @@ You can refer to a fetch graph by name like in the following example.
Product findOneById(Long id);
```
-We also offer an alternative and more concise way to declarativly specify a fetch graph for a repository query method in an
+We also offer an alternative and more concise way to declaratively specify a fetch graph for a repository query method in an
ad-hoc manner:
```java
@EntityGraph(attributePaths = "tags")
@@ -61,7 +61,7 @@ Spring Data JPA repository declaration to execute procedures:
public interface UserRepository extends CrudRepository {
// Explicitly mapped to named stored procedure {@code User.plus1} in the {@link EntityManager}.
- // By default, we would've try to find a procedure declaration named User.plus1BackedByOtherNamedStoredProcedure
+ // By default, we would've tried to find a procedure declaration named User.plus1BackedByOtherNamedStoredProcedure
@Procedure(name = "User.plus1")
Integer plus1BackedByOtherNamedStoredProcedure(@Param("arg") Integer arg);
@@ -126,4 +126,4 @@ interface SubscriptionRepository extends CrudRepository {
@Query(nativeQuery = true)
List findAllSubscriptionSummaries();
}
-```
\ No newline at end of file
+```
diff --git a/jpa/jpa21/pom.xml b/jpa/jpa21/pom.xml
index ae798bfec..4b671e584 100644
--- a/jpa/jpa21/pom.xml
+++ b/jpa/jpa21/pom.xml
@@ -5,7 +5,7 @@
org.springframework.data.examples
spring-data-jpa-examples
- 2.0.0.BUILD-SNAPSHOT
+ 4.0.0-SNAPSHOT
spring-data-jpa-jpa21
diff --git a/jpa/jpa21/src/main/java/example/springdata/jpa/fetchgraph/Product.java b/jpa/jpa21/src/main/java/example/springdata/jpa/fetchgraph/Product.java
index cc09b1e15..aa146d4bc 100644
--- a/jpa/jpa21/src/main/java/example/springdata/jpa/fetchgraph/Product.java
+++ b/jpa/jpa21/src/main/java/example/springdata/jpa/fetchgraph/Product.java
@@ -21,15 +21,15 @@
import java.util.HashSet;
import java.util.Set;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.ManyToMany;
-import javax.persistence.NamedAttributeNode;
-import javax.persistence.NamedEntityGraph;
-import javax.persistence.NamedEntityGraphs;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.NamedAttributeNode;
+import jakarta.persistence.NamedEntityGraph;
+import jakarta.persistence.NamedEntityGraphs;
/**
* @author Thomas Darimont
diff --git a/jpa/jpa21/src/main/java/example/springdata/jpa/fetchgraph/ProductRepository.java b/jpa/jpa21/src/main/java/example/springdata/jpa/fetchgraph/ProductRepository.java
index 62178d524..bb7e2a30a 100644
--- a/jpa/jpa21/src/main/java/example/springdata/jpa/fetchgraph/ProductRepository.java
+++ b/jpa/jpa21/src/main/java/example/springdata/jpa/fetchgraph/ProductRepository.java
@@ -15,8 +15,8 @@
*/
package example.springdata.jpa.fetchgraph;
-import javax.persistence.FetchType;
-import javax.persistence.NamedEntityGraph;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.NamedEntityGraph;
import org.springframework.data.jpa.repository.EntityGraph;
import org.springframework.data.jpa.repository.JpaRepository;
diff --git a/jpa/jpa21/src/main/java/example/springdata/jpa/fetchgraph/Tag.java b/jpa/jpa21/src/main/java/example/springdata/jpa/fetchgraph/Tag.java
index 6919c3d2f..5d4a77b64 100644
--- a/jpa/jpa21/src/main/java/example/springdata/jpa/fetchgraph/Tag.java
+++ b/jpa/jpa21/src/main/java/example/springdata/jpa/fetchgraph/Tag.java
@@ -18,9 +18,9 @@
import lombok.Data;
import lombok.NoArgsConstructor;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
/**
* @author Thomas Darimont
diff --git a/jpa/jpa21/src/main/java/example/springdata/jpa/resultsetmappings/Subscription.java b/jpa/jpa21/src/main/java/example/springdata/jpa/resultsetmappings/Subscription.java
index 5dc6bec07..e5083b340 100644
--- a/jpa/jpa21/src/main/java/example/springdata/jpa/resultsetmappings/Subscription.java
+++ b/jpa/jpa21/src/main/java/example/springdata/jpa/resultsetmappings/Subscription.java
@@ -20,14 +20,14 @@
import lombok.Data;
import lombok.NoArgsConstructor;
-import javax.persistence.ColumnResult;
-import javax.persistence.ConstructorResult;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.NamedNativeQueries;
-import javax.persistence.NamedNativeQuery;
-import javax.persistence.SqlResultSetMapping;
+import jakarta.persistence.ColumnResult;
+import jakarta.persistence.ConstructorResult;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.NamedNativeQueries;
+import jakarta.persistence.NamedNativeQuery;
+import jakarta.persistence.SqlResultSetMapping;
/**
* @author Thomas Darimont
diff --git a/jpa/jpa21/src/main/java/example/springdata/jpa/resultsetmappings/SubscriptionRepository.java b/jpa/jpa21/src/main/java/example/springdata/jpa/resultsetmappings/SubscriptionRepository.java
index b88f9d0df..7d13b4afe 100644
--- a/jpa/jpa21/src/main/java/example/springdata/jpa/resultsetmappings/SubscriptionRepository.java
+++ b/jpa/jpa21/src/main/java/example/springdata/jpa/resultsetmappings/SubscriptionRepository.java
@@ -17,7 +17,7 @@
import java.util.List;
-import javax.persistence.SqlResultSetMapping;
+import jakarta.persistence.SqlResultSetMapping;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.CrudRepository;
@@ -30,7 +30,7 @@ public interface SubscriptionRepository extends CrudRepository
- * Note that this example uses a JPA 2.1 Constructor based {@link javax.persistence.SqlResultSetMapping} in
+ * Note that this example uses a JPA 2.1 Constructor based {@link jakarta.persistence.SqlResultSetMapping} in
* combination with native query defined in {@link Subscription}.
*
* @return
diff --git a/jpa/jpa21/src/main/java/example/springdata/jpa/storedprocedures/User.java b/jpa/jpa21/src/main/java/example/springdata/jpa/storedprocedures/User.java
index 93bf35f9d..a1132117a 100644
--- a/jpa/jpa21/src/main/java/example/springdata/jpa/storedprocedures/User.java
+++ b/jpa/jpa21/src/main/java/example/springdata/jpa/storedprocedures/User.java
@@ -15,12 +15,12 @@
*/
package example.springdata.jpa.storedprocedures;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.NamedStoredProcedureQuery;
-import javax.persistence.ParameterMode;
-import javax.persistence.StoredProcedureParameter;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.NamedStoredProcedureQuery;
+import jakarta.persistence.ParameterMode;
+import jakarta.persistence.StoredProcedureParameter;
/**
* Sample user class.
diff --git a/jpa/jpa21/src/main/java/example/springdata/jpa/storedprocedures/UserRepository.java b/jpa/jpa21/src/main/java/example/springdata/jpa/storedprocedures/UserRepository.java
index f023e7d96..e819e1ed0 100644
--- a/jpa/jpa21/src/main/java/example/springdata/jpa/storedprocedures/UserRepository.java
+++ b/jpa/jpa21/src/main/java/example/springdata/jpa/storedprocedures/UserRepository.java
@@ -15,14 +15,14 @@
*/
package example.springdata.jpa.storedprocedures;
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
import org.springframework.data.jpa.repository.query.Procedure;
import org.springframework.data.repository.CrudRepository;
/**
- * Simple repository interface for {@link User} instances. The interface is used to declare so called query methods,
- * methods to retrieve single entities or collections of them.
+ * Simple repository interface for {@link User} instances. The interface is used to declare the so-called query methods,
+ * i.e. methods to retrieve single entities or collections of them.
*
* @author Oliver Gierke
* @author Thomas Darimont
diff --git a/jpa/jpa21/src/main/resources/application.properties b/jpa/jpa21/src/main/resources/application.properties
index d98d035f1..e845ada33 100644
--- a/jpa/jpa21/src/main/resources/application.properties
+++ b/jpa/jpa21/src/main/resources/application.properties
@@ -1 +1 @@
-spring.datasource.separator=/;
\ No newline at end of file
+spring.sql.init.separator=/;
diff --git a/jpa/jpa21/src/test/java/example/springdata/jpa/fetchgraph/FetchGraphIntegrationTests.java b/jpa/jpa21/src/test/java/example/springdata/jpa/fetchgraph/FetchGraphIntegrationTests.java
index 69610f7f0..569a405e9 100644
--- a/jpa/jpa21/src/test/java/example/springdata/jpa/fetchgraph/FetchGraphIntegrationTests.java
+++ b/jpa/jpa21/src/test/java/example/springdata/jpa/fetchgraph/FetchGraphIntegrationTests.java
@@ -19,7 +19,7 @@
import java.util.Collections;
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
import org.hibernate.LazyInitializationException;
import org.junit.jupiter.api.Test;
diff --git a/jpa/jpa21/src/test/java/example/springdata/jpa/resultsetmappings/SubscriptionRepositoryIntegrationTests.java b/jpa/jpa21/src/test/java/example/springdata/jpa/resultsetmappings/SubscriptionRepositoryIntegrationTests.java
index 4b19bee13..70402837c 100644
--- a/jpa/jpa21/src/test/java/example/springdata/jpa/resultsetmappings/SubscriptionRepositoryIntegrationTests.java
+++ b/jpa/jpa21/src/test/java/example/springdata/jpa/resultsetmappings/SubscriptionRepositoryIntegrationTests.java
@@ -1,11 +1,11 @@
/*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2025 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
+ * http://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,
@@ -22,7 +22,7 @@
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
+import org.springframework.boot.data.jpa.test.autoconfigure.DataJpaTest;
import org.springframework.transaction.annotation.Transactional;
/**
diff --git a/jpa/jpa21/src/test/java/example/springdata/jpa/storedprocedures/UserRepositoryIntegrationTests.java b/jpa/jpa21/src/test/java/example/springdata/jpa/storedprocedures/UserRepositoryIntegrationTests.java
index 42ecabf0c..ee85600c7 100644
--- a/jpa/jpa21/src/test/java/example/springdata/jpa/storedprocedures/UserRepositoryIntegrationTests.java
+++ b/jpa/jpa21/src/test/java/example/springdata/jpa/storedprocedures/UserRepositoryIntegrationTests.java
@@ -17,8 +17,8 @@
import static org.assertj.core.api.Assertions.*;
-import javax.persistence.EntityManager;
-import javax.persistence.ParameterMode;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.ParameterMode;
import org.junit.jupiter.api.Test;
diff --git a/jpa/multiple-datasources/pom.xml b/jpa/multiple-datasources/pom.xml
index 879da171d..99a725b85 100644
--- a/jpa/multiple-datasources/pom.xml
+++ b/jpa/multiple-datasources/pom.xml
@@ -5,7 +5,7 @@
org.springframework.data.examples
spring-data-jpa-examples
- 2.0.0.BUILD-SNAPSHOT
+ 4.0.0-SNAPSHOT
spring-data-jpa-multiple-datasources
diff --git a/jpa/multiple-datasources/src/main/java/example/springdata/jpa/multipleds/Application.java b/jpa/multiple-datasources/src/main/java/example/springdata/jpa/multipleds/Application.java
index 90357406d..6ff69ab3f 100644
--- a/jpa/multiple-datasources/src/main/java/example/springdata/jpa/multipleds/Application.java
+++ b/jpa/multiple-datasources/src/main/java/example/springdata/jpa/multipleds/Application.java
@@ -15,7 +15,7 @@
*/
package example.springdata.jpa.multipleds;
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.SpringApplication;
diff --git a/jpa/multiple-datasources/src/main/java/example/springdata/jpa/multipleds/DataInitializer.java b/jpa/multiple-datasources/src/main/java/example/springdata/jpa/multipleds/DataInitializer.java
index 4bd16cd1c..ff1e8f332 100644
--- a/jpa/multiple-datasources/src/main/java/example/springdata/jpa/multipleds/DataInitializer.java
+++ b/jpa/multiple-datasources/src/main/java/example/springdata/jpa/multipleds/DataInitializer.java
@@ -38,8 +38,8 @@
* create a dedicated annotation meta-annotated with {@code @Transactional("…")} to be able to refer to a particular
* data source without using String qualifiers.
*
- * Also, not that one cannot interact with both databases in a single, transactional method as transactions are thread
- * bound in Spring an thus only a single transaction can be active in a single thread. See {@link Application#init()}
+ * Also, note that one cannot interact with both databases in a single, transactional method as transactions are thread
+ * bound in Spring and thus only a single transaction can be active in a single thread. See {@link Application#init()}
* for how to orchestrate the calls.
*
* @author Oliver Gierke
diff --git a/jpa/multiple-datasources/src/main/java/example/springdata/jpa/multipleds/customer/Customer.java b/jpa/multiple-datasources/src/main/java/example/springdata/jpa/multipleds/customer/Customer.java
index f4715890f..f2cdbe1f2 100644
--- a/jpa/multiple-datasources/src/main/java/example/springdata/jpa/multipleds/customer/Customer.java
+++ b/jpa/multiple-datasources/src/main/java/example/springdata/jpa/multipleds/customer/Customer.java
@@ -23,10 +23,10 @@
import java.io.Serializable;
-import javax.persistence.Embeddable;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
/**
* Simple domain class representing a {@link Customer}.
diff --git a/jpa/multiple-datasources/src/main/java/example/springdata/jpa/multipleds/customer/CustomerConfig.java b/jpa/multiple-datasources/src/main/java/example/springdata/jpa/multipleds/customer/CustomerConfig.java
index 4823bca8c..510d9c51f 100644
--- a/jpa/multiple-datasources/src/main/java/example/springdata/jpa/multipleds/customer/CustomerConfig.java
+++ b/jpa/multiple-datasources/src/main/java/example/springdata/jpa/multipleds/customer/CustomerConfig.java
@@ -15,7 +15,7 @@
*/
package example.springdata.jpa.multipleds.customer;
-import javax.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityManagerFactory;
import javax.sql.DataSource;
import org.springframework.context.annotation.Bean;
@@ -32,7 +32,7 @@
* Configuration for the {@link Customer} slice of the system. A dedicated {@link DataSource},
* {@link JpaTransactionManager} and {@link EntityManagerFactory}. Note that there could of course be some deduplication
* with {@link example.springdata.jpa.multipleds.order.OrderConfig}. I just decided to keep it to focus on the
- * sepeartion of the two. Also, some overlaps might not even occur in real world scenarios (whether to create DDl or the
+ * separation of the two. Also, some overlaps might not even occur in real world scenarios (whether to create DDl or the
* like).
*
* @author Oliver Gierke
diff --git a/jpa/multiple-datasources/src/main/java/example/springdata/jpa/multipleds/order/Order.java b/jpa/multiple-datasources/src/main/java/example/springdata/jpa/multipleds/order/Order.java
index 0db09471f..c975bb49c 100644
--- a/jpa/multiple-datasources/src/main/java/example/springdata/jpa/multipleds/order/Order.java
+++ b/jpa/multiple-datasources/src/main/java/example/springdata/jpa/multipleds/order/Order.java
@@ -24,12 +24,12 @@
import java.util.ArrayList;
import java.util.List;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
import org.springframework.util.Assert;
diff --git a/jpa/multiple-datasources/src/main/java/example/springdata/jpa/multipleds/order/OrderConfig.java b/jpa/multiple-datasources/src/main/java/example/springdata/jpa/multipleds/order/OrderConfig.java
index 0c1bcd777..0aa133246 100644
--- a/jpa/multiple-datasources/src/main/java/example/springdata/jpa/multipleds/order/OrderConfig.java
+++ b/jpa/multiple-datasources/src/main/java/example/springdata/jpa/multipleds/order/OrderConfig.java
@@ -15,7 +15,7 @@
*/
package example.springdata.jpa.multipleds.order;
-import javax.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityManagerFactory;
import javax.sql.DataSource;
import org.springframework.context.annotation.Bean;
@@ -32,7 +32,7 @@
* Configuration for the {@link Order} slice of the system. A dedicated {@link DataSource},
* {@link JpaTransactionManager} and {@link EntityManagerFactory}. Note that there could of course be some deduplication
* with {@link example.springdata.jpa.multipleds.customer.CustomerConfig}. I just decided to keep it to focus on the
- * sepeartion of the two. Also, some overlaps might not even occur in real world scenarios (whether to create DDl or the
+ * separation of the two. Also, some overlaps might not even occur in real world scenarios (whether to create DDl or the
* like).
*
* @author Oliver Gierke
diff --git a/jpa/multiple-datasources/src/test/java/example/springdata/jpa/multipleds/customer/CustomerRepositoryTests.java b/jpa/multiple-datasources/src/test/java/example/springdata/jpa/multipleds/customer/CustomerRepositoryTests.java
index cc567cae0..645225f80 100644
--- a/jpa/multiple-datasources/src/test/java/example/springdata/jpa/multipleds/customer/CustomerRepositoryTests.java
+++ b/jpa/multiple-datasources/src/test/java/example/springdata/jpa/multipleds/customer/CustomerRepositoryTests.java
@@ -17,7 +17,7 @@
import static org.assertj.core.api.Assertions.*;
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
import org.junit.jupiter.api.Test;
diff --git a/jpa/multitenant/.gitignore b/jpa/multitenant/.gitignore
new file mode 100644
index 000000000..549e00a2a
--- /dev/null
+++ b/jpa/multitenant/.gitignore
@@ -0,0 +1,33 @@
+HELP.md
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/
diff --git a/jpa/multitenant/README.adoc b/jpa/multitenant/README.adoc
new file mode 100644
index 000000000..d4f21f927
--- /dev/null
+++ b/jpa/multitenant/README.adoc
@@ -0,0 +1,12 @@
+This is the parent project for a couple of examples demonstrating how to integrate Hibernates Multitenant feature with Spring Data JPA.
+
+There are three modules for the three examples.
+
+Each uses a different strategy to separate data by tenant:
+
+1. Partition tables by tenant id.
+2. Use a separate schema per tenant
+3. Use a separate database per tenant.
+
+_The contained projects are only examples how to use Hibernates Multitenant feature with Spring Data JPA.
+For any real application a decision has to be made how to scope a tenant. Storing it in a singleton as in the examples is for most cases not an appropriate solution._
diff --git a/jpa/multitenant/db/pom.xml b/jpa/multitenant/db/pom.xml
new file mode 100644
index 000000000..d13ebaf06
--- /dev/null
+++ b/jpa/multitenant/db/pom.xml
@@ -0,0 +1,42 @@
+
+
+ 4.0.0
+
+ hibernate-multitenant-db
+
+
+ org.springframework.data.examples
+ spring-data-jpa-hibernate-multitenant-examples
+ 4.0.0-SNAPSHOT
+
+
+ Hibernate Multitenant DB
+
+ Example project demonstrating the integration of Hibernates Multitenant feature with Spring Boot using separate databases.
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter-data-jpa
+
+
+
+ com.h2database
+ h2
+ runtime
+
+
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+
+
+
diff --git a/jpa/multitenant/db/src/main/java/example/springdata/jpa/hibernatemultitenant/db/Application.java b/jpa/multitenant/db/src/main/java/example/springdata/jpa/hibernatemultitenant/db/Application.java
new file mode 100644
index 000000000..e3863b9dc
--- /dev/null
+++ b/jpa/multitenant/db/src/main/java/example/springdata/jpa/hibernatemultitenant/db/Application.java
@@ -0,0 +1,11 @@
+package example.springdata.jpa.hibernatemultitenant.db;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class Application {
+ public static void main(String[] args) {
+ SpringApplication.run(Application.class, args);
+ }
+}
diff --git a/jpa/multitenant/db/src/main/java/example/springdata/jpa/hibernatemultitenant/db/NoOpConnectionProvider.java b/jpa/multitenant/db/src/main/java/example/springdata/jpa/hibernatemultitenant/db/NoOpConnectionProvider.java
new file mode 100644
index 000000000..8bd6f88e5
--- /dev/null
+++ b/jpa/multitenant/db/src/main/java/example/springdata/jpa/hibernatemultitenant/db/NoOpConnectionProvider.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2025 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
+ *
+ * http://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 example.springdata.jpa.hibernatemultitenant.db;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.Map;
+
+import javax.sql.DataSource;
+
+import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.engine.jdbc.connections.spi.MultiTenantConnectionProvider;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.hibernate.autoconfigure.HibernatePropertiesCustomizer;
+import org.springframework.stereotype.Component;
+
+@Component
+public class NoOpConnectionProvider implements MultiTenantConnectionProvider
@@ -50,9 +58,18 @@ * * @author Christoph Strobl */ +@Testcontainers @DataMongoTest class FluentMongoApiTests { + @Container // + private static MongoDBContainer mongoDBContainer = MongoContainers.getDefaultContainer(); + + @DynamicPropertySource + static void setProperties(DynamicPropertyRegistry registry) { + registry.add("spring.data.mongodb.uri", mongoDBContainer::getReplicaSetUrl); + } + @Autowired FluentMongoOperations mongoOps; /** @@ -107,7 +124,7 @@ void usePredefinedFinder() { @Test void fetchInterfaceProjection() { - var anakin = mongoOps.query(SWCharacter.class) // SWCharacter does only define the collection, id and name + var anakin = mongoOps.query(Jedi.class) // SWCharacter does only define the collection, id and name .as(Sith.class) // use an interface as return type to create a projection .matching(query(where("firstname").is("anakin"))) // so properties are taken as is .oneValue(); diff --git a/mongodb/fragment-spi/README.adoc b/mongodb/fragment-spi/README.adoc new file mode 100644 index 000000000..95eb32063 --- /dev/null +++ b/mongodb/fragment-spi/README.adoc @@ -0,0 +1,40 @@ += Spring Data - Fragment SPI Example + +This project contains a sample using `spring.factories` to register implementation details for a repository extension for MongoDB Vector Search that lives outside the project namespace. + +The project is divided into the `atlas-api`, providing the extension, and the `sample` using it. + +== atlas-api + +The `AtlasRepository` is the base interface containing a `vectorSearch` method that is implemented in `AtlasRepositoryFragment`. The configuration in `src/main/resources/META-INF/spring.factories` makes sure it is picked up by the spring data infrastructure. + +The implementation leverages `RepositoryMethodContext` to get hold of method invocation metadata to determine the collection name derived from the repositories domain type `
- * Note that text search is case insensitive and will also find entries like {@literal releases}. + * Note that text search is case-insensitive and will also find entries like {@literal releases}. */ @Test void findAllBlogPostsWithRelease() { diff --git a/mongodb/text-search/src/test/java/example/springdata/mongodb/textsearch/TextSearchTemplateTests.java b/mongodb/text-search/src/test/java/example/springdata/mongodb/textsearch/TextSearchTemplateTests.java index 5072a66a1..520f1dee2 100644 --- a/mongodb/text-search/src/test/java/example/springdata/mongodb/textsearch/TextSearchTemplateTests.java +++ b/mongodb/text-search/src/test/java/example/springdata/mongodb/textsearch/TextSearchTemplateTests.java @@ -1,11 +1,11 @@ /* - * Copyright 2014-2021 the original author or authors. + * Copyright 2025 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 + * http://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, @@ -18,25 +18,42 @@ import static example.springdata.mongodb.util.ConsoleResultPrinter.*; import static org.springframework.data.mongodb.core.query.Query.*; +import example.springdata.mongodb.util.MongoContainers; + import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.data.mongo.DataMongoTest; +import org.springframework.boot.data.mongodb.test.autoconfigure.DataMongoTest; import org.springframework.data.mongodb.core.MongoOperations; import org.springframework.data.mongodb.core.query.TextCriteria; import org.springframework.data.mongodb.core.query.TextQuery; +import org.springframework.test.context.DynamicPropertyRegistry; +import org.springframework.test.context.DynamicPropertySource; + +import org.testcontainers.junit.jupiter.Container; +import org.testcontainers.junit.jupiter.Testcontainers; +import org.testcontainers.mongodb.MongoDBContainer; /** * @author Christoph Strobl * @author Thomas Darimont */ +@Testcontainers @DataMongoTest class TextSearchTemplateTests { + @Container // + private static MongoDBContainer mongoDBContainer = MongoContainers.getDefaultContainer(); + + @DynamicPropertySource + static void setProperties(DynamicPropertyRegistry registry) { + registry.add("spring.data.mongodb.uri", mongoDBContainer::getReplicaSetUrl); + } + @Autowired MongoOperations operations; /** - * Show how to do simple matching. Note that text search is case insensitive and will also find entries like + * Show how to do simple matching. Note that text search is case-insensitive and will also find entries like * {@literal releases}. */ @Test diff --git a/mongodb/text-search/src/test/resources/application.properties b/mongodb/text-search/src/test/resources/application.properties deleted file mode 100644 index e9170be4d..000000000 --- a/mongodb/text-search/src/test/resources/application.properties +++ /dev/null @@ -1 +0,0 @@ -logging.level.example.springdata=INFO diff --git a/mongodb/transactions/pom.xml b/mongodb/transactions/pom.xml index a73c56409..696886223 100644 --- a/mongodb/transactions/pom.xml +++ b/mongodb/transactions/pom.xml @@ -5,7 +5,7 @@
Search
-
+
-
+
-
+
-
+
-
+
@@ -69,17 +73,17 @@ City
Street
Email
-
+
- 1.
+ 1.
- ![]()
+ ![]()
Firstname
Lastname
- Naionality
+ Nationality
City
Street
Email
@@ -92,4 +96,4 @@