HHH-18197 finally remove @table (yay!)

Signed-off-by: Gavin King <gavin@hibernate.org>

Author: gavinking

hibernate-core/src/main/java/org/hibernate/annotations/Table.java

@@ -55,7 +55,6 @@
 import org.hibernate.annotations.SoftDelete;
 import org.hibernate.annotations.Subselect;
 import org.hibernate.annotations.Synchronize;
-import org.hibernate.annotations.Tables;
 import org.hibernate.annotations.TypeBinderType;
 import org.hibernate.annotations.View;
 import org.hibernate.annotations.Where;
@@ -432,24 +431,8 @@ private void handleIdentifier(
 	}
 
 	private void processComplementaryTableDefinitions() {
-		annotatedClass.forEachAnnotationUsage( org.hibernate.annotations.Table.class, getSourceModelContext(), (usage) -> {
-			final Table appliedTable = findTable( usage.appliesTo() );
-
-			final String comment = usage.comment();
-			if ( !comment.isEmpty() ) {
-				appliedTable.setComment( comment );
-			}
-
-			final String checkConstraint = usage.checkConstraint();
-			if ( !checkConstraint.isEmpty() ) {
-				//noinspection deprecation
-				appliedTable.addCheckConstraint( checkConstraint );
-			}
-
-			TableBinder.addIndexes( appliedTable, usage.indexes(), context );
-		} );
-
-		final jakarta.persistence.Table jpaTableUsage = annotatedClass.getAnnotationUsage( jakarta.persistence.Table.class, getSourceModelContext() );
+		final jakarta.persistence.Table jpaTableUsage =
+				annotatedClass.getAnnotationUsage( jakarta.persistence.Table.class, getSourceModelContext() );
 		if ( jpaTableUsage != null ) {
 			final Table table = persistentClass.getTable();
 			TableBinder.addJpaIndexes( table, jpaTableUsage.indexes(), context );
@@ -2061,24 +2044,17 @@ private void bindJoinToPersistentClass(Join join, AnnotatedJoinColumns joinColum
 	}
 
 	private void setForeignKeyNameIfDefined(Join join) {
-		final String tableName = join.getTable().getQuotedName();
-		final org.hibernate.annotations.Table matchingTable = findMatchingComplementaryTableAnnotation( tableName );
 		final SimpleValue key = (SimpleValue) join.getKey();
-		if ( matchingTable != null && !matchingTable.foreignKey().name().isEmpty() ) {
-			key.setForeignKeyName( matchingTable.foreignKey().name() );
-		}
-		else {
-			final SecondaryTable jpaSecondaryTable = findMatchingSecondaryTable( join );
-			if ( jpaSecondaryTable != null ) {
-				final boolean noConstraintByDefault = context.getBuildingOptions().isNoConstraintByDefault();
-				if ( jpaSecondaryTable.foreignKey().value() == ConstraintMode.NO_CONSTRAINT
-						|| jpaSecondaryTable.foreignKey().value() == ConstraintMode.PROVIDER_DEFAULT && noConstraintByDefault ) {
-					key.disableForeignKey();
-				}
-				else {
-					key.setForeignKeyName( nullIfEmpty( jpaSecondaryTable.foreignKey().name() ) );
-					key.setForeignKeyDefinition( nullIfEmpty( jpaSecondaryTable.foreignKey().foreignKeyDefinition() ) );
-				}
+		final SecondaryTable jpaSecondaryTable = findMatchingSecondaryTable( join );
+		if ( jpaSecondaryTable != null ) {
+			final boolean noConstraintByDefault = context.getBuildingOptions().isNoConstraintByDefault();
+			if ( jpaSecondaryTable.foreignKey().value() == ConstraintMode.NO_CONSTRAINT
+					|| jpaSecondaryTable.foreignKey().value() == ConstraintMode.PROVIDER_DEFAULT && noConstraintByDefault ) {
+				key.disableForeignKey();
+			}
+			else {
+				key.setForeignKeyName( nullIfEmpty( jpaSecondaryTable.foreignKey().name() ) );
+				key.setForeignKeyDefinition( nullIfEmpty( jpaSecondaryTable.foreignKey().foreignKeyDefinition() ) );
 			}
 		}
 	}
@@ -2101,24 +2077,6 @@ private SecondaryTable findMatchingSecondaryTable(Join join) {
 		return null;
 	}
 
-	private org.hibernate.annotations.Table findMatchingComplementaryTableAnnotation(String tableName) {
-		final org.hibernate.annotations.Table table = annotatedClass.getDirectAnnotationUsage( org.hibernate.annotations.Table.class );
-		if ( table != null && tableName.equals( table.appliesTo() ) ) {
-			return table;
-		}
-		else {
-			final Tables tables = annotatedClass.getAnnotationUsage( Tables.class, getSourceModelContext() );
-			if ( tables != null ) {
-				for (org.hibernate.annotations.Table nested : tables.value()) {
-					if ( tableName.equals( nested.appliesTo() ) ) {
-						return nested;
-					}
-				}
-			}
-			return null;
-		}
-	}
-
 	private SecondaryRow findMatchingSecondaryRowAnnotation(String tableName) {
 		final SecondaryRow row = annotatedClass.getDirectAnnotationUsage( SecondaryRow.class );
 		if ( row != null && ( row.table().isEmpty() || tableName.equals( row.table() ) ) ) {
@@ -2263,16 +2221,11 @@ Join createJoin(
 
 	private void handleSecondaryRowManagement(Join join) {
 		final String tableName = join.getTable().getQuotedName();
-		final org.hibernate.annotations.Table matchingTable = findMatchingComplementaryTableAnnotation( tableName );
 		final SecondaryRow matchingRow = findMatchingSecondaryRowAnnotation( tableName );
 		if ( matchingRow != null ) {
 			join.setInverse( !matchingRow.owned() );
 			join.setOptional( matchingRow.optional() );
 		}
-		else if ( matchingTable != null ) {
-			join.setInverse( matchingTable.inverse() );
-			join.setOptional( matchingTable.optional() );
-		}
 		else {
 			//default
 			join.setInverse( false );
@@ -2282,8 +2235,6 @@ else if ( matchingTable != null ) {
 
 	private void processSecondaryTableCustomSql(Join join) {
 		final String tableName = join.getTable().getQuotedName();
-		final org.hibernate.annotations.Table matchingTable = findMatchingComplementaryTableAnnotation( tableName );
-
 		final SQLInsert sqlInsert = resolveCustomSqlAnnotation( annotatedClass, SQLInsert.class, tableName );
 		if ( sqlInsert != null ) {
 			join.setCustomSQLInsert(
@@ -2296,17 +2247,6 @@ private void processSecondaryTableCustomSql(Join join) {
 				join.setInsertExpectation( getDefaultSupplier( expectationClass ) );
 			}
 		}
-		else if ( matchingTable != null ) {
-			final SQLInsert matchingTableInsert = matchingTable.sqlInsert();
-			final String matchingTableInsertSql = matchingTableInsert.sql().trim();
-			if ( !matchingTableInsertSql.isEmpty() ) {
-				join.setCustomSQLInsert(
-						matchingTableInsertSql,
-						matchingTableInsert.callable(),
-						fromResultCheckStyle( matchingTableInsert.check() )
-				);
-			}
-		}
 
 		final SQLUpdate sqlUpdate = resolveCustomSqlAnnotation( annotatedClass, SQLUpdate.class, tableName );
 		if ( sqlUpdate != null ) {
@@ -2320,17 +2260,6 @@ else if ( matchingTable != null ) {
 				join.setUpdateExpectation( getDefaultSupplier( expectationClass ) );
 			}
 		}
-		else if ( matchingTable != null ) {
-			final SQLUpdate matchingTableUpdate = matchingTable.sqlUpdate();
-			final String matchingTableUpdateSql = matchingTableUpdate.sql().trim();
-			if ( !matchingTableUpdateSql.isEmpty() ) {
-				join.setCustomSQLUpdate(
-						matchingTableUpdateSql,
-						matchingTableUpdate.callable(),
-						fromResultCheckStyle( matchingTableUpdate.check() )
-				);
-			}
-		}
 
 		final SQLDelete sqlDelete = resolveCustomSqlAnnotation( annotatedClass, SQLDelete.class, tableName );
 		if ( sqlDelete != null ) {
@@ -2344,17 +2273,6 @@ else if ( matchingTable != null ) {
 				join.setDeleteExpectation( getDefaultSupplier( expectationClass ) );
 			}
 		}
-		else if ( matchingTable != null ) {
-			final SQLDelete matchingTableDelete = matchingTable.sqlDelete();
-			final String deleteSql = matchingTableDelete.sql().trim();
-			if ( !deleteSql.isEmpty() ) {
-				join.setCustomSQLDelete(
-						deleteSql,
-						matchingTableDelete.callable(),
-						fromResultCheckStyle( matchingTableDelete.check() )
-				);
-			}
-		}
 	}
 
 	public java.util.Map<String, Join> getSecondaryTables() {
@@ -2378,24 +2296,6 @@ public void setIgnoreIdAnnotations(boolean ignoreIdAnnotations) {
 		this.ignoreIdAnnotations = ignoreIdAnnotations;
 	}
 
-	private Table findTable(String tableName) {
-		for ( Table table : persistentClass.getTableClosure() ) {
-			if ( table.getQuotedName().equals( tableName ) ) {
-				//we are in the correct table to find columns
-				return table;
-			}
-		}
-		//maybe a join/secondary table
-		for ( Join join : secondaryTables.values() ) {
-			if ( join.getTable().getQuotedName().equals( tableName ) ) {
-				return join.getTable();
-			}
-		}
-		throw new AnnotationException( "Entity '" + name
-				+ "' has a '@org.hibernate.annotations.Table' annotation which 'appliesTo' an unknown table named '"
-				+ tableName + "'" );
-	}
-
 	public AccessType getPropertyAccessType() {
 		return propertyAccessType;
 	}

hibernate-core/src/main/java/org/hibernate/annotations/Tables.java

@@ -624,15 +624,6 @@ public interface HibernateAnnotations {
 			Synchronize.class,
 			SynchronizeAnnotation.class
 	);
-	OrmAnnotationDescriptor<Tables,TablesAnnotation> TABLES = new OrmAnnotationDescriptor<>(
-			Tables.class,
-			TablesAnnotation.class
-	);
-	OrmAnnotationDescriptor<Table, TableAnnotation> TABLE = new OrmAnnotationDescriptor<>(
-			Table.class,
-			TableAnnotation.class,
-			TABLES
-	);
 	OrmAnnotationDescriptor<Target,TargetLegacyAnnotation> TARGET_LEGACY = new OrmAnnotationDescriptor<>(
 			Target.class,
 			TargetLegacyAnnotation.class