Spring/spring-data-jpa
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup after rebase on 2.6 release.

Browse Source 
See #2316, #2305, #2294 and #2269
This commit is contained in:
Jens Schauder
2021-11-16 14:18:33 +01:00
parent ea51ee8c74
commit 033b4c7db4
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/org/springframework/data/jpa/repository/support/EntityGraphFactory.java → spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/EntityGraphFactory.java
View File

@@ -17,9 +17,9 @@ package org.springframework.data.jpa.repository.support;
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;

2
spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/FetchableFluentQueryByPredicate.java
View File

@@ -23,7 +23,7 @@ import java.util.function.BiFunction;
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;

6
src/test/java/org/springframework/data/jpa/repository/support/EntityGraphFactoryUnitTests.java → spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/support/EntityGraphFactoryUnitTests.java
View File

@@ -20,9 +20,9 @@ import static org.mockito.Mockito.*;
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;