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

DATAJPA-1560 - Polishing.

Browse Source 
Use JpaMetamodel.isJpaManaged(…) in findVersionAttribute(…) to align with other implementations.

Original pull request: #384.
This commit is contained in:
Mark Paluch
2019-07-03 15:59:40 +02:00
parent d96d9208c5
commit 2aa62034b9
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -125,19 +125,17 @@ public class JpaMetamodelEntityInformation<T, ID> extends JpaEntityInformationSu
Class<?> superType = type.getJavaType().getSuperclass();
try {
ManagedType<?> managedSuperType = metamodel.managedType(superType);
if (!(managedSuperType instanceof IdentifiableType)) {
return Optional.empty();
}
return findVersionAttribute((IdentifiableType<T>) managedSuperType, metamodel);
} catch (IllegalArgumentException o_O) {
if (!JpaMetamodel.of(metamodel).isJpaManaged(superType)) {
return Optional.empty();
}
ManagedType<?> managedSuperType = metamodel.managedType(superType);
if (!(managedSuperType instanceof IdentifiableType)) {
return Optional.empty();
}
return findVersionAttribute((IdentifiableType<T>) managedSuperType, metamodel);
}
/*