"subgraph" and "subtype" are words and do not come with hyphens

Author: gavinking

hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/ModelBinder.java

@@ -2655,7 +2655,7 @@ else if ( attributeSource instanceof PluralAttributeSource ) {
 				throw new AssertionFailure(
 						String.format(
 								Locale.ENGLISH,
-								"Unexpected AttributeSource sub-type [%s] as part of composite [%s]",
+								"Unexpected AttributeSource subtype [%s] as part of composite [%s]",
 								attributeSource.getClass().getName(),
 								attributeSource.getAttributeRole().getFullPath()
 						)

hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/CompositeIdentifierSource.java

@@ -7,7 +7,7 @@
 import org.hibernate.boot.model.IdentifierGeneratorDefinition;
 
 /**
- * Common contract for composite identifiers.  Specific sub-types include aggregated
+ * Common contract for composite identifiers. Specific subtypes include aggregated
  * (think {@link jakarta.persistence.EmbeddedId}) and non-aggregated (think
  * {@link jakarta.persistence.IdClass}).
  *

hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/IdentifiableTypeSource.java

@@ -49,7 +49,7 @@ public interface IdentifiableTypeSource extends AttributeSourceContainer {
 	/**
 	 * Access the subtype sources for types extending from this type source,
 	 *
-	 * @return Sub-type sources
+	 * @return Subtype sources
 	 */
 	Collection<IdentifiableTypeSource> getSubTypes();
 

hibernate-core/src/main/java/org/hibernate/metamodel/internal/AttributeFactory.java

@@ -787,7 +787,7 @@ else if ( persistenceType == Type.PersistenceType.MAPPED_SUPERCLASS ) {
 				);
 			}
 			else {
-				throw new IllegalArgumentException( "Unexpected sub-type: " + persistenceType );
+				throw new IllegalArgumentException( "Unexpected subtype: " + persistenceType );
 			}
 		}
 	}

hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityMappingType.java

@@ -447,7 +447,7 @@ default void visitAttributeMappings(Consumer<? super AttributeMapping> action) {
 	}
 
 	/**
-	 * Walk this type's attributes as well as its sub-type's
+	 * Walk this type's attributes as well as its subtypes
 	 */
 	default void visitSubTypeAttributeMappings(Consumer<? super AttributeMapping> action) {
 		// by default do nothing

hibernate-core/src/main/java/org/hibernate/persister/entity/EntityPropertyMapping.java

@@ -108,7 +108,7 @@ private void logDuplicateRegistration(String path, Type existingType, Type type)
 	private void logIncompatibleRegistration(String path, Type existingType, Type type) {
 		if ( LOG.isTraceEnabled() ) {
 			LOG.tracev(
-					"Skipped adding attribute [{1}] to base-type [{0}] as more than one sub-type defined the attribute using incompatible types (strictly speaking the attributes are not inherited); existing type = [{2}], incoming type = [{3}]",
+					"Skipped adding attribute [{1}] to base type [{0}] as more than one subtype defined the attribute using incompatible types (strictly speaking the attributes are not inherited); existing type = [{2}], incoming type = [{3}]",
 					getEntityName(),
 					path,
 					existingType,

hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/UpdateCoordinatorStandard.java

@@ -138,7 +138,7 @@ public void forceVersionIncrement(
 			Object nextVersion,
 			SharedSessionContractImplementor session) {
 		if ( versionUpdateGroup == null ) {
-			throw new HibernateException( "Cannot force version increment relative to sub-type; use the root type" );
+			throw new HibernateException( "Cannot force version increment relative to subtype; use the root type" );
 		}
 		doVersionUpdate( null, id, nextVersion, currentVersion, session );
 	}
@@ -151,7 +151,7 @@ public void forceVersionIncrement(
 			boolean batching,
 			SharedSessionContractImplementor session) {
 		if ( versionUpdateGroup == null ) {
-			throw new HibernateException( "Cannot force version increment relative to sub-type; use the root type" );
+			throw new HibernateException( "Cannot force version increment relative to subtype; use the root type" );
 		}
 		doVersionUpdate( null, id, nextVersion, currentVersion, batching, session );
 	}

hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyGroupWithInheritanceTest.java

@@ -95,7 +95,7 @@ public void queryEntityWithAssociationToAbstract(SessionFactoryScope scope) {
 
 					// todo (HHH-11147) : this is a regression from 4.x
 					//		- the condition is that the association from Order to Customer points to the non-root
-					//			entity (Customer) rather than one of its concrete sub-types (DomesticCustomer,
+					//			entity (Customer) rather than one of its concrete subtypes (DomesticCustomer,
 					//			ForeignCustomer).  We'd have to read the "other table" to be able to resolve the
 					// 			concrete type.  The same holds true for associations to versioned entities as well.
 					//			The only viable solution I see would be to join to the "other side" and read the

hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/parser/EntityGraphParserTest.java

@@ -186,10 +186,10 @@ public void testLinkSubtypeParsing() {
 
 		assertNullOrEmpty( linkToOneNode.getKeySubgraphs() );
 
-		final SubGraphImplementor subGraph = linkToOneNode.getSubGraphMap().get( GraphParsingTestSubEntity.class );
-		assertNotNull( subGraph );
+		final SubGraphImplementor<?> subgraph = linkToOneNode.getSubGraphMap().get( GraphParsingTestSubEntity.class );
+		assertNotNull( subgraph );
 
-		assertBasicAttributes( subGraph, "sub" );
+		assertBasicAttributes( subgraph, "sub" );
 	}
 
 	@Test

hibernate-core/src/test/java/org/hibernate/orm/test/fetching/GraphParsingTest.java

@@ -177,7 +177,7 @@ public void testQueryExample() {
 
 
 	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-	// Some entities for illustrating key sub-graphs
+	// Some entities for illustrating key subgraphs
 	//
 	// NOTE : for the moment I do not add named (sub)graph annotations because
 	//		this is only used for discussing graph parsing