#128 - Track interface implementors

Author: sebersole

hibernate-models/src/main/java/org/hibernate/models/internal/AbstractClassDetailsRegistry.java

@@ -74,8 +74,8 @@ public Set<ClassDetails> getDirectSubtypes(String typeName) {
 	}
 
 	@Override
-	public void forEachDirectSubType(String superTypeName, ClassDetailsConsumer consumer) {
-		final List<ClassDetails> directSubTypes = getDirectSubTypes( superTypeName );
+	public void forEachDirectSubtype(String typeName, ClassDetailsConsumer consumer) {
+		final List<ClassDetails> directSubTypes = getDirectSubTypes( typeName );
 		if ( directSubTypes == null ) {
 			return;
 		}
@@ -128,7 +128,7 @@ public void walkImplementors(String base, boolean includeBase, ClassDetailsConsu
 			consumer.consume( baseDetails );
 		}
 
-		forEachDirectSubType( base, (subType) -> {
+		forEachDirectSubtype( base, (subType) -> {
 			consumer.consume( subType );
 			walkSubtypes( subType, consumer );
 		} );
@@ -140,7 +140,7 @@ public void walkImplementors(String base, boolean includeBase, ClassDetailsConsu
 	}
 
 	private void walkSubtypes(ClassDetails base, ClassDetailsConsumer consumer) {
-		forEachDirectSubType( base.getName(), (subType) -> {
+		forEachDirectSubtype( base.getName(), (subType) -> {
 			consumer.consume( subType );
 			walkSubtypes( subType, consumer );
 		} );
@@ -156,7 +156,7 @@ private void walkInterfaceImplementors(ClassDetails implementor, ClassDetailsCon
 		}
 		else {
 			// the direct interface implementor is itself a class...
-			forEachDirectSubType( implementor.getName(), (subtype) -> {
+			forEachDirectSubtype( implementor.getName(), (subtype) -> {
 				consumer.consume( subtype );
 				walkSubtypes( subtype, consumer );
 			} );

hibernate-models/src/main/java/org/hibernate/models/spi/ClassDetailsRegistry.java

@@ -70,9 +70,18 @@ default ClassDetails getClassDetails(String name) {
 
 	/**
 	 * Visit each direct subtype of the named managed-class
+	 *
+	 * @deprecated Use {@linkplain #forEachDirectSubtype} instead.
 	 */
-	@SuppressWarnings("unused")
-	void forEachDirectSubType(String superTypeName, ClassDetailsConsumer consumer);
+	@Deprecated
+	default void forEachDirectSubType(String typeName, ClassDetailsConsumer consumer) {
+		forEachDirectSubtype( typeName, consumer );
+	}
+
+	/**
+	 * Visit each direct subtype of the named managed-class
+	 */
+	void forEachDirectSubtype(String typeName, ClassDetailsConsumer consumer);
 
 	/**
 	 * Get the list of all direct implementors for the named interface.
@@ -89,7 +98,6 @@ default ClassDetails getClassDetails(String name) {
 	 * @apiNote Does not verify that {@code interfaceName} actually names an
 	 * interface.  If it does not, no callbacks will happen.
 	 */
-	@SuppressWarnings("unused")
 	void forEachDirectImplementor(String interfaceName, ClassDetailsConsumer consumer);
 
 	/**
@@ -156,9 +164,12 @@ default Set<ClassDetails> collectImplementors(String base, boolean includeBase)
 	 */
 	ClassDetailsBuilder getClassDetailsBuilder();
 
+	@SuppressWarnings("unchecked")
 	default <S> S as(Class<S> type) {
-		//noinspection unchecked
-		return (S) this;
+		if ( type.isInstance( this ) ) {
+			return (S) this;
+		}
+		throw new UnsupportedOperationException( "Unsure how to cast " + this + " to " + type.getName() );
 	}
 
 	@FunctionalInterface

hibernate-models/src/test/java/org/hibernate/models/testing/tests/classes/InheritanceTests.java

@@ -148,19 +148,19 @@ void testForEachDirectSubType() {
 		final ClassDetailsRegistry classDetailsRegistry = modelsContext.getClassDetailsRegistry();
 
 		final List<ClassDetails> subTypes = new ArrayList<>();
-		classDetailsRegistry.forEachDirectSubType( RootClass.class.getName(), subTypes::add );
+		classDetailsRegistry.forEachDirectSubtype( RootClass.class.getName(), subTypes::add );
 		assertThat( subTypes ).hasSize( 1 );
 		subTypes.clear();
 
-		classDetailsRegistry.forEachDirectSubType( TrunkClass.class.getName(), subTypes::add );
+		classDetailsRegistry.forEachDirectSubtype( TrunkClass.class.getName(), subTypes::add );
 		assertThat( subTypes ).hasSize( 1 );
 		subTypes.clear();
 
-		classDetailsRegistry.forEachDirectSubType( BranchClass.class.getName(), subTypes::add );
+		classDetailsRegistry.forEachDirectSubtype( BranchClass.class.getName(), subTypes::add );
 		assertThat( subTypes ).hasSize( 1 );
 		subTypes.clear();
 
-		classDetailsRegistry.forEachDirectSubType( LeafClass.class.getName(), subTypes::add );
+		classDetailsRegistry.forEachDirectSubtype( LeafClass.class.getName(), subTypes::add );
 		assertThat( subTypes ).hasSize( 0 );
 	}
 }