Update Spring APIs to Spring Boot 3

bom/application/pom.xml

@@ -171,10 +171,10 @@
  <javaparser.version>3.26.0</javaparser.version>
  <hibernate-quarkus-local-cache.version>0.3.0</hibernate-quarkus-local-cache.version>
  <flapdoodle.mongo.version>4.13.1</flapdoodle.mongo.version>
- <quarkus-spring-api.version>5.2.SP7</quarkus-spring-api.version>
- <quarkus-spring-data-api.version>2.1.SP2</quarkus-spring-data-api.version>
- <quarkus-spring-security-api.version>5.4.Final</quarkus-spring-security-api.version>
- <quarkus-spring-boot-api.version>2.1.SP1</quarkus-spring-boot-api.version>
+ <quarkus-spring-api.version>6.1.SP2</quarkus-spring-api.version>
+ <quarkus-spring-data-api.version>3.2.SP1</quarkus-spring-data-api.version>
+ <quarkus-spring-security-api.version>6.2</quarkus-spring-security-api.version>
+ <quarkus-spring-boot-api.version>3.2</quarkus-spring-boot-api.version>
  <mockito.version>5.12.0</mockito.version>
  <jna.version>5.8.0</jna.version><!-- should satisfy both testcontainers and mongodb -->
  <quarkus-security.version>2.0.3.Final</quarkus-security.version>
@@ -5887,6 +5887,11 @@
  <artifactId>quarkus-spring-beans-api</artifactId>
  <version>${quarkus-spring-api.version}</version>
  </dependency>
+ <dependency>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-spring-aop-api</artifactId>
+ <version>${quarkus-spring-api.version}</version>
+ </dependency>
  <dependency>
  <groupId>io.quarkus</groupId>
  <artifactId>quarkus-spring-data-jpa-api</artifactId>

extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/DotNames.java

@@ -43,6 +43,8 @@
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.CrudRepository;
+import org.springframework.data.repository.ListCrudRepository;
+import org.springframework.data.repository.ListPagingAndSortingRepository;
 import org.springframework.data.repository.NoRepositoryBean;
 import org.springframework.data.repository.PagingAndSortingRepository;
 import org.springframework.data.repository.Repository;
@@ -55,15 +57,22 @@ public final class DotNames {
  .createSimple(Repository.class.getName());
  public static final DotName SPRING_DATA_CRUD_REPOSITORY = DotName
  .createSimple(CrudRepository.class.getName());
+
+ public static final DotName SPRING_DATA_LIST_CRUD_REPOSITORY = DotName
+ .createSimple(ListCrudRepository.class.getName());
  public static final DotName SPRING_DATA_PAGING_REPOSITORY = DotName
  .createSimple(PagingAndSortingRepository.class.getName());
+
+ public static final DotName SPRING_DATA_LIST_PAGING_REPOSITORY = DotName
+ .createSimple(ListPagingAndSortingRepository.class.getName());
  public static final DotName SPRING_DATA_JPA_REPOSITORY = DotName
  .createSimple(JpaRepository.class.getName());
  public static final DotName SPRING_DATA_REPOSITORY_DEFINITION = DotName
  .createSimple(RepositoryDefinition.class.getName());
 
  public static final Set<DotName> SUPPORTED_REPOSITORIES = new HashSet<>(Arrays.asList(
- SPRING_DATA_JPA_REPOSITORY, SPRING_DATA_PAGING_REPOSITORY, SPRING_DATA_CRUD_REPOSITORY, SPRING_DATA_REPOSITORY));
+ SPRING_DATA_JPA_REPOSITORY, SPRING_DATA_PAGING_REPOSITORY, SPRING_DATA_LIST_PAGING_REPOSITORY,
+ SPRING_DATA_CRUD_REPOSITORY, SPRING_DATA_LIST_CRUD_REPOSITORY, SPRING_DATA_REPOSITORY));
 
  public static final DotName SPRING_DATA_NO_REPOSITORY_BEAN = DotName
  .createSimple(NoRepositoryBean.class.getName());

extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/SpringDataJPAProcessor.java

@@ -27,6 +27,8 @@
 import org.springframework.data.domain.Persistable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.repository.CrudRepository;
+import org.springframework.data.repository.ListCrudRepository;
+import org.springframework.data.repository.ListPagingAndSortingRepository;
 import org.springframework.data.repository.PagingAndSortingRepository;
 import org.springframework.data.repository.Repository;
 import org.springframework.data.repository.query.QueryByExampleExecutor;
@@ -80,7 +82,9 @@ void contributeClassesToIndex(BuildProducer<AdditionalIndexedClassesBuildItem> a
  additionalIndexedClasses.produce(new AdditionalIndexedClassesBuildItem(
  Repository.class.getName(),
  CrudRepository.class.getName(),
+ ListCrudRepository.class.getName(),
  PagingAndSortingRepository.class.getName(),
+ ListPagingAndSortingRepository.class.getName(),
  JpaRepository.class.getName(),
  QueryByExampleExecutor.class.getName()));
  }

extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/BookListCrudRepository.java

@@ -0,0 +1,6 @@
+package io.quarkus.spring.data.deployment;
+
+import org.springframework.data.repository.ListCrudRepository;
+
+public interface BookListCrudRepository extends ListCrudRepository<Book, Integer> {
+}

extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/BookListCrudRepositoryTest.java

@@ -0,0 +1,79 @@
+package io.quarkus.spring.data.deployment;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.Arrays;
+import java.util.List;
+
+import jakarta.inject.Inject;
+import jakarta.transaction.Transactional;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Order;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
+public class BookListCrudRepositoryTest {
+
+ @RegisterExtension
+ static final QuarkusUnitTest TEST = new QuarkusUnitTest().setArchiveProducer(
+ () -> ShrinkWrap.create(JavaArchive.class)
+ .addAsResource("import_books.sql", "import.sql")
+ .addClasses(Book.class, BookListCrudRepository.class))
+ .withConfigurationResource("application.properties");
+
+ @Inject
+ BookListCrudRepository repo;
+
+ @Test
+ @Order(1)
+ @Transactional
+ public void shouldListAllBooks() {
+ List<Book> all = repo.findAll();
+ assertThat(all).isNotEmpty();
+ assertThat(all).hasSize(3);
+ assertThat(all.stream().map(Book::getName)).containsExactlyInAnyOrder("Talking to Strangers", "The Ascent of Money",
+ "A Short History of Everything");
+ }
+
+ @Test
+ @Order(2)
+ @Transactional
+ public void shouldListBooksWithIds() {
+ List<Integer> ids = Arrays.asList(1, 2);
+ List<Book> all = repo.findAllById(ids);
+ assertThat(all).isNotEmpty();
+ assertThat(all).hasSize(2);
+ assertThat(all.stream().map(Book::getName)).containsExactlyInAnyOrder("Talking to Strangers", "The Ascent of Money");
+ }
+
+ @Test
+ @Order(3)
+ @Transactional
+ public void shouldSaveBooks() {
+ Book harryPotterAndTheChamberOfSecrets = populateBook(4, "Harry Potter and the Chamber of Secrets");
+ Book harryPotterAndThePrisonerOfAzkaban = populateBook(5, "Harry Potter and the Prisoner of Azkaban");
+ Book harryPotterAndTheGlobetOfFire = populateBook(6, "Harry Potter and the Globet of Fire");
+ List<Book> books = Arrays.asList(harryPotterAndTheChamberOfSecrets, harryPotterAndThePrisonerOfAzkaban,
+ harryPotterAndTheGlobetOfFire);
+ List<Book> all = repo.saveAll(books);
+ assertThat(all).isNotEmpty();
+ assertThat(all).hasSize(3);
+ assertThat(all.stream().map(Book::getName)).containsExactlyInAnyOrder("Harry Potter and the Chamber of Secrets",
+ "Harry Potter and the Prisoner of Azkaban", "Harry Potter and the Globet of Fire");
+ }
+
+ private Book populateBook(Integer id, String title) {
+ Book book = new Book();
+ book.setBid(id);
+ book.setName(title);
+ return book;
+ }
+
+}

extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/BookListPagingAndSortingRepository.java

@@ -0,0 +1,6 @@
+package io.quarkus.spring.data.deployment;
+
+import org.springframework.data.repository.ListPagingAndSortingRepository;
+
+public interface BookListPagingAndSortingRepository extends ListPagingAndSortingRepository<Book, Integer> {
+}

extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/BookPagingAndSortingRepositoryTest.java

