#83 - Add more "metadata" to ClassDetails

Author: sebersole

src/main/java/org/hibernate/models/internal/SimpleClassDetails.java

@@ -85,6 +85,16 @@ public boolean isAbstract() {
 		return ModifierUtils.isAbstract( clazz.getModifiers() );
 	}
 
+	@Override
+	public boolean isInterface() {
+		return clazz.isInterface();
+	}
+
+	@Override
+	public boolean isEnum() {
+		return clazz.isEnum();
+	}
+
 	@Override
 	public boolean isRecord() {
 		return clazz.isRecord();

src/main/java/org/hibernate/models/internal/dynamic/DynamicClassDetails.java

@@ -99,6 +99,18 @@ public boolean isAbstract() {
 		return isAbstract;
 	}
 
+	@Override
+	public boolean isInterface() {
+		// we never consider dynamic classes as interfaces
+		return false;
+	}
+
+	@Override
+	public boolean isEnum() {
+		// a dynamic enum makes no sense
+		return false;
+	}
+
 	@Override
 	public boolean isRecord() {
 		return false;

src/main/java/org/hibernate/models/internal/jandex/JandexClassDetails.java

@@ -134,6 +134,16 @@ public boolean isAbstract() {
 		return Modifier.isAbstract( classInfo.flags() );
 	}
 
+	@Override
+	public boolean isInterface() {
+		return classInfo.isInterface();
+	}
+
+	@Override
+	public boolean isEnum() {
+		return classInfo.isEnum();
+	}
+
 	@Override
 	public boolean isRecord() {
 		return classInfo.isRecord();

src/main/java/org/hibernate/models/internal/jdk/JdkClassDetails.java

@@ -40,8 +40,8 @@ public class JdkClassDetails extends AbstractJdkAnnotationTarget implements Clas
 	private final Class<?> managedClass;
 
 	private final ClassDetails superClass;
-	private TypeDetails genericSuperType;
 	private List<TypeDetails> interfaces;
+	private TypeDetails genericSuperType;
 	private List<TypeVariableDetails> typeParameters;
 
 	private List<FieldDetails> fields;
@@ -61,19 +61,20 @@ public JdkClassDetails(
 		super( managedClass::getAnnotations, modelContext );
 		this.name = name;
 		this.managedClass = managedClass;
+		this.superClass = determineSuperClass( managedClass, modelContext );
+	}
 
-		final ClassDetailsRegistry classDetailsRegistry = modelContext.getClassDetailsRegistry();
-
+	private static ClassDetails determineSuperClass(Class<?> managedClass, SourceModelBuildingContext modelContext) {
 		final Class<?> superclass = managedClass.getSuperclass();
 		if ( superclass == null ) {
-			superClass = null;
-		}
-		else {
-			superClass = classDetailsRegistry.resolveClassDetails(
-					superclass.getName(),
-					(n) -> JdkBuilders.buildClassDetailsStatic( superclass, modelContext )
-			);
+			return null;
 		}
+
+		final ClassDetailsRegistry classDetailsRegistry = modelContext.getClassDetailsRegistry();
+		return classDetailsRegistry.resolveClassDetails(
+				superclass.getName(),
+				(n) -> JdkBuilders.buildClassDetailsStatic( superclass, modelContext )
+		);
 	}
 
 	@Override
@@ -102,6 +103,16 @@ public boolean isAbstract() {
 		return Modifier.isAbstract( managedClass.getModifiers() );
 	}
 
+	@Override
+	public boolean isInterface() {
+		return managedClass.isInterface();
+	}
+
+	@Override
+	public boolean isEnum() {
+		return managedClass.isEnum();
+	}
+
 	@Override
 	public boolean isRecord() {
 		return managedClass.isRecord();

src/main/java/org/hibernate/models/spi/ClassDetails.java

@@ -78,6 +78,16 @@ default Kind getKind() {
 	 */
 	boolean isAbstract();
 
+	/**
+	 * Whether this class is an interface
+	 */
+	boolean isInterface();
+
+	/**
+	 * Whether this class is an enum
+	 */
+	boolean isEnum();
+
 	/**
 	 * Where the class is a Java record
 	 */
@@ -88,6 +98,9 @@ default Kind getKind() {
 	 */
 	ClassDetails getSuperClass();
 
+	/**
+	 * Generic type information for this class.
+	 */
 	TypeDetails getGenericSuperType();
 
 	/**

src/test/java/org/hibernate/models/classes/AnEnum.java

@@ -0,0 +1,15 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
+ */
+
+package org.hibernate.models.classes;
+
+/**
+ * @author Steve Ebersole
+ */
+public enum AnEnum {
+	A,B,C
+}

src/test/java/org/hibernate/models/classes/EnumTests.java

@@ -0,0 +1,49 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
+ */
+
+package org.hibernate.models.classes;
+
+import org.hibernate.models.SourceModelTestHelper;
+import org.hibernate.models.internal.SourceModelBuildingContextImpl;
+import org.hibernate.models.spi.ClassDetails;
+import org.hibernate.models.spi.ClassDetailsRegistry;
+
+import org.junit.jupiter.api.Test;
+
+import org.jboss.jandex.Index;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author Steve Ebersole
+ */
+public class EnumTests {
+	@Test
+	void basicEnumTestWithJandex() {
+		final Index index = SourceModelTestHelper.buildJandexIndex( AnEnum.class );
+		basicEnumTest( index );
+	}
+
+	@Test
+	void basicRootTestWithoutJandex() {
+		basicEnumTest( null );
+	}
+
+	private void basicEnumTest(Index index) {
+		final SourceModelBuildingContextImpl buildingContext = SourceModelTestHelper.createBuildingContext(
+				index,
+				AnEnum.class
+		);
+		final ClassDetailsRegistry classDetailsRegistry = buildingContext.getClassDetailsRegistry();
+
+		final ClassDetails enumClassDetails = classDetailsRegistry.getClassDetails( AnEnum.class.getName() );
+		assertThat( enumClassDetails.isEnum() ).isTrue();
+		assertThat( enumClassDetails.isRecord() ).isFalse();
+		assertThat( enumClassDetails.isInterface() ).isFalse();
+		assertThat( enumClassDetails.isAbstract() ).isFalse();
+	}
+}

src/test/java/org/hibernate/models/classes/InheritanceTests.java

@@ -175,6 +175,7 @@ void testIsImplementorWithoutJandex() {
 	private void testIsImplementor(Index index) {
 		final SourceModelBuildingContextImpl buildingContext = SourceModelTestHelper.createBuildingContext(
 				index,
+				Intf.class,
 				RootClass.class,
 				TrunkClass.class,
 				BranchClass.class,
@@ -185,12 +186,18 @@ private void testIsImplementor(Index index) {
 		final ClassDetails rootClassDetails = classDetailsRegistry.getClassDetails( RootClass.class.getName() );
 		assertThat( rootClassDetails.isImplementor( Intf.class ) ).isFalse();
 		assertThat( rootClassDetails.getSuperClass() ).isSameAs( ClassDetails.OBJECT_CLASS_DETAILS );
+		assertThat( rootClassDetails.isInterface() ).isFalse();
 
 		final ClassDetails branchClassDetails = classDetailsRegistry.getClassDetails( BranchClass.class.getName() );
 		assertThat( branchClassDetails.isImplementor( Intf.class ) ).isTrue();
+		assertThat( branchClassDetails.isInterface() ).isFalse();
 
 		final ClassDetails leafClassDetails = classDetailsRegistry.getClassDetails( LeafClass.class.getName() );
 		assertThat( leafClassDetails.isImplementor( Intf.class ) ).isTrue();
+		assertThat( leafClassDetails.isInterface() ).isFalse();
+
+		final ClassDetails interfaceDetails = classDetailsRegistry.getClassDetails( Intf.class.getName() );
+		assertThat( interfaceDetails.isInterface() ).isTrue();
 	}
 
 	@Test