From 79573ae54d686d5474340a4c39bc0dcc29ebc7e0 Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Tue, 16 Nov 2021 14:18:33 +0100 Subject: [PATCH] Cleanup after rebase on 2.6 release. See #2316, #2305, #2294 and #2269 --- .../data/jpa/repository/support/EntityGraphFactory.java | 6 +++--- .../repository/support/FetchableFluentQueryByPredicate.java | 2 +- .../jpa/repository/support/EntityGraphFactoryUnitTests.java | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) rename {src => spring-data-jpa/src}/main/java/org/springframework/data/jpa/repository/support/EntityGraphFactory.java (93%) rename {src => spring-data-jpa/src}/test/java/org/springframework/data/jpa/repository/support/EntityGraphFactoryUnitTests.java (95%) diff --git a/src/main/java/org/springframework/data/jpa/repository/support/EntityGraphFactory.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/EntityGraphFactory.java similarity index 93% rename from src/main/java/org/springframework/data/jpa/repository/support/EntityGraphFactory.java rename to spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/EntityGraphFactory.java index a619916bf9..68edc9d058 100644 --- a/src/main/java/org/springframework/data/jpa/repository/support/EntityGraphFactory.java +++ b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/EntityGraphFactory.java @@ -17,9 +17,9 @@ import java.util.Set; -import javax.persistence.EntityGraph; -import javax.persistence.EntityManager; -import javax.persistence.Subgraph; +import jakarta.persistence.EntityGraph; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Subgraph; import org.springframework.data.mapping.PropertyPath; diff --git a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/FetchableFluentQueryByPredicate.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/FetchableFluentQueryByPredicate.java index f71eeacc0b..7f8522db0c 100644 --- a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/FetchableFluentQueryByPredicate.java +++ b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/FetchableFluentQueryByPredicate.java @@ -23,7 +23,7 @@ import java.util.function.Function; import java.util.stream.Stream; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.springframework.dao.IncorrectResultSizeDataAccessException; import org.springframework.data.domain.Page; diff --git a/src/test/java/org/springframework/data/jpa/repository/support/EntityGraphFactoryUnitTests.java b/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/support/EntityGraphFactoryUnitTests.java similarity index 95% rename from src/test/java/org/springframework/data/jpa/repository/support/EntityGraphFactoryUnitTests.java rename to spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/support/EntityGraphFactoryUnitTests.java index e0ac1ce52c..448bd0adbd 100644 --- a/src/test/java/org/springframework/data/jpa/repository/support/EntityGraphFactoryUnitTests.java +++ b/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/support/EntityGraphFactoryUnitTests.java @@ -20,9 +20,9 @@ import java.util.HashSet; -import javax.persistence.EntityGraph; -import javax.persistence.EntityManager; -import javax.persistence.Subgraph; +import jakarta.persistence.EntityGraph; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Subgraph; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test;