@@ -0,0 +1,111 @@
+package io.quarkus.spring.data.deployment;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.List;
+
+import jakarta.inject.Inject;
+import jakarta.transaction.Transactional;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+public class BookPagingAndSortingRepositoryTest {
+
+ @RegisterExtension
+ static final QuarkusUnitTest TEST = new QuarkusUnitTest().setArchiveProducer(
+ () -> ShrinkWrap.create(JavaArchive.class)
+ .addAsResource("import_hp_books.sql", "import.sql")
+ .addClasses(Book.class, BookListPagingAndSortingRepository.class))
+ .withConfigurationResource("application.properties");
+
+ @Inject
+ BookListPagingAndSortingRepository repo;
+
+ @Test
+ // @Order(1)
+ @Transactional
+ public void shouldReturnFirstPageOfTwoBooks() {
+ Pageable pageRequest = PageRequest.of(0, 2);
+ Page<Book> result = repo.findAll(pageRequest);
+
+ assertThat(result).isNotEmpty();
+ assertThat(result).hasSize(2);
+ assertThat(result.stream().map(Book::getBid)).containsExactly(1, 2);
+ }
+
+ @Test
+ @Transactional
+ public void shouldReturnSecondPageOfSizeTwoBooks() {
+ Pageable pageRequest = PageRequest.of(1, 2);
+ Page<Book> result = repo.findAll(pageRequest);
+
+ assertThat(result).isNotEmpty();
+ assertThat(result).hasSize(2);
+ assertThat(result.stream().map(Book::getBid)).containsExactly(3, 4);
+ }
+
+ @Test
+ @Transactional
+ public void shouldReturnLastPage() {
+ Pageable pageRequest = PageRequest.of(2, 2);
+ Page<Book> result = repo.findAll(pageRequest);
+
+ assertThat(result).isNotEmpty();
+ assertThat(result).hasSize(2);
+ assertThat(result.stream().map(Book::getBid)).containsExactly(5, 6);
+ }
+
+ @Test
+ @Transactional
+ void shouldReturnSortedByNameAscAndPagedResult() {
+ Pageable pageRequest = PageRequest.of(0, 3, Sort.by("name"));
+
+ Page<Book> result = repo.findAll(pageRequest);
+ assertThat(result).isNotEmpty();
+ assertThat(result).hasSize(3);
+ assertThat(result.stream().map(Book::getBid)).containsExactly(2, 7, 4);
+
+ }
+
+ @Test
+ @Transactional
+ void shouldReturnSortedByNameDescAndPagedResult() {
+ Pageable pageRequest = PageRequest.of(0, 5, Sort.by("name").descending());
+
+ Page<Book> result = repo.findAll(pageRequest);
+ assertThat(result).isNotEmpty();
+ assertThat(result).hasSize(5);
+ assertThat(result.stream().map(Book::getBid)).containsExactly(3, 1, 5, 6, 4);
+
+ }
+
+ @Test
+ @Transactional
+ void shouldReturnAllBooksSortedByNameDescResult() {
+ List<Book> result = repo.findAll(Sort.by("name").descending());
+ assertThat(result).isNotEmpty();
+ assertThat(result).hasSize(7);
+ assertThat(result.stream().map(Book::getBid)).containsExactly(3, 1, 5, 6, 4, 7, 2);
+
+ }
+
+ @Test
+ @Transactional
+ void shouldReturnAllBooksSortedByNameAscResult() {
+ List<Book> result = repo.findAll(Sort.by("name"));
+ assertThat(result).isNotEmpty();
+ assertThat(result).hasSize(7);
+ assertThat(result.stream().map(Book::getBid)).containsExactly(2, 7, 4, 6, 5, 1, 3);
+
+ }
+
+}

extensions/spring-data-jpa/deployment/src/test/resources/import_hp_books.sql

@@ -0,0 +1,7 @@
+INSERT INTO book(bid, name) VALUES (1, 'Harry Potter and the Philosophers Stone');
+INSERT INTO book(bid, name) VALUES (2, 'Harry Potter and the Chamber of Secrets');
+INSERT INTO book(bid, name) VALUES (3, 'Harry Potter and the Prisoner of Azkaban');
+INSERT INTO book(bid, name) VALUES (4, 'Harry Potter and the Goblet of Fire');
+INSERT INTO book(bid, name) VALUES (5, 'Harry Potter and the Order of the Phoenix');
+INSERT INTO book(bid, name) VALUES (6, 'Harry Potter and the Half-Blood Prince');
+INSERT INTO book(bid, name) VALUES (7, 'Harry Potter and the Deathly Hallows');

extensions/spring-data-jpa/runtime/pom.xml

@@ -38,10 +38,19 @@
  <groupId>io.quarkus</groupId>
  <artifactId>quarkus-spring-core-api</artifactId>
  </dependency>
+ <dependency>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-spring-aop-api</artifactId>
+ </dependency>
  <dependency>
  <groupId>io.quarkus</groupId>
  <artifactId>quarkus-spring-boot-orm-api</artifactId>
  </dependency>
+ <dependency>
+ <groupId>org.graalvm.sdk</groupId>
+ <artifactId>nativeimage</artifactId>
+ <scope>provided</scope>
+ </dependency>
  </dependencies>
 
  <build>

extensions/spring-data-jpa/runtime/src/main/java/io/quarkus/spring/data/runtime/Target_org_springframework_data_domain_Sort_TypedSort.java

@@ -0,0 +1,16 @@
+package io.quarkus.spring.data.runtime;
+
+import com.oracle.svm.core.annotate.Substitute;
+import com.oracle.svm.core.annotate.TargetClass;
+import com.oracle.svm.core.annotate.TargetElement;
+
+@TargetClass(className = "org.springframework.data.domain.Sort", innerClass = "TypedSort")
+public final class Target_org_springframework_data_domain_Sort_TypedSort {
+
+ @Substitute
+ @TargetElement(name = TargetElement.CONSTRUCTOR_NAME)
+ public Target_org_springframework_data_domain_Sort_TypedSort(Class<?> type) {
+
+ }
+
+}