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

DATAJPA-1530 - Use ProxyUtils to detect Hibernate proxies.

Browse Source 
Original pull request: #376.
This commit is contained in:
Jens Schauder
2019-04-24 14:55:03 +02:00
committed by Mark Paluch
parent 259d54f0ec
commit 6eca6c99fc
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/org/springframework/data/jpa/repository/support/JpaMetamodelEntityInformation.java
View File

@@ -37,9 +37,9 @@ import org.springframework.beans.BeanWrapperImpl;
import org.springframework.core.annotation.AnnotationUtils;
import org.springframework.data.jpa.util.JpaMetamodel;
import org.springframework.data.util.DirectFieldAccessFallbackBeanWrapper;
import org.springframework.data.util.ProxyUtils;
import org.springframework.lang.Nullable;
import org.springframework.util.Assert;
import org.springframework.util.ClassUtils;
/**
* Implementation of {@link org.springframework.data.repository.core.EntityInformation} that uses JPA {@link Metamodel}
@@ -352,7 +352,7 @@ public class JpaMetamodelEntityInformation<T, ID> extends JpaEntityInformationSu
// Derive the identifier from the nested entity that is part of the composite key.
@SuppressWarnings("rawtypes")
JpaMetamodelEntityInformation nestedEntityInformation = new JpaMetamodelEntityInformation(
ClassUtils.getUserClass(value), this.metamodel);
ProxyUtils.getUserClass(value), this.metamodel);
if (!nestedEntityInformation.getJavaType().isAnnotationPresent(IdClass.class)) {
@@ -421,7 +421,7 @@ public class JpaMetamodelEntityInformation<T, ID> extends JpaEntityInformationSu
}
try {
ManagedType<? extends Object> managedType = this.metamodel.managedType(ClassUtils.getUserClass(value));
ManagedType<? extends Object> managedType = this.metamodel.managedType(ProxyUtils.getUserClass(value));
return managedType != null && managedType.getPersistenceType() == PersistenceType.ENTITY;
} catch (IllegalArgumentException iae) {
// no mapped type