From 2aa62034b99242316e09d9ae87ffdf733043eecb Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 3 Jul 2019 15:59:40 +0200 Subject: [PATCH] DATAJPA-1560 - Polishing. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use JpaMetamodel.isJpaManaged(…) in findVersionAttribute(…) to align with other implementations. Original pull request: #384. --- .../JpaMetamodelEntityInformation.java | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/springframework/data/jpa/repository/support/JpaMetamodelEntityInformation.java b/src/main/java/org/springframework/data/jpa/repository/support/JpaMetamodelEntityInformation.java index 83e2f829c..06d2ea77f 100644 --- a/src/main/java/org/springframework/data/jpa/repository/support/JpaMetamodelEntityInformation.java +++ b/src/main/java/org/springframework/data/jpa/repository/support/JpaMetamodelEntityInformation.java @@ -125,19 +125,17 @@ public class JpaMetamodelEntityInformation extends JpaEntityInformationSu Class superType = type.getJavaType().getSuperclass(); - try { - - ManagedType managedSuperType = metamodel.managedType(superType); - - if (!(managedSuperType instanceof IdentifiableType)) { - return Optional.empty(); - } - - return findVersionAttribute((IdentifiableType) 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) managedSuperType, metamodel); } /*