HHH-16261 - Avoid explicit use of ElementKind.RECORD to make code com…

…pilable under JDK 11
hibernate · Apr 25, 2023 · 0b1d1a1 · 0b1d1a1
1 parent bece9e9
commit 0b1d1a1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/...amodel-generator/src/main/java/org/hibernate/jpamodelgen/JPAMetaModelEntityProcessor.java b/...amodel-generator/src/main/java/org/hibernate/jpamodelgen/JPAMetaModelEntityProcessor.java
@@ -223,7 +223,7 @@ private boolean isJPAEntity(Element element) {
 	private void handleRootElementAnnotationMirrors(final Element element) {
 		List<? extends AnnotationMirror> annotationMirrors = element.getAnnotationMirrors();
 		for ( AnnotationMirror mirror : annotationMirrors ) {
-			if ( !ElementKind.CLASS.equals( element.getKind() ) && !ElementKind.RECORD.equals( element.getKind() ) ) {
+			if ( !element.getKind().isClass() || ElementKind.ENUM.equals( element.getKind() ) ) {
 				continue;
 			}
 

diff --git a/...or/src/main/java/org/hibernate/jpamodelgen/annotation/MetaAttributeGenerationVisitor.java b/...or/src/main/java/org/hibernate/jpamodelgen/annotation/MetaAttributeGenerationVisitor.java
@@ -316,7 +316,8 @@ public Boolean visitDeclared(DeclaredType declaredType, Element element) {
 			return Boolean.TRUE;
 		}
 
-		if ( ElementKind.CLASS.equals( element.getKind() ) || ElementKind.INTERFACE.equals( element.getKind() ) || ElementKind.RECORD.equals( element.getKind() ) ) {
+		if ( ( element.getKind().isClass() && !ElementKind.ENUM.equals( element.getKind() ) ) ||
+				ElementKind.INTERFACE.equals( element.getKind() ) ) {
 			TypeElement typeElement = ( (TypeElement) element );
 			String typeName = typeElement.getQualifiedName().toString();
 			if ( Constants.BASIC_TYPES.contains( typeName ) ) {