diff --git a/hibernate-agroal/src/test/java/org/hibernate/test/agroal/AgroalSkipAutoCommitTest.java b/hibernate-agroal/src/test/java/org/hibernate/test/agroal/AgroalSkipAutoCommitTest.java index 95465fd2d1f9..cb3d09cd2a59 100644 --- a/hibernate-agroal/src/test/java/org/hibernate/test/agroal/AgroalSkipAutoCommitTest.java +++ b/hibernate-agroal/src/test/java/org/hibernate/test/agroal/AgroalSkipAutoCommitTest.java @@ -28,7 +28,6 @@ */ public class AgroalSkipAutoCommitTest { private static final PreparedStatementSpyConnectionProvider connectionProvider = new PreparedStatementSpyConnectionProvider(); - private static final SettingProvider.Provider connectionProviderProvider = () -> connectionProvider; @Test @ServiceRegistry( diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CommunityNamespaceSupport.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CommunityNamespaceSupport.java index 13827e30f5b5..373667b810b6 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CommunityNamespaceSupport.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CommunityNamespaceSupport.java @@ -65,8 +65,4 @@ public String[] getDropSchemaCommands(String schemaName) { static String[] unsupportedCatalog(String name) { throw new UnsupportedOperationException( "Catalog lifecycle is not supported" ); } - - static String[] unsupportedSchema(String name) { - throw new UnsupportedOperationException( "Schema lifecycle is not supported" ); - } } diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2LegacyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2LegacyDialect.java index b45174e06ca9..37413c822357 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2LegacyDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2LegacyDialect.java @@ -229,13 +229,6 @@ public CurrentTemporalSupport getCurrentTemporalSupport() { private static final int BIND_PARAMETERS_NUMBER_LIMIT = 32_767; - private static final String FOR_READ_ONLY_SQL = " for read only with rs"; - private static final String FOR_SHARE_SQL = FOR_READ_ONLY_SQL + " use and keep share locks"; - private static final String FOR_UPDATE_SQL = FOR_READ_ONLY_SQL + " use and keep update locks"; - private static final String SKIP_LOCKED_SQL = " skip locked data"; - private static final String FOR_SHARE_SKIP_LOCKED_SQL = FOR_SHARE_SQL + SKIP_LOCKED_SQL; - private static final String FOR_UPDATE_SKIP_LOCKED_SQL = FOR_UPDATE_SQL + SKIP_LOCKED_SQL; - private final LimitHandler limitHandler = getDB2Version().isBefore( 11, 1 ) ? LegacyDB2LimitHandler.INSTANCE : DB2LimitHandler.INSTANCE; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/GaussDBDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/GaussDBDialect.java index d7ff60f93ca7..deaad7b9dfbb 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/GaussDBDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/GaussDBDialect.java @@ -106,7 +106,6 @@ import org.hibernate.service.ServiceRegistry; import org.hibernate.sql.ast.spi.translation.SqlAstTranslator; import org.hibernate.dialect.sql.ast.spi.SqlAstTranslatorFactory; -import org.hibernate.sql.spi.ParameterMarkerStrategy; import org.hibernate.sql.spi.SqlAppender; import org.hibernate.dialect.sql.ast.spi.StandardSqlAstTranslatorFactory; import org.hibernate.sql.ast.spi.Statement; @@ -1202,18 +1201,6 @@ private static MutationOperation withoutMerge(OptionalTableUpdateOperationReques return new OptionalTableUpdateOperation( request.mutationTarget(), request.update() ); } - private static class NativeParameterMarkers implements ParameterMarkerStrategy { - /** - * Singleton access - */ - public static final NativeParameterMarkers INSTANCE = new NativeParameterMarkers(); - - @Override - public String createMarker(int position, JdbcType jdbcType) { - return "$" + position; - } - } - @Override @SPI({ USE, IMPLEMENT, SUPPLY }) public DmlTargetColumnQualifierSupport getDmlTargetColumnQualifierSupport() { diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/H2LegacySqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/H2LegacySqlAstTranslator.java index bd3ad836cc4f..64972990f91e 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/H2LegacySqlAstTranslator.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/H2LegacySqlAstTranslator.java @@ -6,7 +6,6 @@ import org.hibernate.SPI; import org.hibernate.dialect.sql.ast.spi.PaginationRenderingPlan; import org.hibernate.dialect.sql.ast.spi.PaginationRenderingSupport; -import org.hibernate.dialect.sql.ast.spi.NullOrderingSupport; import org.hibernate.dialect.sql.ast.spi.PrimaryTableReferenceContext; import org.hibernate.dialect.sql.ast.spi.QueryMutationRenderingSupport; import org.hibernate.dialect.sql.ast.spi.ReturningRenderingSupport; @@ -249,12 +248,6 @@ public void visitLikePredicate(LikePredicate likePredicate) { } } - protected boolean allowsNullPrecedence() { - return getClauseStack().getCurrent() != Clause.WITHIN_GROUP - || getDialect().getNullOrderingSupport() - .supports( NullOrderingSupport.Capability.NULLS_FIRST_LAST ); - } - private boolean supportsOffsetFetchClause() { return getDialect().getVersion().isSameOrAfter( 1, 4, 195 ); } diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/HANALegacyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/HANALegacyDialect.java index 4413bd64f280..cccee3ce41d0 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/HANALegacyDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/HANALegacyDialect.java @@ -286,7 +286,6 @@ public DatabaseVersion determineDatabaseVersion(DialectResolutionInfo info) { private static final Boolean USE_LEGACY_BOOLEAN_TYPE_DEFAULT_VALUE = Boolean.FALSE; private static final Boolean TREAT_DOUBLE_TYPED_FIELDS_AS_DECIMAL_DEFAULT_VALUE = Boolean.FALSE; - private static final String SQL_IGNORE_LOCKED = " ignore locked"; private final int maxLobPrefetchSize; @@ -1662,14 +1661,6 @@ protected X doExtract(CallableStatement statement, String name, WrapperOptions o } }; } - - public int getMaxLobPrefetchSize() { - return this.maxLobPrefetchSize; - } - - public boolean isUseUnicodeStringTypes() { - return this.useUnicodeStringTypes; - } } private static class HANANClobJdbcType extends NClobJdbcType { @@ -1765,10 +1756,6 @@ protected X doExtract(CallableStatement statement, String name, WrapperOptions o } }; } - - public int getMaxLobPrefetchSize() { - return maxLobPrefetchSize; - } } public static class HANABlobType implements JdbcType { diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MariaDBLegacyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MariaDBLegacyDialect.java index 93707f062403..f0aaf90ff3aa 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MariaDBLegacyDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MariaDBLegacyDialect.java @@ -344,18 +344,6 @@ public SequenceInformationExtractor getSequenceInformationExtractor() { : super.getSequenceInformationExtractor(); } - @Override - boolean supportsForShare() { - //only supported on MySQL - return false; - } - - @Override - boolean supportsAliasLocks() { - //only supported on MySQL - return false; - } - @Override @SPI({ IMPLEMENT, SUPPLY }) public FunctionalDependencyAnalysisSupport getFunctionalDependencyAnalysisSupport() { diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MySQLLegacyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MySQLLegacyDialect.java index 03003c6c860a..0c59ef5c792e 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MySQLLegacyDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MySQLLegacyDialect.java @@ -1400,14 +1400,6 @@ protected void contributeKeywords(KeywordRegistration registration) { registration.registerKeyword( "key" ); } - boolean supportsForShare() { - return getMySQLVersion().isSameOrAfter( 8 ); - } - - boolean supportsAliasLocks() { - return getMySQLVersion().isSameOrAfter( 8 ); - } - @Override @SPI({ IMPLEMENT, SUPPLY }) public FunctionalDependencyAnalysisSupport getFunctionalDependencyAnalysisSupport() { diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SQLiteDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SQLiteDialect.java index 55c7284bc24f..7f20351873ba 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SQLiteDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SQLiteDialect.java @@ -474,10 +474,6 @@ protected SqlAstTranslator cre private static final int SQLITE_BUSY = 5; private static final int SQLITE_LOCKED = 6; private static final int SQLITE_IOERR = 10; - private static final int SQLITE_CORRUPT = 11; - private static final int SQLITE_NOTFOUND = 12; - private static final int SQLITE_FULL = 13; - private static final int SQLITE_CANTOPEN = 14; private static final int SQLITE_PROTOCOL = 15; private static final int SQLITE_TOOBIG = 18; private static final int SQLITE_CONSTRAINT = 19; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SingleStoreDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SingleStoreDialect.java index a976257905c8..855dfe6fb616 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SingleStoreDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SingleStoreDialect.java @@ -234,7 +234,6 @@ public CurrentTemporalSupport getCurrentTemporalSupport() { @Override public TypeSizingProfile getTypeSizingProfile() { return typeSizingProfile; } private static final int PARAM_LIST_SIZE_LIMIT = 1_048_576; - private static final String[] NO_COMMANDS = new String[0]; private static final EmptyExporter NOOP_EXPORTER = new EmptyExporter(); private static final UniqueDelegate NOOP_UNIQUE_DELEGATE = UniqueDelegates.none(); private static final DatabaseVersion MINIMUM_VERSION = DatabaseVersion.make( 8, 0 ); diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/pagination/InterSystemsIRISLimitHandler.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/pagination/InterSystemsIRISLimitHandler.java index edfb5127a62a..e59533b4b5d2 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/pagination/InterSystemsIRISLimitHandler.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/pagination/InterSystemsIRISLimitHandler.java @@ -9,10 +9,7 @@ public class InterSystemsIRISLimitHandler extends AbstractLimitHandler { public static final InterSystemsIRISLimitHandler INSTANCE = new InterSystemsIRISLimitHandler(true); - private final boolean variableLimit; - public InterSystemsIRISLimitHandler(boolean variableLimit) { - this.variableLimit = variableLimit; } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/action/internal/CollectionAction.java b/hibernate-core/src/main/java/org/hibernate/action/internal/CollectionAction.java index 672024a16a96..abf2bb659e77 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/internal/CollectionAction.java +++ b/hibernate-core/src/main/java/org/hibernate/action/internal/CollectionAction.java @@ -84,14 +84,6 @@ public final boolean isLifecyclePrepared() { return lifecyclePrepared; } - /// The queue-neutral interpretation frozen before this action was lowered. - /// - /// @since 8.0 - @Nullable - public final CollectionMutationInterpretation getCollectionMutationInterpretation() { - return interpretation; - } - /// Return the interpretation after verifying that the collection still has /// the structural state from which it was produced. @Nullable diff --git a/hibernate-core/src/main/java/org/hibernate/action/internal/CollectionRecreateAction.java b/hibernate-core/src/main/java/org/hibernate/action/internal/CollectionRecreateAction.java index 0e0bad576e54..5a4ffce02696 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/internal/CollectionRecreateAction.java +++ b/hibernate-core/src/main/java/org/hibernate/action/internal/CollectionRecreateAction.java @@ -19,30 +19,6 @@ public final class CollectionRecreateAction extends CollectionAction { @Nullable private final Object affectedOwner; - @Nullable - private final Object affectedOwnerId; - - /** - * Constructs a CollectionRecreateAction - * @param collection The collection being recreated - * @param persister The collection persister - * @param id The collection key - * @param session The session - */ - public CollectionRecreateAction( - final @Nonnull PersistentCollection collection, - final @Nonnull CollectionPersister persister, - final @Nullable Object id, - final @Nonnull EventSource session) { - super( persister, collection, id, session ); - assert collection != null; - // Capture the owner at action creation time so it's available when the post-event - // fires (which may be after the collection owner reference has been cleared) - affectedOwner = collection.getOwner(); - // Also capture the owner ID from the entity entry at action creation time - final var ownerEntry = session.getPersistenceContextInternal().getEntry( affectedOwner ); - affectedOwnerId = ownerEntry != null ? ownerEntry.getId() : null; - } /// Creates the legacy lowering of an already-prepared semantic mutation. /// @@ -57,7 +33,6 @@ public CollectionRecreateAction( final CollectionMutationInterpretation interpretation) { super( persister, collection, id, session, true, interpretation ); this.affectedOwner = affectedOwner; - this.affectedOwnerId = affectedOwnerId; } @Override @@ -141,9 +116,4 @@ private PostCollectionRecreateEvent newPostCollectionRecreateEvent() { public Object getAffectedOwner() { return affectedOwner; } - - @Nullable - public Object getAffectedOwnerId() { - return affectedOwnerId; - } } diff --git a/hibernate-core/src/main/java/org/hibernate/action/internal/CollectionRemoveAction.java b/hibernate-core/src/main/java/org/hibernate/action/internal/CollectionRemoveAction.java index 3bdb4025368a..77c4252e95d6 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/internal/CollectionRemoveAction.java +++ b/hibernate-core/src/main/java/org/hibernate/action/internal/CollectionRemoveAction.java @@ -2,7 +2,6 @@ import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; -import org.hibernate.AssertionFailure; import org.hibernate.collection.spi.PersistentCollection; import org.hibernate.collection.spi.CollectionMutationInterpretation; import org.hibernate.engine.internal.FlushProcessingContext; @@ -20,40 +19,8 @@ public final class CollectionRemoveAction extends CollectionAction { @Nullable private final Object affectedOwner; - @Nullable - private final Object affectedOwnerId; private final boolean emptySnapshot; - /** - * Removes a persistent collection from its loaded owner. - *

- * Use this constructor when the collection is non-null. - * - * @param collection The collection to remove; must be non-null - * @param persister The collection's persister - * @param id The collection key - * @param emptySnapshot Indicates if the snapshot is empty - * @param session The session - * - * @throws AssertionFailure if collection is null. - */ - public CollectionRemoveAction( - final @Nonnull PersistentCollection collection, - final @Nonnull CollectionPersister persister, - final @Nullable Object id, // only null in certain deserialization tests - final boolean emptySnapshot, - final @Nonnull EventSource session) { - super( persister, collection, id, session ); - assert collection != null; - this.emptySnapshot = emptySnapshot; - // the loaded owner will be set to null after the collection is removed, - // so capture its value as the affected owner so it is accessible to - // both pre- and post- events - final var persistenceContext = session.getPersistenceContextInternal(); - affectedOwner = persistenceContext.getLoadedCollectionOwnerOrNull( collection ); - affectedOwnerId = persistenceContext.getLoadedCollectionOwnerIdOrNull( collection ); - } - /// Creates the legacy lowering of an already-prepared semantic mutation. /// /// @since 8.0 @@ -69,60 +36,6 @@ public CollectionRemoveAction( super( persister, collection, id, session, true, interpretation ); this.emptySnapshot = emptySnapshot; this.affectedOwner = affectedOwner; - this.affectedOwnerId = affectedOwnerId; - } - - /** - * Removes a persistent collection from a specified owner. - *

- * Use this constructor when the collection to be removed has not been loaded. - * - * @param affectedOwner The collection's owner; must be non-null - * @param persister The collection's persister - * @param id The collection key - * @param emptySnapshot Indicates if the snapshot is empty - * @param session The session - * - * @throws AssertionFailure if affectedOwner is null. - */ - public CollectionRemoveAction( - final @Nonnull Object affectedOwner, - final @Nonnull CollectionPersister persister, - final @Nonnull Object id, - final boolean emptySnapshot, - final @Nonnull EventSource session) { - super( persister, null, id, session ); - assert affectedOwner != null; - assert id != null; - this.emptySnapshot = emptySnapshot; - this.affectedOwner = affectedOwner; - // Get the owner ID from the entity entry at action creation time - final var ownerEntry = session.getPersistenceContextInternal().getEntry( affectedOwner ); - affectedOwnerId = ownerEntry != null ? ownerEntry.getId() : null; - } - - /** - * Removes a persistent collection for an unloaded proxy. - *

- * Use this constructor when the owning entity is has not been loaded. - * - * @param persister The collection's persister - * @param id The collection key - * @param session The session - */ - public CollectionRemoveAction( - final @Nonnull CollectionPersister persister, - final @Nonnull Object id, - final @Nonnull EventSource session) { - super( persister, null, id, session ); - assert id != null; - emptySnapshot = false; - affectedOwner = null; - affectedOwnerId = null; - } - - public boolean isEmptySnapshot() { - return emptySnapshot; } @Override @@ -206,9 +119,4 @@ private PostCollectionRemoveEvent newPostCollectionRemoveEvent() { public Object getAffectedOwner() { return affectedOwner; } - - @Nullable - public Object getAffectedOwnerId() { - return affectedOwnerId; - } } diff --git a/hibernate-core/src/main/java/org/hibernate/action/internal/CollectionUpdateAction.java b/hibernate-core/src/main/java/org/hibernate/action/internal/CollectionUpdateAction.java index 7293f41fc584..782c1d8e7014 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/internal/CollectionUpdateAction.java +++ b/hibernate-core/src/main/java/org/hibernate/action/internal/CollectionUpdateAction.java @@ -25,35 +25,6 @@ public final class CollectionUpdateAction extends CollectionAction { private final boolean emptySnapshot; @Nullable private final Object affectedOwner; - @Nullable - private final Object affectedOwnerId; - - /** - * Constructs a CollectionUpdateAction - * @param collection The collection to update - * @param persister The collection persister - * @param id The collection key - * @param emptySnapshot Indicates if the snapshot is empty - * @param session The session - */ - public CollectionUpdateAction( - final @Nonnull PersistentCollection collection, - final @Nonnull CollectionPersister persister, - final @Nonnull Object id, - final boolean emptySnapshot, - final @Nonnull EventSource session) { - super( persister, collection, id, session ); - assert collection != null; - assert persister != null; - assert id != null; - this.emptySnapshot = emptySnapshot; - // Capture the owner at action creation time so it's available when the post-event - // fires (which may be after the collection owner reference has been cleared) - affectedOwner = collection.getOwner(); - // Also capture the owner ID from the entity entry at action creation time - final var ownerEntry = session.getPersistenceContextInternal().getEntry( affectedOwner ); - affectedOwnerId = ownerEntry != null ? ownerEntry.getId() : null; - } /// Creates the legacy lowering of an already-prepared semantic mutation. /// @@ -70,7 +41,6 @@ public CollectionUpdateAction( super( persister, collection, id, session, true, interpretation ); this.emptySnapshot = emptySnapshot; this.affectedOwner = affectedOwner; - this.affectedOwnerId = affectedOwnerId; } @Override @@ -89,10 +59,6 @@ public Object getKey() { return key; } - public boolean isEmptySnapshot() { - return emptySnapshot; - } - @Override public void execute() { final Object key = getKey(); @@ -218,9 +184,4 @@ public Object getAffectedOwner() { return affectedOwner; } - @Nullable - public Object getAffectedOwnerId() { - return affectedOwnerId; - } - } diff --git a/hibernate-core/src/main/java/org/hibernate/action/internal/EntityActionVetoException.java b/hibernate-core/src/main/java/org/hibernate/action/internal/EntityActionVetoException.java index 43a317e7bf32..ba105f0c454d 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/internal/EntityActionVetoException.java +++ b/hibernate-core/src/main/java/org/hibernate/action/internal/EntityActionVetoException.java @@ -11,8 +11,6 @@ */ public class EntityActionVetoException extends HibernateException { - private final EntityAction entityAction; - /** * Constructs an {@code EntityActionVetoException} * @@ -21,16 +19,9 @@ public class EntityActionVetoException extends HibernateException { */ public EntityActionVetoException(@Nonnull String message, @Nonnull EntityAction entityAction) { super( message ); - this.entityAction = entityAction; } public EntityActionVetoException(@Nonnull EntityAction entityAction) { super( "Action was vetoed: " + entityAction ); - this.entityAction = entityAction; - } - - @Nonnull - public EntityAction getEntityAction() { - return entityAction; } } diff --git a/hibernate-core/src/main/java/org/hibernate/action/internal/EntityDeleteAction.java b/hibernate-core/src/main/java/org/hibernate/action/internal/EntityDeleteAction.java index 5bf436d7a3b2..077527e091e2 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/internal/EntityDeleteAction.java +++ b/hibernate-core/src/main/java/org/hibernate/action/internal/EntityDeleteAction.java @@ -103,20 +103,6 @@ public Object[] getState() { return state; } - @Nullable - private Object getNaturalIdValues() { - return naturalIdValues; - } - - @Nullable - protected SoftLock getLock() { - return lock; - } - - protected void setLock(@Nullable SoftLock lock) { - this.lock = lock; - } - private boolean isInstanceLoaded() { // A null instance signals that we're deleting an unloaded proxy. return getInstance() != null; diff --git a/hibernate-core/src/main/java/org/hibernate/action/internal/EntityInsertAction.java b/hibernate-core/src/main/java/org/hibernate/action/internal/EntityInsertAction.java index 8c0d4a009ac9..12fbf34e23ce 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/internal/EntityInsertAction.java +++ b/hibernate-core/src/main/java/org/hibernate/action/internal/EntityInsertAction.java @@ -65,15 +65,6 @@ public void setVersion(@Nullable Object version) { this.version = version; } - @Nullable - protected Object getCacheEntry() { - return cacheEntry; - } - - protected void setCacheEntry(@Nullable Object cacheEntry) { - this.cacheEntry = cacheEntry; - } - @Override public boolean isEarlyInsert() { return false; diff --git a/hibernate-core/src/main/java/org/hibernate/action/internal/EntityUpdateAction.java b/hibernate-core/src/main/java/org/hibernate/action/internal/EntityUpdateAction.java index 47ccd9cc42fd..ff1ecd09f319 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/internal/EntityUpdateAction.java +++ b/hibernate-core/src/main/java/org/hibernate/action/internal/EntityUpdateAction.java @@ -222,29 +222,11 @@ private void refreshStateAfterOwnerCallback(EntityPersister persister) { } } - @Nullable - protected NaturalIdMapping getNaturalIdMapping() { - return getPersister().getNaturalIdMapping(); - } - - @Nullable - protected Object getPreviousNaturalIdValues() { - return previousNaturalIdValues; - } - @Nullable public Object getRowId() { return rowId; } - protected void setLock(@Nullable SoftLock lock) { - this.lock = lock; - } - - protected void setCacheEntry(@Nullable Object cacheEntry) { - this.cacheEntry = cacheEntry; - } - @Override public void execute() { if ( !preUpdate() ) { diff --git a/hibernate-core/src/main/java/org/hibernate/action/internal/QueuedOperationCollectionAction.java b/hibernate-core/src/main/java/org/hibernate/action/internal/QueuedOperationCollectionAction.java index 6f6c1ef237f1..a30f7906b5c5 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/internal/QueuedOperationCollectionAction.java +++ b/hibernate-core/src/main/java/org/hibernate/action/internal/QueuedOperationCollectionAction.java @@ -20,22 +20,6 @@ */ public final class QueuedOperationCollectionAction extends CollectionAction { - /** - * Constructs a CollectionUpdateAction - * @param collection The collection to update - * @param persister The collection persister - * @param id The collection key - * @param session The session - */ - public QueuedOperationCollectionAction( - final @Nonnull PersistentCollection collection, - final @Nonnull CollectionPersister persister, - final @Nonnull Object id, - final @Nonnull EventSource session) { - super( persister, collection, id, session ); - assert collection != null; - } - /// Creates the legacy queued-work lowering of an already-prepared semantic mutation. /// /// @since 8.0 diff --git a/hibernate-core/src/main/java/org/hibernate/action/queue/internal/CollectionMutationActionLowering.java b/hibernate-core/src/main/java/org/hibernate/action/queue/internal/CollectionMutationActionLowering.java index 57cbbd6dcb9c..f224c01d1460 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/queue/internal/CollectionMutationActionLowering.java +++ b/hibernate-core/src/main/java/org/hibernate/action/queue/internal/CollectionMutationActionLowering.java @@ -23,13 +23,6 @@ /// @author Steve Ebersole @Internal public final class CollectionMutationActionLowering { - public static void lower( - CollectionMutationInput input, - EventSource session, - Consumer actionConsumer) { - lower( List.of( input ), session, actionConsumer ); - } - public static void lower( List inputs, EventSource session, diff --git a/hibernate-core/src/main/java/org/hibernate/action/queue/internal/FlushCoordinator.java b/hibernate-core/src/main/java/org/hibernate/action/queue/internal/FlushCoordinator.java index 1e152bf57405..2f9d8b913385 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/queue/internal/FlushCoordinator.java +++ b/hibernate-core/src/main/java/org/hibernate/action/queue/internal/FlushCoordinator.java @@ -34,7 +34,6 @@ import java.io.IOException; import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; @@ -122,16 +121,6 @@ public Decomposer getDecomposer() { return decomposer; } - public DeferrableConstraintMode getDeferrableConstraintMode() { - return deferrableConstraintMode; - } - - public void setDeferrableConstraintMode(DeferrableConstraintMode deferrableConstraintMode) { - this.deferrableConstraintMode = deferrableConstraintMode == null - ? DeferrableConstraintMode.DEFAULT - : deferrableConstraintMode; - } - public void executeInsertFlush(List insertActions) { executeFlush( List.of(), @@ -747,23 +736,12 @@ private void resolveUnresolvedInserts() { newlyManagedEntities.clear(); } - /// Composite key for grouping operations by shape and ordinalBase. - private record CompositeOperationGroupKey( - StatementShapeKey shapeKey, - int ordinalBase) implements OperationGroupKey { - } - /// Operation group key that includes ordinal information for self-referential tables. private record OrdinalAwareOperationGroupKey( StatementShapeKey shapeKey, Integer ordinalBase) implements OperationGroupKey { } - - public void serialize(ObjectOutputStream oos) throws IOException { - decomposer.serialize(oos); - } - public static FlushCoordinator deserialize( ObjectInputStream ois, GraphBasedActionQueueFactory actionQueueFactory, diff --git a/hibernate-core/src/main/java/org/hibernate/action/queue/internal/GraphBasedActionQueue.java b/hibernate-core/src/main/java/org/hibernate/action/queue/internal/GraphBasedActionQueue.java index 62d5e340a25e..03bc0d5b0b46 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/queue/internal/GraphBasedActionQueue.java +++ b/hibernate-core/src/main/java/org/hibernate/action/queue/internal/GraphBasedActionQueue.java @@ -21,7 +21,6 @@ import org.hibernate.action.internal.OrphanRemovalAction; import org.hibernate.action.queue.internal.audit.GraphAuditMutationCollector; import org.hibernate.action.queue.internal.constraint.ConstraintModel; -import org.hibernate.action.queue.internal.constraint.DeferrableConstraintMode; import org.hibernate.action.queue.internal.plan.FlushPlan; import org.hibernate.action.queue.internal.support.GraphBasedActionQueueFactory; import org.hibernate.action.spi.Executable; @@ -170,14 +169,6 @@ public void clear() { flushCoordinator.getDecomposer().clear(); } - public DeferrableConstraintMode getDeferrableConstraintMode() { - return flushCoordinator.getDeferrableConstraintMode(); - } - - public void setDeferrableConstraintMode(DeferrableConstraintMode deferrableConstraintMode) { - flushCoordinator.setDeferrableConstraintMode( deferrableConstraintMode ); - } - public GraphAuditMutationCollector getAuditMutationCollector() { return auditMutationCollector; } @@ -1055,31 +1046,6 @@ private void invalidateSpaces(String[] spaces) { } } - - // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - // Testing/debugging - // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - - /// Get all pending executable actions (for debugging/testing). - /// Graph-native prepared collection mutations are intentionally not exposed as executables. - /// - /// @return list of pending actions - public List getPendingActions() { - var list = new ArrayList(); - list.addAll(orphanRemovals); - list.addAll(insertions); - list.addAll(updates); - list.addAll(deletions); - return list; - } - - /// Get the FlushCoordinator (for testing/debugging). - /// - /// @return the flush coordinator - public FlushCoordinator getFlushCoordinator() { - return flushCoordinator; - } - /// Builds the currently queued flush plan without executing it. /// /// Intended for internal diagnostics and benchmarks which discard the session diff --git a/hibernate-core/src/main/java/org/hibernate/action/queue/internal/audit/GraphAuditMutationCollector.java b/hibernate-core/src/main/java/org/hibernate/action/queue/internal/audit/GraphAuditMutationCollector.java index 3d0f88ed419b..8c462ef50cfc 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/queue/internal/audit/GraphAuditMutationCollector.java +++ b/hibernate-core/src/main/java/org/hibernate/action/queue/internal/audit/GraphAuditMutationCollector.java @@ -55,10 +55,6 @@ public void collectionChanged( changeSet.addCollectionChange( collectionPersister, collection, ownerId, originalSnapshot, mutationSupport ); } - public boolean hasWork() { - return !changeSet.isEmpty(); - } - public void executeAuditMutations(SharedSessionContractImplementor session) { if ( changeSet.isEmpty() ) { return; diff --git a/hibernate-core/src/main/java/org/hibernate/action/queue/internal/constraint/Constraint.java b/hibernate-core/src/main/java/org/hibernate/action/queue/internal/constraint/Constraint.java index e61b8651ae2c..7db6369b9261 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/queue/internal/constraint/Constraint.java +++ b/hibernate-core/src/main/java/org/hibernate/action/queue/internal/constraint/Constraint.java @@ -1,13 +1,7 @@ package org.hibernate.action.queue.internal.constraint; - -import org.hibernate.metamodel.mapping.SelectableMappings; - /// @author Steve Ebersole public interface Constraint { - String getConstrainedTableName(); - SelectableMappings getConstrainedColumnMappings(); - boolean isNullable(); Deferrability getDeferrability(); boolean isDeferrable(); } diff --git a/hibernate-core/src/main/java/org/hibernate/action/queue/internal/constraint/Deferrability.java b/hibernate-core/src/main/java/org/hibernate/action/queue/internal/constraint/Deferrability.java index bac0d16b2f68..f9b77ae8f42c 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/queue/internal/constraint/Deferrability.java +++ b/hibernate-core/src/main/java/org/hibernate/action/queue/internal/constraint/Deferrability.java @@ -24,23 +24,6 @@ public enum Deferrability { /// See [java.sql.DatabaseMetaData#importedKeyInitiallyDeferred]. INITIALLY_DEFERRED; - /// Corresponding [java.sql.DatabaseMetaData] constant value. - public int getCorrespondingJdbcConstant() { - return switch ( this ) { - case UNKNOWN, NOT_DEFERRABLE -> 7; - case INITIALLY_IMMEDIATE -> 6; - case INITIALLY_DEFERRED -> 5; - }; - } - - public String getCorrespondingSqlString() { - return switch ( this ) { - case UNKNOWN, NOT_DEFERRABLE -> "NOT DEFERRABLE"; - case INITIALLY_IMMEDIATE -> "DEFERRABLE INITIALLY IMMEDIATE"; - case INITIALLY_DEFERRED -> "DEFERRABLE INITIALLY DEFERRED"; - }; - } - public boolean isDeferrable() { return this == INITIALLY_IMMEDIATE || this == INITIALLY_DEFERRED; } diff --git a/hibernate-core/src/main/java/org/hibernate/action/queue/internal/constraint/ForeignKey.java b/hibernate-core/src/main/java/org/hibernate/action/queue/internal/constraint/ForeignKey.java index 419575421035..a7f0d32f5457 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/queue/internal/constraint/ForeignKey.java +++ b/hibernate-core/src/main/java/org/hibernate/action/queue/internal/constraint/ForeignKey.java @@ -62,26 +62,6 @@ public enum TargetType { NON_UNIQUE } - /// Check if this foreign key targets a unique constraint (either primary key or unique key) - public boolean targetsUniqueConstraint() { - return targetType == TargetType.PRIMARY_KEY || targetType == TargetType.UNIQUE_KEY; - } - - @Override - public String getConstrainedTableName() { - return keyTable; - } - - @Override - public SelectableMappings getConstrainedColumnMappings() { - return keyColumns; - } - - @Override - public boolean isNullable() { - return nullable; - } - @Override public Deferrability getDeferrability() { return deferrability; diff --git a/hibernate-core/src/main/java/org/hibernate/action/queue/internal/constraint/UniqueConstraint.java b/hibernate-core/src/main/java/org/hibernate/action/queue/internal/constraint/UniqueConstraint.java index 2e8c938be1d3..5365771d8eb2 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/queue/internal/constraint/UniqueConstraint.java +++ b/hibernate-core/src/main/java/org/hibernate/action/queue/internal/constraint/UniqueConstraint.java @@ -64,25 +64,6 @@ public boolean isUniqueKey() { return type == ConstraintType.UNIQUE_KEY; } - public boolean isUniqueForeignKey() { - return type == ConstraintType.UNIQUE_FOREIGN_KEY; - } - - @Override - public String getConstrainedTableName() { - return tableName; - } - - @Override - public SelectableMappings getConstrainedColumnMappings() { - return columns; - } - - @Override - public boolean isNullable() { - return nullable; - } - @Override public Deferrability getDeferrability() { return deferrability; diff --git a/hibernate-core/src/main/java/org/hibernate/action/queue/internal/constraint/UniqueSlot.java b/hibernate-core/src/main/java/org/hibernate/action/queue/internal/constraint/UniqueSlot.java index 5020812da693..b44e07c2ff7d 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/queue/internal/constraint/UniqueSlot.java +++ b/hibernate-core/src/main/java/org/hibernate/action/queue/internal/constraint/UniqueSlot.java @@ -22,21 +22,6 @@ public String constraintName() { return constraint.constraintName(); } - /// Check if this slot conflicts with another (same table, constraint, and values) - public boolean conflictsWith(UniqueSlot other) { - if (!tableName.equals(other.tableName)) { - return false; - } - if (!constraintName().equals(other.constraintName())) { - return false; - } - // Both must have values to conflict - if (keyValues == null || other.keyValues == null) { - return false; - } - return Arrays.equals(keyValues, other.keyValues); - } - @Override public boolean equals(Object o) { if (this == o) return true; diff --git a/hibernate-core/src/main/java/org/hibernate/action/queue/internal/cyclebreak/CycleBreakPatcher.java b/hibernate-core/src/main/java/org/hibernate/action/queue/internal/cyclebreak/CycleBreakPatcher.java index 24f5cf914efa..118199525696 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/queue/internal/cyclebreak/CycleBreakPatcher.java +++ b/hibernate-core/src/main/java/org/hibernate/action/queue/internal/cyclebreak/CycleBreakPatcher.java @@ -3,71 +3,10 @@ import org.hibernate.action.queue.spi.bind.DelayedValueAccess; import org.hibernate.action.queue.spi.bind.JdbcValueBindings; import org.hibernate.action.queue.spi.plan.FlushOperation; -import org.hibernate.engine.jdbc.mutation.MutationExecutor; import org.hibernate.engine.jdbc.mutation.ParameterUsage; -import org.hibernate.engine.jdbc.mutation.spi.JdbcValueBindingsImplementor; /// @author Steve Ebersole public class CycleBreakPatcher { - public static void applyNullInsertPatch( - MutationExecutor executor, - FlushOperation flushOperation, - BindingPatch bindingPatch) { - if (bindingPatch == null || bindingPatch.fkColumnsToNull().isEmpty()) { - return; - } - - final String table = (flushOperation.getTableExpression()); - if (!table.equals(( bindingPatch.tableName() ))) { - return; - } - - final JdbcValueBindingsImplementor bindings = (JdbcValueBindingsImplementor) executor.getJdbcValueBindings(); - - // Determine which map to use based on cycle type - final boolean isUniqueSwap = bindingPatch.cycleType() == BindingPatch.CycleType.UNIQUE_SWAP; - - for (var selectableMapping : bindingPatch.fkColumnsToNull()) { - final String rawCol = selectableMapping.getSelectionExpression(); - final String col = (rawCol); - - // 1) Read the intended value that coordinator already bound - final Object intended = bindings.getBoundValue( table, col, ParameterUsage.SET ); - - if (intended == null) { - // not bound (dynamic insert excluded) or already null - continue; - } - if ( intended instanceof DelayedValueAccess - && ( isUniqueSwap - ? flushOperation.hasIntendedUniqueValue( col ) - : flushOperation.hasIntendedFkValue( col ) ) ) { - continue; - } - final Object intendedForFixup = intended instanceof DelayedValueAccess handle && handle.isResolved() - ? handle.get() - : intended; - - // 2) Register a generated-value handle - final DelayedValueAccess handle = new DelayedValueAccess( - flushOperation.getOrigin() + "#" + col, - intendedForFixup - ); - bindings.replaceValue(table, col, ParameterUsage.SET, handle); - - // 3) Force NULL for INSERT/UPDATE - handle.set( null ); - - // 4) Record intended value for later fixup UPDATE - if (isUniqueSwap) { - flushOperation.addIntendedUniqueValue( col, intendedForFixup ); - } - else { - flushOperation.addIntendedFkValue( col, intendedForFixup ); - } - } - } - public static void applyFixupPatch( JdbcValueBindings valueBindings, FlushOperation flushOperation, diff --git a/hibernate-core/src/main/java/org/hibernate/action/queue/internal/cyclebreak/FixupTableUpdate.java b/hibernate-core/src/main/java/org/hibernate/action/queue/internal/cyclebreak/FixupTableUpdate.java index 5e7fc6a73ab8..6b5ece759509 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/queue/internal/cyclebreak/FixupTableUpdate.java +++ b/hibernate-core/src/main/java/org/hibernate/action/queue/internal/cyclebreak/FixupTableUpdate.java @@ -33,8 +33,6 @@ public class FixupTableUpdate { private final EntityTableDescriptor tableDescriptor; private final EntityPersister entityPersister; - private final List fixupColumnDescriptors; - private final List pkColumnDescriptors; private final String sql; private final Map jdbcValueDescriptorMap; @@ -53,34 +51,12 @@ public FixupTableUpdate( // we can get them from the table descriptor as well this.tableDescriptor = tableDescriptor; this.entityPersister = entityPersister; - this.fixupColumnDescriptors = fixupColumnDescriptors; - this.pkColumnDescriptors = pkColumnDescriptors; // Generate SQL at construction time this.jdbcValueDescriptorMap = new HashMap<>(); this.sql = buildSql( tableDescriptor, fixupColumnDescriptors, pkColumnDescriptors, jdbcValueDescriptorMap::put ); } - public TableDescriptor getTableDescriptor() { - return tableDescriptor; - } - - public String getSql() { - return sql; - } - - public Map getJdbcValueDescriptorMap() { - return jdbcValueDescriptorMap; - } - - public List getNormalizedFkColumns() { - return fixupColumnDescriptors; - } - - public List getNormalizedPkColumns() { - return pkColumnDescriptors; - } - public PreparableMutationOperation buildJdbcUpdate() { return new FixupJdbcUpdate( sql, diff --git a/hibernate-core/src/main/java/org/hibernate/action/queue/internal/decompose/Decomposer.java b/hibernate-core/src/main/java/org/hibernate/action/queue/internal/decompose/Decomposer.java index 72f221dac568..bfc4ac18708e 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/queue/internal/decompose/Decomposer.java +++ b/hibernate-core/src/main/java/org/hibernate/action/queue/internal/decompose/Decomposer.java @@ -62,7 +62,6 @@ public class Decomposer implements DecompositionContext { private Map, CollectionMutationCompletion> pendingQueuedCollectionMutations; private List flushSuccessCompletions; private long nextCollectionMutationId; - private boolean flushActive; public Decomposer(SessionImplementor session) { this.session = session; @@ -77,7 +76,6 @@ public void beginFlush( // if this ever shows up as a hot spot (unlikely), we could move collecting these // into the action queue proper as the actions are added and then pass into the // Decomposer as arguments. - flushActive = true; generatedIdentifierHandles = null; pendingQueuedCollectionMutations = null; flushSuccessCompletions = null; @@ -136,7 +134,6 @@ public void beginFlush( /// End a flush operation - clear the tracking sets public void endFlush() { sealPendingQueuedCollectionMutations(); - flushActive = false; entitiesBeingInserted = null; entitiesBeingDeleted = null; updatedAttributesByDeletedEntity = null; @@ -284,7 +281,7 @@ public void decompose( final var collection = resolvedMutation.collection(); final var completion = collection == null - ? newCollectionMutation( null ) + ? newCollectionMutation( ) : takePendingQueuedCollectionMutation( collection ); completion.configure( resolvedMutation ); try { @@ -320,7 +317,7 @@ private void decomposeQueuedCollectionMutation( } var completion = pendingQueuedCollectionMutations.get( collection ); if ( completion == null ) { - completion = newCollectionMutation( collection ); + completion = newCollectionMutation( ); completion.requireFlushSuccess(); pendingQueuedCollectionMutations.put( collection, completion ); if ( flushSuccessCompletions == null ) { @@ -351,13 +348,12 @@ private CollectionMutationCompletion takePendingQueuedCollectionMutation( return pending; } } - return newCollectionMutation( collection ); + return newCollectionMutation( ); } - private CollectionMutationCompletion newCollectionMutation(PersistentCollection collection) { + private CollectionMutationCompletion newCollectionMutation() { return new CollectionMutationCompletion( - new CollectionMutationId( nextCollectionMutationId++ ), - collection + new CollectionMutationId( nextCollectionMutationId++ ) ); } diff --git a/hibernate-core/src/main/java/org/hibernate/action/queue/internal/decompose/collection/AbstractOneToManyDecomposer.java b/hibernate-core/src/main/java/org/hibernate/action/queue/internal/decompose/collection/AbstractOneToManyDecomposer.java index 6fde65a0bc26..536c9880e018 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/queue/internal/decompose/collection/AbstractOneToManyDecomposer.java +++ b/hibernate-core/src/main/java/org/hibernate/action/queue/internal/decompose/collection/AbstractOneToManyDecomposer.java @@ -239,7 +239,6 @@ public final void decomposeUpdate( var postUpdateHandling = new PostCollectionUpdateHandling( persister, collection, - key, action.getAffectedOwner(), action.getAffectedOwnerId(), DecompositionSupport.generateCacheKey( action, session ) diff --git a/hibernate-core/src/main/java/org/hibernate/action/queue/internal/decompose/collection/BasicCollectionDecomposer.java b/hibernate-core/src/main/java/org/hibernate/action/queue/internal/decompose/collection/BasicCollectionDecomposer.java index 749f4f069042..b52aa2a00d18 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/queue/internal/decompose/collection/BasicCollectionDecomposer.java +++ b/hibernate-core/src/main/java/org/hibernate/action/queue/internal/decompose/collection/BasicCollectionDecomposer.java @@ -76,12 +76,6 @@ public class BasicCollectionDecomposer implements CollectionDecomposer { private final String shiftFinalOrigin; private final String deleteOrigin; - public BasicCollectionDecomposer( - BasicCollectionPersister persister, - SessionFactoryImplementor factory) { - this( persister, factory, CollectionMutationPlanContributor.STANDARD ); - } - public BasicCollectionDecomposer( BasicCollectionPersister persister, SessionFactoryImplementor factory, @@ -298,16 +292,6 @@ private List planInterpretedCreate( return planRecreateRows( createAll.currentRows(), collection, key, ordinalBase, session, compactRows ); } - @Nonnull - private List planRecreateRows( - FrozenCollectionRows rows, - PersistentCollection collection, - Object key, - int ordinalBase, - SharedSessionContractImplementor session) { - return planRecreateRows( rows, collection, key, ordinalBase, session, false ); - } - @Nonnull private List planRecreateRows( FrozenCollectionRows rows, @@ -472,7 +456,6 @@ else if ( !changeSet.isEmpty() ) { final var postUpdateHandling = new PostCollectionUpdateHandling( persister, collection, - key, action.getAffectedOwner(), action.getAffectedOwnerId(), DecompositionSupport.generateCacheKey(action, session) diff --git a/hibernate-core/src/main/java/org/hibernate/action/queue/internal/decompose/collection/CollectionMutationCompletion.java b/hibernate-core/src/main/java/org/hibernate/action/queue/internal/decompose/collection/CollectionMutationCompletion.java index f1f9a7f3ef02..be5f6f48a4ad 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/queue/internal/decompose/collection/CollectionMutationCompletion.java +++ b/hibernate-core/src/main/java/org/hibernate/action/queue/internal/decompose/collection/CollectionMutationCompletion.java @@ -10,7 +10,6 @@ import org.hibernate.action.queue.spi.CollectionMutationId; import org.hibernate.action.queue.spi.bind.PostExecutionCallback; import org.hibernate.action.queue.spi.plan.FlushOperation; -import org.hibernate.collection.spi.PersistentCollection; import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.engine.internal.FlushProcessingContext; import org.hibernate.persister.collection.CollectionPersister; @@ -43,7 +42,6 @@ public enum Kind { } private final CollectionMutationId id; - private final PersistentCollection collection; private final List completionHandlers = new ArrayList<>(); private final Map fixupReservations = new IdentityHashMap<>(); @@ -58,10 +56,8 @@ public enum Kind { private boolean flushSuccessRequired; public CollectionMutationCompletion( - CollectionMutationId id, - PersistentCollection collection) { + CollectionMutationId id) { this.id = id; - this.collection = collection; state = State.REGISTERING; } @@ -73,34 +69,6 @@ public State getState() { return state; } - public Kind getKind() { - return kind; - } - - public PersistentCollection getCollection() { - return collection; - } - - public CollectionPersister getPersister() { - return persister; - } - - public Object getKey() { - return key; - } - - public Object getAffectedOwner() { - return affectedOwner; - } - - public Object getAffectedOwnerId() { - return affectedOwnerId; - } - - public int getObligationCount() { - return obligationCount; - } - public void configure(PreparedCollectionMutation mutation) { checkRegistering(); persister = mutation.getPersister(); diff --git a/hibernate-core/src/main/java/org/hibernate/action/queue/internal/decompose/collection/CollectionMutationPlanSupport.java b/hibernate-core/src/main/java/org/hibernate/action/queue/internal/decompose/collection/CollectionMutationPlanSupport.java index 736cfabeca38..ff7f757c7500 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/queue/internal/decompose/collection/CollectionMutationPlanSupport.java +++ b/hibernate-core/src/main/java/org/hibernate/action/queue/internal/decompose/collection/CollectionMutationPlanSupport.java @@ -140,24 +140,6 @@ static void bindTemporalEndingValue( } } - static void bindRemoveRestrictions( - CollectionPersister persister, - Object key, - SharedSessionContractImplementor session, - org.hibernate.action.queue.spi.bind.JdbcValueBindings valueBindings) { - persister.getAttributeMapping().getKeyDescriptor().getKeyPart().decompose( - key, - (valueIndex, value, jdbcValueMapping) -> { - valueBindings.bindValue( - value, - jdbcValueMapping.getSelectionExpression(), - ParameterUsage.RESTRICT - ); - }, - session - ); - } - static void bindDeleteRestrictions( CollectionPersister persister, PersistentCollection collection, diff --git a/hibernate-core/src/main/java/org/hibernate/action/queue/internal/decompose/collection/DecompositionSupport.java b/hibernate-core/src/main/java/org/hibernate/action/queue/internal/decompose/collection/DecompositionSupport.java index 1bce40da6d7f..a3704d0892c9 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/queue/internal/decompose/collection/DecompositionSupport.java +++ b/hibernate-core/src/main/java/org/hibernate/action/queue/internal/decompose/collection/DecompositionSupport.java @@ -18,12 +18,6 @@ import org.hibernate.event.spi.PostCollectionRemoveEventListener; import org.hibernate.event.spi.PostCollectionUpdateEvent; import org.hibernate.event.spi.PostCollectionUpdateEventListener; -import org.hibernate.event.spi.PreCollectionRecreateEvent; -import org.hibernate.event.spi.PreCollectionRecreateEventListener; -import org.hibernate.event.spi.PreCollectionRemoveEvent; -import org.hibernate.event.spi.PreCollectionRemoveEventListener; -import org.hibernate.event.spi.PreCollectionUpdateEvent; -import org.hibernate.event.spi.PreCollectionUpdateEventListener; import org.hibernate.persister.collection.CollectionPersister; import java.util.List; @@ -75,19 +69,6 @@ static void attachExecutionMonitor( } } - // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - // Recreate events - - public static void firePreRecreate( - CollectionPersister persister, - PersistentCollection collection, - SharedSessionContractImplementor session) { - getListenerGroups( session ).eventListenerGroup_PRE_COLLECTION_RECREATE.fireLazyEventOnEachListener( - () -> new PreCollectionRecreateEvent( persister, collection, (EventSource) session ), - PreCollectionRecreateEventListener::onPreRecreateCollection - ); - } - public static void firePostRecreate( CollectionPersister persister, PersistentCollection collection, @@ -100,20 +81,6 @@ public static void firePostRecreate( ); } - - // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - // Update events - - public static void firePreUpdate( - CollectionPersister persister, - PersistentCollection collection, - SharedSessionContractImplementor session) { - getListenerGroups( session ).eventListenerGroup_PRE_COLLECTION_UPDATE.fireLazyEventOnEachListener( - () -> new PreCollectionUpdateEvent( persister, collection, (EventSource) session ), - PreCollectionUpdateEventListener::onPreUpdateCollection - ); - } - public static void firePostUpdate( CollectionPersister persister, PersistentCollection collection, @@ -126,17 +93,6 @@ public static void firePostUpdate( ); } - public static void firePreRemove( - CollectionPersister persister, - PersistentCollection collection, - Object affectedOwner, - SharedSessionContractImplementor session) { - getListenerGroups( session ).eventListenerGroup_PRE_COLLECTION_REMOVE.fireLazyEventOnEachListener( - () -> new PreCollectionRemoveEvent( persister, collection, (EventSource) session, affectedOwner ), - PreCollectionRemoveEventListener::onPreRemoveCollection - ); - } - public static void firePostRemove( CollectionPersister persister, PersistentCollection collection, diff --git a/hibernate-core/src/main/java/org/hibernate/action/queue/internal/decompose/collection/PostCollectionUpdateHandling.java b/hibernate-core/src/main/java/org/hibernate/action/queue/internal/decompose/collection/PostCollectionUpdateHandling.java index 417d11e3854d..63e9376c8254 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/queue/internal/decompose/collection/PostCollectionUpdateHandling.java +++ b/hibernate-core/src/main/java/org/hibernate/action/queue/internal/decompose/collection/PostCollectionUpdateHandling.java @@ -23,7 +23,6 @@ public class PostCollectionUpdateHandling implements PostExecutionCallback { private final CollectionPersister persister; private final PersistentCollection collection; - private final Object key; private final Object cacheKey; private final Object affectedOwner; @@ -32,13 +31,11 @@ public class PostCollectionUpdateHandling implements PostExecutionCallback { public PostCollectionUpdateHandling( CollectionPersister persister, PersistentCollection collection, - Object key, Object affectedOwner, Object affectedOwnerId, Object cacheKey) { this.persister = persister; this.collection = collection; - this.key = key; this.affectedOwner = affectedOwner; this.affectedOwnerId = affectedOwnerId; this.cacheKey = cacheKey; diff --git a/hibernate-core/src/main/java/org/hibernate/action/queue/internal/decompose/entity/EntityUpdateBindPlan.java b/hibernate-core/src/main/java/org/hibernate/action/queue/internal/decompose/entity/EntityUpdateBindPlan.java index da2fb4e10cb3..f1963956f511 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/queue/internal/decompose/entity/EntityUpdateBindPlan.java +++ b/hibernate-core/src/main/java/org/hibernate/action/queue/internal/decompose/entity/EntityUpdateBindPlan.java @@ -372,31 +372,6 @@ protected void applyNonVersionOptLocking( } } - protected void decomposeAttributeForRestriction( - Object value, - JdbcValueBindings jdbcValueBindings, - AttributeMapping attribute, - SharedSessionContractImplementor session) { - assert !attribute.isPluralAttributeMapping(); - - attribute.decompose( - value, - 0, - jdbcValueBindings, - null, - (valueIndex, bindings, noop, jdbcValue, selectableMapping) -> { - if ( selectableMapping.isUpdateable() && !selectableMapping.isFormula() && jdbcValue != null ) { - bindings.bindValue( - jdbcValue, - ( selectableMapping.getSelectionExpression() ), - ParameterUsage.RESTRICT - ); - } - }, - session - ); - } - protected void applyPartitionedSelectionRestrictions( JdbcValueBindings jdbcValueBindings, SharedSessionContractImplementor session) { diff --git a/hibernate-core/src/main/java/org/hibernate/action/queue/internal/graph/GraphEdge.java b/hibernate-core/src/main/java/org/hibernate/action/queue/internal/graph/GraphEdge.java index 561cc634b0ee..9f23cd17f2ea 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/queue/internal/graph/GraphEdge.java +++ b/hibernate-core/src/main/java/org/hibernate/action/queue/internal/graph/GraphEdge.java @@ -57,8 +57,6 @@ /// /// @author Steve Ebersole public class GraphEdge { - // The referenced/target side for FK edges; may be null for unique-slot edges. - final GroupNode targetNode; // The key side for FK edges, or the operation that receives a patch for unique-slot edges. final GroupNode keyNode; @@ -77,7 +75,6 @@ public class GraphEdge { boolean broken; static GraphEdge requiredOrder( - GroupNode targetTableOpGroup, GroupNode keyTableOpGroup, GroupNode from, GroupNode to, @@ -85,7 +82,6 @@ static GraphEdge requiredOrder( Constraint constraint, long stableId) { return new GraphEdge( - targetTableOpGroup, keyTableOpGroup, from, to, @@ -98,7 +94,6 @@ static GraphEdge requiredOrder( } static GraphEdge preferredOrder( - GroupNode targetTableOpGroup, GroupNode keyTableOpGroup, GroupNode from, GroupNode to, @@ -107,7 +102,6 @@ static GraphEdge preferredOrder( int breakCost, long stableId) { return new GraphEdge( - targetTableOpGroup, keyTableOpGroup, from, to, @@ -120,7 +114,6 @@ static GraphEdge preferredOrder( } static GraphEdge nullPatchableFk( - GroupNode targetTableOpGroup, GroupNode keyTableOpGroup, GroupNode from, GroupNode to, @@ -129,7 +122,6 @@ static GraphEdge nullPatchableFk( int breakCost, long stableId) { return new GraphEdge( - targetTableOpGroup, keyTableOpGroup, from, to, @@ -142,7 +134,6 @@ static GraphEdge nullPatchableFk( } static GraphEdge nullPatchableUnique( - GroupNode targetTableOpGroup, GroupNode keyTableOpGroup, GroupNode from, GroupNode to, @@ -151,7 +142,6 @@ static GraphEdge nullPatchableUnique( int breakCost, long stableId) { return new GraphEdge( - targetTableOpGroup, keyTableOpGroup, from, to, @@ -164,7 +154,6 @@ static GraphEdge nullPatchableUnique( } private GraphEdge( - GroupNode targetTableOpGroup, GroupNode keyTableOpGroup, GroupNode from, GroupNode to, @@ -173,7 +162,6 @@ private GraphEdge( Constraint constraint, GraphEdgeKind kind, long stableId) { - this.targetNode = targetTableOpGroup; this.keyNode = keyTableOpGroup; this.from = from; this.to = to; @@ -184,11 +172,6 @@ private GraphEdge( this.stableId = stableId; } - /// The constraint that this edge describes (might be a foreign key or unique constraint) - public Constraint getConstraint() { - return constraint; - } - public GraphEdgeKind getKind() { return kind; } @@ -213,16 +196,6 @@ public boolean isNullPatchable() { return isNullPatchableForeignKey() || isNullPatchableUnique(); } - /// The foreign key that this edge describes, or null if this is a unique constraint edge - public ForeignKey getForeignKey() { - return constraint instanceof ForeignKey fk ? fk : null; - } - - /// Whether this edge represents a foreign key dependency (as opposed to a unique constraint dependency) - public boolean isForeignKeyEdge() { - return constraint instanceof ForeignKey; - } - public boolean isUniqueConstraintEdge() { return constraint instanceof UniqueConstraint; } @@ -243,18 +216,6 @@ public BindingPatch.CycleType getPatchCycleType() { }; } - /// The referenced/target-side operation for FK edges, or null when the edge - /// is not tied to a referenced table. - public GroupNode getTargetNode() { - return targetNode; - } - - /// The key-side operation for FK edges, or the operation that receives the - /// NULL-then-fixup patch for unique-slot edges. - public GroupNode getKeyNode() { - return keyNode; - } - /// The operation group that should receive a cycle-breaking patch. public GroupNode getPatchNode() { return keyNode; @@ -270,16 +231,6 @@ public GroupNode getTo() { return to; } - /// Whether this edge can be broken by temporarily nulling columns and - /// installing a later fixup. - /// - /// For nullable FK cycles this is the classic insert-null, insert-other-row, - /// update-FK pattern. For nullable unique swaps this temporarily clears the - /// unique value on one UPDATE and restores it afterward. - public boolean isBreakable() { - return isNullPatchable(); - } - public int getBreakCost() { return breakCost; } @@ -289,16 +240,6 @@ public SelectableMappings getColumnsToNull() { return columnsToNull; } - /// Whether the underlying constraint is defined as deferrable in the database. - /// This basically means that we do not need to worry about trying to break cycles; - /// the database will simply allow the 2 operations and check consistency at the end - /// of the transaction. - /// - /// @implNote This is currently not used, but is definitely something we want to use. - public boolean isDeferrable() { - return constraint != null && constraint.isDeferrable(); - } - public boolean isEffectivelyDeferred(DeferrableConstraintMode deferrableConstraintMode) { return constraint != null && deferrableConstraintMode.isDeferred( constraint.getDeferrability() ); } diff --git a/hibernate-core/src/main/java/org/hibernate/action/queue/internal/graph/StandardGraphBuilder.java b/hibernate-core/src/main/java/org/hibernate/action/queue/internal/graph/StandardGraphBuilder.java index 02e821afc3d4..e531294519d8 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/queue/internal/graph/StandardGraphBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/action/queue/internal/graph/StandardGraphBuilder.java @@ -183,7 +183,7 @@ private long createExecutionPrerequisiteEdges( } if ( prerequisiteNode != node && prerequisites.add( prerequisiteNode ) ) { outgoing.get( prerequisiteNode ).add( GraphEdge.requiredOrder( - prerequisiteNode, node, prerequisiteNode, node, Util.EMPTY_SELECTABLES, null, edgeId++ ) ); + node, prerequisiteNode, node, Util.EMPTY_SELECTABLES, null, edgeId++ ) ); } } } @@ -299,7 +299,6 @@ private long createInsertToOrderUpdateEdges( } outgoing.get( insert ).add( GraphEdge.requiredOrder( - insert, update, insert, update, @@ -354,7 +353,6 @@ private long createInsertToInsertEdges( final GraphEdge edge = breakable ? GraphEdge.nullPatchableFk( - parentInsert, childInsert, parentInsert, childInsert, @@ -364,7 +362,6 @@ private long createInsertToInsertEdges( edgeId++ ) : GraphEdge.requiredOrder( - parentInsert, childInsert, parentInsert, childInsert, @@ -399,7 +396,6 @@ private long createDeleteToDeleteEdges( // Ordinal-based cycle breaking in CycleBreaker will prefer to keep forward-flowing edges // Edge direction for DELETE: child -> parent (reversed!) final GraphEdge edge = GraphEdge.requiredOrder( - parentDelete, childDelete, childDelete, parentDelete, @@ -438,7 +434,6 @@ private long createInsertToUpdateEdges( // INSERT parent must happen before UPDATE child // Example: INSERT Product, then UPDATE Category SET product_id=1 final GraphEdge edge = GraphEdge.requiredOrder( - parentInsert, childUpdate, parentInsert, childUpdate, @@ -477,7 +472,6 @@ private long createUpdateToDeleteEdges( // UPDATE must happen before DELETE // Example: UPDATE Car SET engine_id=2, then DELETE Engine WHERE id=1 final GraphEdge edge = GraphEdge.requiredOrder( - delete, update, update, delete, @@ -536,7 +530,6 @@ private long addTableLevelDeleteInsertEdges( for ( GroupNode deleteNode : deleteNodes ) { for ( GroupNode insertNode : insertNodes ) { final GraphEdge edge = GraphEdge.preferredOrder( - null, null, deleteNode, insertNode, @@ -790,7 +783,6 @@ private long addUpdateReleaseToInsertEdges( } final GraphEdge edge = GraphEdge.preferredOrder( - null, insertNode, releaser, insertNode, @@ -898,7 +890,6 @@ private long addTableLevelDeleteInsertEdges( for ( GroupNode deleteNode : deleteNodes ) { for ( GroupNode insertNode : insertNodes ) { final GraphEdge edge = GraphEdge.preferredOrder( - null, null, deleteNode, insertNode, @@ -927,7 +918,6 @@ private GraphEdge createUniqueReleaseToOccupyEdge( UniqueConstraint constraint, long edgeId) { return GraphEdge.requiredOrder( - null, occupier, releaser, occupier, @@ -946,7 +936,6 @@ private GraphEdge createUniqueUpdateConflictEdge( long edgeId) { if ( isNullPatchableUniqueConstraint( constraint ) ) { return GraphEdge.nullPatchableUnique( - null, keyNode, from, to, @@ -958,7 +947,6 @@ private GraphEdge createUniqueUpdateConflictEdge( } return GraphEdge.requiredOrder( - null, keyNode, from, to, diff --git a/hibernate-core/src/main/java/org/hibernate/boot/BootLogging.java b/hibernate-core/src/main/java/org/hibernate/boot/BootLogging.java index 9ecd3d1d1536..c03de4fc1e89 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/BootLogging.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/BootLogging.java @@ -184,10 +184,6 @@ public interface BootLogging extends BasicLogger { @Message(id = 160165, value = "Attempting to determine component class by reflection %s") void attemptingToDetermineComponentClassByReflection(String role); - @LogMessage(level = TRACE) - @Message(id = 160166, value = "Mapped collection: %s") - void mappedCollection(String role); - @LogMessage(level = TRACE) @Message(id = 160167, value = "Mapping collection: %s -> %s") void mappingCollectionToTable(String role, String tableName); @@ -204,10 +200,6 @@ public interface BootLogging extends BasicLogger { @Message(id = 160170, value = "Binding named native query '%s' to [%s]") void bindingNamedNativeQuery(String queryName, String bindingTarget); - @LogMessage(level = TRACE) - @Message(id = 160171, value = "Binding SQL result set mapping '%s' to [%s]") - void bindingSqlResultSetMapping(String name, String target); - @LogMessage(level = TRACE) @Message(id = 160172, value = "Bound named stored procedure query: %s => %s") void boundStoredProcedureQuery(String name, String procedure); @@ -286,12 +278,6 @@ public interface BootLogging extends BasicLogger { @Message(id = 160191, value = "Inferring implicit @DiscriminatorColumn using defaults for: %s") void inferringImplicitDiscriminatorForJoined(String className); - // GeneratorBinder - - @LogMessage(level = TRACE) - @Message(id = 160192, value = "Added generator with name: %s, strategy: %s") - void addedGenerator(String name, String strategy); - @LogMessage(level = TRACE) @Message(id = 160193, value = "Added sequence generator with name: %s") void addedSequenceGenerator(String name); @@ -323,10 +309,6 @@ public interface BootLogging extends BasicLogger { @Message(id = 160204, value = "cfg.xml document did not define namespaces; wrapping in custom event reader to introduce namespace information") void cfgXmlDocumentDidNotDefineNamespaces(); - @LogMessage(level = DEBUG) - @Message(id = 160212, value = "Unable to adjust relative URL [%s] relative to root URL [%s]") - void unableToAdjustRelativeJarFileUrl(String filePart, String rootPath, @Cause Throwable e); - @LogMessage(level = TRACE) @Message(id = 160213, value = "JAR URL from URL Entry: %s >> %s") void jarUrlFromUrlEntry(String url, String jarUrl); @@ -355,14 +337,6 @@ public interface BootLogging extends BasicLogger { @Message(id = 160222, value = "Injecting JPA temp ClassLoader [%s] into BootstrapContext; was [%s]") void injectingJpaTempClassLoader(Object newLoader, Object oldLoader); - @LogMessage(level = TRACE) - @Message(id = 160223, value = "Injecting ScanOptions [%s] into BootstrapContext; was [%s]") - void injectingScanOptions(Object newOptions, Object oldOptions); - - @LogMessage(level = TRACE) - @Message(id = 160224, value = "Injecting ScanEnvironment [%s] into BootstrapContext; was [%s]") - void injectingScanEnvironment(Object newEnv, Object oldEnv); - @LogMessage(level = TRACE) @Message(id = 160225, value = "Injecting Scanner [%s] into BootstrapContext; was [%s]") void injectingScanner(Object newScanner, Object oldScanner); @@ -421,10 +395,6 @@ public interface BootLogging extends BasicLogger { @Message(id = 160238, value = "Indexing mapping document [%s] for purpose of building entity hierarchy ordering") void indexingMappingDocumentForHierarchyOrdering(String mappingDocumentName); - @LogMessage(level = DEBUG) - @Message(id = 160239, value = "Applying filter definition with condition: %s") - void applyingFilterDefinitionCondition(String condition); - @LogMessage(level = TRACE) @Message(id = 160240, value = "Processed filter definition: %s") void processedFilterDefinition(String name); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/internal/JaxbCfgProcessor.java b/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/internal/JaxbCfgProcessor.java index f62394b0912c..6352872ce951 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/internal/JaxbCfgProcessor.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/internal/JaxbCfgProcessor.java @@ -174,7 +174,7 @@ private Schema schema() { private Schema resolveLocalSchema(String schemaName) { final URL url = classLoaderService.locateResource( schemaName ); if ( url == null ) { - throw new XsdException( "Unable to locate schema [" + schemaName + "] via classpath", schemaName ); + throw new XsdException( "Unable to locate schema [" + schemaName + "] via classpath"); } try { final var schemaStream = url.openStream(); @@ -183,7 +183,7 @@ private Schema resolveLocalSchema(String schemaName) { .newSchema( new StreamSource( schemaStream ) ); } catch ( SAXException e ) { - throw new XsdException( "Unable to load schema [" + schemaName + "]", e, schemaName ); + throw new XsdException( "Unable to load schema [" + schemaName + "]", e); } finally { try { @@ -195,7 +195,7 @@ private Schema resolveLocalSchema(String schemaName) { } } catch ( IOException e ) { - throw new XsdException( "Stream error handling schema url [" + url.toExternalForm() + "]", schemaName ); + throw new XsdException( "Stream error handling schema url [" + url.toExternalForm() + "]"); } } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/ClassLoaderAccessImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/ClassLoaderAccessImpl.java index 66fd9f87efef..7f12d06e0ad4 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/internal/ClassLoaderAccessImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/ClassLoaderAccessImpl.java @@ -5,7 +5,6 @@ import org.hibernate.boot.registry.classloading.spi.ClassLoaderService; import org.hibernate.boot.registry.classloading.spi.ClassLoadingException; import org.hibernate.boot.spi.ClassLoaderAccess; -import org.hibernate.service.ServiceRegistry; import static org.hibernate.boot.BootLogging.BOOT_LOGGER; @@ -26,10 +25,6 @@ public ClassLoaderAccessImpl( this.classLoaderService = classLoaderService; } - public ClassLoaderAccessImpl(ClassLoader tempClassLoader, ServiceRegistry serviceRegistry) { - this( tempClassLoader, serviceRegistry.getService( ClassLoaderService.class ) ); - } - public ClassLoaderAccessImpl(ClassLoaderService classLoaderService) { this( null, classLoaderService ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/InFlightMetadataCollectorImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/InFlightMetadataCollectorImpl.java index cb4235eae17d..44ca021bfd3e 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/internal/InFlightMetadataCollectorImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/InFlightMetadataCollectorImpl.java @@ -547,10 +547,6 @@ public ConverterRegistry getConverterRegistry() { return this; } - public AttributeConverterManager getAttributeConverterManager() { - return attributeConverterManager; - } - @Override public void addAttributeConverter(Class> converterClass) { attributeConverterManager.addConverter( diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataBuilderImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataBuilderImpl.java index fd4a6ab1517b..e83101b85350 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataBuilderImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataBuilderImpl.java @@ -366,11 +366,6 @@ public MetadataBuilder applyTempClassLoader(@Nullable ClassLoader tempClassLoade return this; } - public MetadataBuilder noConstraintByDefault() { - options.noConstraintByDefault = true; - return this; - } - @Override @Nonnull public MetadataBuilder applyFunctions(@Nonnull FunctionContributor functionContributor) { diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryOptionsBuilder.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryOptionsBuilder.java index 95c3a157bb12..f48871e638b8 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryOptionsBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryOptionsBuilder.java @@ -26,7 +26,6 @@ import org.hibernate.HibernateException; import org.hibernate.Interceptor; import org.hibernate.LockOptions; -import org.hibernate.Remove; import org.hibernate.SessionEventListener; import org.hibernate.SessionFactoryObserver; import org.hibernate.audit.AuditStrategy; @@ -1914,23 +1913,10 @@ public void enableJpaClosedCompliance(boolean enabled) { mutableJpaCompliance().setClosedCompliance( enabled ); } - public void enableJpaProxyCompliance(boolean enabled) { - mutableJpaCompliance().setProxyCompliance( enabled ); - } - - public void enableJpaCachingCompliance(boolean enabled) { - mutableJpaCompliance().setCachingCompliance( enabled ); - } - public void enableJpaOrderByMappingCompliance(boolean enabled) { mutableJpaCompliance().setOrderByMappingCompliance( enabled ); } - @Remove - public void enableGeneratorNameScopeCompliance(boolean enabled) { - mutableJpaCompliance().setGeneratorNameScopeCompliance( enabled ); - } - public void enableCollectionInDefaultFetchGroup(boolean enabled) { this.collectionsInDefaultFetchGroupEnabled = enabled; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/TargetColumnAdapter.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/TargetColumnAdapter.java index 2e56f3572505..95e56f2f148e 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/TargetColumnAdapter.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/TargetColumnAdapter.java @@ -29,8 +29,4 @@ interface TargetColumnAdapter { void setRead(String value); void setWrite(String value); - - void setInsertable(Boolean value); - - void setUpdatable(Boolean value); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/TargetColumnAdapterJaxbColumn.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/TargetColumnAdapterJaxbColumn.java index 21c4d27be5e2..2bba46767231 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/TargetColumnAdapterJaxbColumn.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/TargetColumnAdapterJaxbColumn.java @@ -53,20 +53,6 @@ public void setUnique(Boolean value) { } } - @Override - public void setInsertable(Boolean value) { - if ( value != null ) { - jaxbColumn.setInsertable( value ); - } - } - - @Override - public void setUpdatable(Boolean value) { - if ( value != null ) { - jaxbColumn.setUpdatable( value ); - } - } - @Override public void setLength(Integer value) { if ( value != null ) { diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/TargetColumnAdapterJaxbJoinColumn.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/TargetColumnAdapterJaxbJoinColumn.java index c9b840b82c2c..d2322681feb1 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/TargetColumnAdapterJaxbJoinColumn.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/TargetColumnAdapterJaxbJoinColumn.java @@ -48,20 +48,6 @@ public void setUnique(Boolean value) { } } - @Override - public void setInsertable(Boolean value) { - if ( value != null ) { - jaxbColumn.setInsertable( value ); - } - } - - @Override - public void setUpdatable(Boolean value) { - if ( value != null ) { - jaxbColumn.setUpdatable( value ); - } - } - @Override public void setLength(Integer value) { } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/AbstractBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/AbstractBinder.java index 2dbe939f0de8..17eeb0ac1d6f 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/AbstractBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/AbstractBinder.java @@ -134,10 +134,6 @@ private XMLInputFactory buildStaxFactory() { return staxFactory; } - protected StartElement seekRootElementStartEvent(XMLEventReader staxEventReader, Origin origin) { - return seekRootElement( staxEventReader, origin ).startElement(); - } - private RootElement seekRootElement(XMLEventReader staxEventReader, Origin origin) { XMLEvent rootElementStartEvent; boolean declaresEntities = false; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/CacheableFileXmlSource.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/CacheableFileXmlSource.java index a69a1032b62b..4502696e82d8 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/CacheableFileXmlSource.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/CacheableFileXmlSource.java @@ -145,14 +145,6 @@ private static void writeSerFile( } } - public static void createSerFile(File xmlFile, MappingBinder binder) { - createSerFile( xmlFile, determineCachedFile( xmlFile ), binder ); - } - - public static void createSerFile(File xmlFile, File outputFile, MappingBinder binder) { - writeSerFile( FileXmlSource.fromFile( xmlFile, binder ).getRoot(), xmlFile, outputFile ); - } - public static boolean isSerfileObsolete(File xmlFile, File serFile) { return xmlFile.exists() && serFile.exists() diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/BaseXMLEventReader.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/BaseXMLEventReader.java index f9d8c3a1167d..10ff43d6cdcf 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/BaseXMLEventReader.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/BaseXMLEventReader.java @@ -31,13 +31,6 @@ public BaseXMLEventReader(XMLEventReader reader) { */ protected abstract XMLEvent internalNextEvent() throws XMLStreamException; - /** - * @return The XMLEvent returned by the last call to {@link #internalNextEvent()} - */ - protected final XMLEvent getPreviousEvent() { - return this.previousEvent; - } - @Override public final XMLEvent nextEvent() throws XMLStreamException { this.previousEvent = this.internalNextEvent(); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/BufferedXMLEventReader.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/BufferedXMLEventReader.java index 1b70cb707470..3be1777e7f76 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/BufferedXMLEventReader.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/BufferedXMLEventReader.java @@ -1,8 +1,6 @@ package org.hibernate.boot.jaxb.internal.stax; -import java.util.ArrayList; import java.util.LinkedList; -import java.util.List; import java.util.ListIterator; import javax.xml.stream.XMLEventReader; import javax.xml.stream.XMLStreamException; @@ -21,13 +19,6 @@ public class BufferedXMLEventReader extends BaseXMLEventReader { private int eventLimit; private ListIterator bufferReader; - /** - * Create new buffering reader, no buffering is done until {@link #mark(int)} is called. - */ - public BufferedXMLEventReader(XMLEventReader reader) { - super(reader); - } - /** * Create new buffering reader. Calls {@link #mark(int)} with the specified event limit * @see #mark(int) @@ -37,13 +28,6 @@ public BufferedXMLEventReader(XMLEventReader reader, int eventLimit) { this.eventLimit = eventLimit; } - /** - * @return A copy of the current buffer - */ - public List getBuffer() { - return new ArrayList<>(this.eventBuffer); - } - @Override protected XMLEvent internalNextEvent() throws XMLStreamException { //If there is an iterator to read from reset was called, use the iterator @@ -90,13 +74,6 @@ public XMLEvent peek() throws XMLStreamException { return super.peek(); } - /** - * Same as calling {@link #mark(int)} with -1. - */ - public void mark() { - this.mark(-1); - } - /** * Start buffering events * @param eventLimit the maximum number of events to buffer. -1 will buffer all events, 0 will buffer no events. @@ -148,13 +125,6 @@ public void close() throws XMLStreamException { super.close(); } - /** - * @return The number of events in the buffer. - */ - public int bufferSize() { - return this.eventBuffer.size(); - } - /** * If reading from the buffer after a {@link #reset()} call an {@link IllegalStateException} will be thrown. */ diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/HbmEventReader.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/HbmEventReader.java index ebce250c97a1..15adadbe22e7 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/HbmEventReader.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/HbmEventReader.java @@ -31,10 +31,6 @@ public class HbmEventReader extends EventReaderDelegate { private final XMLEventFactory xmlEventFactory; - public HbmEventReader(XMLEventReader reader) { - this( reader, XMLEventFactory.newInstance() ); - } - public HbmEventReader(XMLEventReader reader, XMLEventFactory xmlEventFactory) { super( reader ); this.xmlEventFactory = xmlEventFactory; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/JpaOrmXmlEventReader.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/JpaOrmXmlEventReader.java deleted file mode 100644 index daf8f10dc034..000000000000 --- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/JpaOrmXmlEventReader.java +++ /dev/null @@ -1,190 +0,0 @@ -package org.hibernate.boot.jaxb.internal.stax; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import javax.xml.namespace.QName; -import javax.xml.stream.XMLEventFactory; -import javax.xml.stream.XMLEventReader; -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.events.Attribute; -import javax.xml.stream.events.EndElement; -import javax.xml.stream.events.Namespace; -import javax.xml.stream.events.StartElement; -import javax.xml.stream.events.XMLEvent; -import javax.xml.stream.util.EventReaderDelegate; - -import org.hibernate.boot.xsd.MappingXsdSupport; -import org.hibernate.boot.xsd.XsdHelper; - -/** - * StAX EVentReader which handles a few oddities specific to JPA {@code orm.xml} - * - * Mainly we handle the namespace change. - * - * Ultimately we should handle "upgrading" the documents as well. The idea being that - * we'd always treat all versions as the latest. - * - * {@see HHH-8108} for more discussion. - * - * @author Strong Liu - * @author Steve Ebersole - * @author Hardy Ferentschik - */ -public class JpaOrmXmlEventReader extends EventReaderDelegate { - - private static final String ROOT_ELEMENT_NAME = "entity-mappings"; - private static final String VERSION_ATTRIBUTE_NAME = "version"; - - private final XMLEventFactory xmlEventFactory; - - public JpaOrmXmlEventReader(XMLEventReader reader) { - this( reader, XMLEventFactory.newInstance() ); - } - - public JpaOrmXmlEventReader(XMLEventReader reader, XMLEventFactory xmlEventFactory) { - super( reader ); - this.xmlEventFactory = xmlEventFactory; - } - - @Override - public XMLEvent peek() throws XMLStreamException { - return wrap( super.peek() ); - } - - @Override - public XMLEvent nextEvent() throws XMLStreamException { - return wrap( super.nextEvent() ); - } - - private XMLEvent wrap(XMLEvent event) { - if ( event != null ) { - if ( event.isStartElement() ) { - return wrap( event.asStartElement() ); - } - else if ( event.isEndElement() ) { - return wrap( event.asEndElement() ); - } - } - return event; - } - - private StartElement wrap(StartElement startElement) { - final List newElementAttributeList = mapAttributes( startElement ); - final List newNamespaceList = mapNamespaces( startElement ); - - // Transfer the location info from the incoming event to the event factory - // so that the event we ask it to generate for us has the same location info - xmlEventFactory.setLocation( startElement.getLocation() ); - return xmlEventFactory.createStartElement( - new QName( MappingXsdSupport.latestJpaDescriptor().getNamespaceUri(), startElement.getName().getLocalPart() ), - newElementAttributeList.iterator(), - newNamespaceList.iterator() - ); - } - - private List mapAttributes(StartElement startElement) { - final List mappedAttributes = new ArrayList<>(); - - final Iterator existingAttributesIterator = existingXmlAttributesIterator( startElement ); - while ( existingAttributesIterator.hasNext() ) { - final Attribute originalAttribute = existingAttributesIterator.next(); - final Attribute attributeToUse = mapAttribute( startElement, originalAttribute ); - mappedAttributes.add( attributeToUse ); - } - - return mappedAttributes; - } - - private Iterator existingXmlAttributesIterator(StartElement startElement) { - return startElement.getAttributes(); - } - - private Attribute mapAttribute(StartElement startElement, Attribute originalAttribute) { - // Here we look to see if this attribute is the JPA version attribute, and if so do 2 things: - // 1) validate its version attribute is valid - // 2) update its version attribute to the default version if not already - // - // NOTE : atm this is a very simple check using just the attribute's local name - // rather than checking its qualified name. It is possibly (though unlikely) - // that this could match on "other" version attributes in the same element - - if ( ROOT_ELEMENT_NAME.equals( startElement.getName().getLocalPart() ) ) { - if ( VERSION_ATTRIBUTE_NAME.equals( originalAttribute.getName().getLocalPart() ) ) { - final String specifiedVersion = originalAttribute.getValue(); - - if ( ! XsdHelper.isValidJpaVersion( specifiedVersion ) ) { - throw new BadVersionException( specifiedVersion ); - } - - return xmlEventFactory.createAttribute( VERSION_ATTRIBUTE_NAME, MappingXsdSupport.latestJpaDescriptor().getVersion() ); - } - } - - return originalAttribute; - } - - private List mapNamespaces(StartElement startElement) { - return mapNamespaces( existingXmlNamespacesIterator( startElement ) ); - } - - private List mapNamespaces(Iterator originalNamespaceIterator ) { - final List mappedNamespaces = new ArrayList<>(); - - while ( originalNamespaceIterator.hasNext() ) { - final Namespace originalNamespace = originalNamespaceIterator.next(); - final Namespace mappedNamespace = mapNamespace( originalNamespace ); - mappedNamespaces.add( mappedNamespace ); - } - - if ( mappedNamespaces.isEmpty() ) { - mappedNamespaces.add( xmlEventFactory.createNamespace( MappingXsdSupport.latestJpaDescriptor().getNamespaceUri() ) ); - } - - return mappedNamespaces; - } - - private Iterator existingXmlNamespacesIterator(StartElement startElement) { - return startElement.getNamespaces(); - } - - private Namespace mapNamespace(Namespace originalNamespace) { - if ( XsdHelper.shouldBeMappedToLatestJpaDescriptor( originalNamespace.getNamespaceURI() ) ) { - // this is a namespace "to map" so map it - return xmlEventFactory.createNamespace( - originalNamespace.getPrefix(), - MappingXsdSupport.latestJpaDescriptor().getNamespaceUri() - ); - } - - return originalNamespace; - } - - private XMLEvent wrap(EndElement endElement) { - final List targetNamespaces = mapNamespaces( existingXmlNamespacesIterator( endElement ) ); - - // Transfer the location info from the incoming event to the event factory - // so that the event we ask it to generate for us has the same location info - xmlEventFactory.setLocation( endElement.getLocation() ); - return xmlEventFactory.createEndElement( - new QName( MappingXsdSupport.latestJpaDescriptor().getNamespaceUri(), endElement.getName().getLocalPart() ), - targetNamespaces.iterator() - ); - } - - private Iterator existingXmlNamespacesIterator(EndElement endElement) { - return endElement.getNamespaces(); - } - - public static class BadVersionException extends RuntimeException { - private final String requestedVersion; - - public BadVersionException(String requestedVersion) { - this.requestedVersion = requestedVersion; - } - - public String getRequestedVersion() { - return requestedVersion; - } - } -} diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/LocalSchemaLocator.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/LocalSchemaLocator.java index a7b207dd9330..db871751285c 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/LocalSchemaLocator.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/LocalSchemaLocator.java @@ -1,13 +1,6 @@ package org.hibernate.boot.jaxb.internal.stax; -import java.io.IOException; import java.net.URL; -import javax.xml.transform.stream.StreamSource; -import javax.xml.validation.Schema; - -import org.hibernate.boot.cfgxml.internal.XmlFactoryUtil; - -import static org.hibernate.boot.jaxb.JaxbLogger.JAXB_LOGGER; /** * Helper for resolving XML Schema references locally. @@ -35,32 +28,4 @@ public static URL resolveLocalSchemaUrl(String schemaResourceName) { } return url; } - - public static Schema resolveLocalSchema(String schemaName){ - return resolveLocalSchema( resolveLocalSchemaUrl( schemaName ) ); - } - - public static Schema resolveLocalSchema(URL schemaUrl) { - try { - final var schemaStream = schemaUrl.openStream(); - try { - return XmlFactoryUtil.newSchemaFactory() - .newSchema( new StreamSource( schemaStream ) ); - } - catch ( Exception e ) { - throw new XmlInfrastructureException( "Unable to load schema [" + schemaUrl.toExternalForm() + "]", e ); - } - finally { - try { - schemaStream.close(); - } - catch ( IOException e ) { - JAXB_LOGGER.problemClosingSchemaStream( e.toString() ); - } - } - } - catch ( IOException e ) { - throw new XmlInfrastructureException( "Stream error handling schema url [" + schemaUrl.toExternalForm() + "]" ); - } - } } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/LocalXmlResourceResolver.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/LocalXmlResourceResolver.java index fa6ad5220c0a..67a72bc02dc8 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/LocalXmlResourceResolver.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/LocalXmlResourceResolver.java @@ -225,9 +225,5 @@ public boolean matches(String publicId, String systemId) { return false; } - - public URL getMappedLocalUrl() { - return localSchemaUrl; - } } } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/AttributeConverterManager.java b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/AttributeConverterManager.java index 7324da711b66..8d4eb1c6a788 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/AttributeConverterManager.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/AttributeConverterManager.java @@ -36,10 +36,6 @@ public class AttributeConverterManager implements ConverterAutoApplyHandler { private Map, ConverterDescriptor> attributeConverterDescriptorsByClass; private Map registeredConversionsByDomainType; - public RegisteredConversion findRegisteredConversion(Class domainType) { - return registeredConversionsByDomainType == null ? null : registeredConversionsByDomainType.get( domainType ); - } - public void addConverter(ConverterDescriptor descriptor) { final var converterClass = descriptor.getAttributeConverterClass(); if ( BOOT_LOGGER.isTraceEnabled() ) { diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotatedColumn.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotatedColumn.java index a8f81bacb9b2..096d8d8ea90c 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotatedColumn.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotatedColumn.java @@ -101,34 +101,10 @@ public String getLogicalColumnName() { return logicalColumnName; } - public String getSqlType() { - return sqlType; - } - - public Long getLength() { - return length; - } - - public Integer getPrecision() { - return precision; - } - - public Integer getScale() { - return scale; - } - - public Integer getArrayLength() { - return arrayLength; - } - public void setArrayLength(Integer arrayLength) { this.arrayLength = arrayLength; } - public boolean isUnique() { - return unique; - } - public boolean isFormula() { return isNotEmpty( formulaString ); } @@ -193,10 +169,6 @@ public boolean isNullable() { return isFormula() || mappingColumn.isNullable(); } - public String getDefaultValue() { - return defaultValue; - } - public void setDefaultValue(String defaultValue) { this.defaultValue = defaultValue; } @@ -209,18 +181,6 @@ public void addCheckConstraint(String name, String constraint, String options) { checkConstraints.add( new CheckConstraint( name, constraint, options ) ); } -// public String getComment() { -// return comment; -// } - -// public void setComment(String comment) { -// this.comment = comment; -// } - - public String getGeneratedAs() { - return generatedAs; - } - private void setGeneratedAs(String as) { this.generatedAs = as; } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotationBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotationBinder.java index f40c2b8f8ce7..ba57286ea71e 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotationBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotationBinder.java @@ -21,7 +21,6 @@ import org.hibernate.boot.model.convert.spi.RegisteredConversion; import org.hibernate.boot.models.HibernateAnnotations; import org.hibernate.boot.models.JpaAnnotations; -import org.hibernate.boot.registry.classloading.spi.ClassLoaderService; import org.hibernate.boot.spi.InFlightMetadataCollector.CollectionTypeRegistrationDescriptor; import org.hibernate.boot.spi.MetadataBuildingContext; import org.hibernate.models.spi.AnnotationTarget; @@ -135,19 +134,6 @@ private static ModelsContext modelsContext(MetadataBuildingContext context) { return context.getBootstrapContext().getModelsContext(); } - public static void bindPackage(ClassLoaderService cls, String packageName, MetadataBuildingContext context) { - final var packageDetails = modelsContext( context ).getClassDetailsRegistry() - .resolveExplicitPackageDetails( packageName ); - bindDescriptor( packageDetails, context ); - } - - public static void bindModule(String moduleName, MetadataBuildingContext context) { - final var moduleDetails = modelsContext( context ).getModuleDetailsRegistry() - .resolveModuleDetails( moduleName ); - - bindDescriptor( moduleDetails, context ); - } - public static void bindDescriptor(AnnotationTarget descriptor, MetadataBuildingContext context) { registerGlobalGenerators( descriptor, context ); @@ -464,21 +450,6 @@ public static void bindFetchProfilesForDescriptor(AnnotationTarget descriptor, M bindFetchProfiles( descriptor, context ); } - public static void bindFetchProfilesForPackage(String packageName, MetadataBuildingContext context) { - final var packageInfoClassDetails = - context.getMetadataCollector().getClassDetailsRegistry() - .findPackageDetails( packageName ); - if ( packageInfoClassDetails != null ) { - bindFetchProfiles( packageInfoClassDetails, context ); - } - } - - public static void bindFetchProfilesForModule(String moduleName, MetadataBuildingContext context) { - final var moduleDetails = modelsContext( context ).getModuleDetailsRegistry() - .resolveModuleDetails( moduleName ); - bindFetchProfiles( moduleDetails, context ); - } - private static void bindFetchProfiles(AnnotationTarget annotatedElement, MetadataBuildingContext context) { annotatedElement.forEachAnnotationUsage( FetchProfile.class, modelsContext( context ), (usage) -> { bindFetchProfile( usage, context ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AttributeConversionInfo.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AttributeConversionInfo.java index 117054c8e584..80978ba5e104 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AttributeConversionInfo.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AttributeConversionInfo.java @@ -18,26 +18,21 @@ public class AttributeConversionInfo { private final boolean conversionDisabled; private final String attributeName; - private final AnnotationTarget source; - @SuppressWarnings({ "unchecked", "rawtypes" }) public AttributeConversionInfo( Class converterClass, boolean conversionDisabled, - String attributeName, - AnnotationTarget source) { + String attributeName) { this.converterClass = (Class>) converterClass; this.conversionDisabled = conversionDisabled; this.attributeName = attributeName; - this.source = source; } public AttributeConversionInfo(Convert convertAnnotation, AnnotationTarget source) { this( convertAnnotation.converter(), convertAnnotation.disableConversion(), - convertAnnotation.attributeName(), - source + convertAnnotation.attributeName() ); } @@ -63,11 +58,4 @@ public Class> getConverterClass() { public boolean isConversionDisabled() { return conversionDisabled; } - - /** - * The annotated element - */ - public AnnotationTarget getSource() { - return source; - } } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/BinderHelper.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/BinderHelper.java index ebff7e8ff6b3..dc94119506d5 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/BinderHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/BinderHelper.java @@ -595,26 +595,6 @@ public static Property findPropertyByName(PersistentClass associatedClass, Strin } } - /** - * Retrieve the property by path in a recursive way - */ - public static Property findPropertyByName(Component component, String propertyName) { - try { - return isEmpty( propertyName ) - ? null // Do not expect to use a primary key for this case - : findProperty( component, propertyName, null ); - } - catch (MappingException e) { - try { - // if we do not find it, try to check the identifier mapper - return findPropertyUsingIdMapper( component.getOwner(), propertyName ); - } - catch (MappingException ee) { - return null; - } - } - } - private static Property findProperty( PersistentClass associatedClass, String propertyName, Property idProperty, String idName) { diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ClassPropertyHolder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ClassPropertyHolder.java index dad6110a4d1b..d826c3e621f0 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ClassPropertyHolder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ClassPropertyHolder.java @@ -480,11 +480,6 @@ public String getClassName() { return persistentClass.getClassName(); } - @Override - public String getEntityOwnerClassName() { - return getClassName(); - } - @Override public Table getTable() { return persistentClass.getTable(); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/CollectionPropertyHolder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/CollectionPropertyHolder.java index a23d3078612e..f25b16bc243f 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/CollectionPropertyHolder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/CollectionPropertyHolder.java @@ -66,10 +66,6 @@ public CollectionPropertyHolder( this.keyAttributeConversionInfoMap = new HashMap<>(); } - public Collection getCollectionBinding() { - return collection; - } - private void buildAttributeConversionInfoMaps( MemberDetails collectionProperty, boolean isComposite, @@ -245,11 +241,6 @@ public String getClassName() { throw new AssertionFailure( "Collection property holder does not have a class name" ); } - @Override - public String getEntityOwnerClassName() { - return null; - } - @Override public Table getTable() { return collection.getCollectionTable(); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ComponentPropertyHolder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ComponentPropertyHolder.java index b11d07b93b36..13d34ad896d3 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ComponentPropertyHolder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ComponentPropertyHolder.java @@ -327,11 +327,6 @@ public String getClassName() { return component.getComponentClassName(); } - @Override - public String getEntityOwnerClassName() { - return component.getOwner().getClassName(); - } - public AggregateColumn getAggregateColumn() { final var aggregateColumn = component.getAggregateColumn(); return aggregateColumn != null ? aggregateColumn : component.getParentAggregateColumn(); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/EmbeddableBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/EmbeddableBinder.java index 96e94ffc5e2f..1195b20efdf9 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/EmbeddableBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/EmbeddableBinder.java @@ -1094,10 +1094,6 @@ private static void applyColumnNamingPattern(Component embeddable, PropertyData embeddable.setColumnNamingPattern( columnNamingPattern ); } - private static ConstructorDetails resolveInstantiator(TypeDetails embeddableClass) { - return embeddableClass == null ? null : resolveInstantiator( embeddableClass.determineRawClass() ); - } - private static ConstructorDetails resolveInstantiator(ClassDetails embeddableClass) { if ( embeddableClass == null ) { return null; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/NamedGraphCreatorJpa.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/NamedGraphCreatorJpa.java index 7160bda8da04..ef14aefb7aeb 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/NamedGraphCreatorJpa.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/NamedGraphCreatorJpa.java @@ -24,7 +24,6 @@ import java.util.Arrays; import java.util.List; -import static java.util.Collections.emptyList; import static org.hibernate.internal.util.StringHelper.isNotEmpty; import static org.hibernate.internal.util.StringHelper.nullIfEmpty; @@ -38,14 +37,6 @@ class NamedGraphCreatorJpa implements NamedGraphCreator { private final List fetchContributions; private final ModelsContext modelsContext; - NamedGraphCreatorJpa(NamedEntityGraph annotation, String jpaEntityName) { - this( annotation, jpaEntityName, emptyList(), null ); - } - - NamedGraphCreatorJpa(NamedEntityGraph annotation, String jpaEntityName, List fetchContributions) { - this( annotation, jpaEntityName, fetchContributions, null ); - } - NamedGraphCreatorJpa( NamedEntityGraph annotation, String jpaEntityName, diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ObjectNameSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ObjectNameSource.java index 3310f4733a68..05290bb24320 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ObjectNameSource.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ObjectNameSource.java @@ -12,12 +12,4 @@ public interface ObjectNameSource { * @return The explicit name. */ String getExplicitName(); - - /** - * Retrieve the logical name for this object. Usually this is the name under which - * the "thing" is registered. - * - * @return The logical name. - */ - String getLogicalName(); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PropertyBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PropertyBinder.java index c8d8f444d312..09c7bdf7a0c0 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PropertyBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PropertyBinder.java @@ -121,7 +121,6 @@ public class PropertyBinder { private AnnotatedColumns columns; private PropertyHolder holder; private Value value; - private Component componentElement; private boolean insertable = true; private boolean updatable = true; private EnumSet cascadeTypes; @@ -207,7 +206,6 @@ public void setValue(Value value) { } private void setComponentElement(Component componentElement) { - this.componentElement = componentElement; } public void setCascade(EnumSet cascadeTypes) { diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PropertyHolder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PropertyHolder.java index bbc935cfbe8e..01b3aa9c0249 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PropertyHolder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PropertyHolder.java @@ -24,8 +24,6 @@ public interface PropertyHolder { String getClassName(); - String getEntityOwnerClassName(); - Table getTable(); void addProperty(Property prop, MemberDetails memberDetails, ClassDetails declaringClass); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/QueryHintDefinition.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/QueryHintDefinition.java index 2fbd6ce90015..15ec99935880 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/QueryHintDefinition.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/QueryHintDefinition.java @@ -1,26 +1,7 @@ package org.hibernate.boot.model.internal; import jakarta.annotation.Nonnull; -import jakarta.annotation.Nullable; -import jakarta.persistence.LockModeType; -import jakarta.persistence.NamedQuery; import jakarta.persistence.QueryHint; -import jakarta.persistence.Timeout; -import org.hibernate.AnnotationException; -import org.hibernate.CacheMode; -import org.hibernate.LockMode; -import org.hibernate.LockOptions; -import org.hibernate.Locking; -import org.hibernate.MappingException; -import org.hibernate.Timeouts; -import org.hibernate.cfg.AvailableSettings; -import org.hibernate.internal.util.LockModeConverter; -import org.hibernate.internal.util.config.ConfigurationHelper; -import org.hibernate.jpa.HibernateHints; -import org.hibernate.jpa.LegacySpecHints; -import org.hibernate.jpa.SpecHints; -import jakarta.persistence.QueryFlushMode; -import org.hibernate.jpa.internal.util.FlushModeTypeHelper; import java.util.Map; @@ -32,11 +13,9 @@ * @author Strong Liu */ public class QueryHintDefinition { - private final String queryName; private final Map hintsMap; - public QueryHintDefinition(@Nonnull String queryName, final QueryHint[] hints) { - this.queryName = queryName; + public QueryHintDefinition(final QueryHint[] hints) { if ( isEmpty( hints ) ) { hintsMap = emptyMap(); } @@ -57,157 +36,4 @@ public QueryHintDefinition(@Nonnull String queryName, final QueryHint[] hints) { public Map getHintsMap() { return hintsMap; } - - @Nullable - public String getString(@Nonnull String hintName) { - return (String) hintsMap.get( hintName ); - } - - public boolean getBoolean(@Nonnull String hintName) { - try { - return ConfigurationHelper.getBoolean( hintName, hintsMap ); - } - catch (Exception e) { - throw new AnnotationException( "Named query hint [" + hintName + "] is not a boolean: " + queryName, e ); - } - } - - @Nullable - public Boolean getBooleanWrapper(@Nonnull String hintName) { - try { - return ConfigurationHelper.getBooleanWrapper( hintName, hintsMap, null ); - } - catch (Exception e) { - throw new AnnotationException( "Named query hint [" + hintName + "] is not a boolean: " + queryName, e ); - } - } - - @Nullable - public Integer getInteger(@Nonnull String hintName) { - try { - return ConfigurationHelper.getInteger( hintName, hintsMap ); - } - catch (Exception e) { - throw new AnnotationException( "Named query hint [" + hintName + "] is not an integer: " + queryName, e ); - } - } - - - // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - // Specialized access - - @Nullable - public Integer getTimeout() { - final Integer jakartaTimeout = getInteger( SpecHints.HINT_SPEC_QUERY_TIMEOUT ); - if ( jakartaTimeout != null ) { - // convert milliseconds to seconds - return (int) Math.round( jakartaTimeout.doubleValue() / 1000.0 ); - } - - final Integer javaeeTimeout = getInteger( LegacySpecHints.HINT_JAVAEE_QUERY_TIMEOUT ); - if ( javaeeTimeout != null ) { - // convert milliseconds to seconds - return (int) Math.round( javaeeTimeout.doubleValue() / 1000.0 ); - } - - return getInteger( HibernateHints.HINT_TIMEOUT ); - } - - @Nullable - public Timeout getTimeoutRef() { - final Integer timeoutSeconds = getTimeout(); - return timeoutSeconds == null ? null : Timeout.seconds( timeoutSeconds ); - } - - public boolean getCacheability() { - return getBoolean( HibernateHints.HINT_CACHEABLE ); - } - - @Nullable - public CacheMode getCacheMode() { - final String value = getString( HibernateHints.HINT_CACHE_MODE ); - try { - return value == null - ? null - : CacheMode.interpretExternalSetting( value ); - } - catch (Exception e) { - throw new AnnotationException( "Unable to interpret CacheMode in named query hint: " + queryName, e ); - } - } - - @Nullable - public QueryFlushMode getFlushMode() { - final String value = getString( HibernateHints.HINT_FLUSH_MODE ); - try { - return value == null - ? null - : FlushModeTypeHelper.queryFlushModeFromHint( value ); - } - catch (MappingException e) { - throw new AnnotationException( "Unable to interpret FlushMode in named query hint: " + queryName, e ); - } - } - - @Nullable - public LockMode getLockMode(String query) { - final var value = (String) hintsMap.get( HibernateHints.HINT_NATIVE_LOCK_MODE ); - if ( value == null ) { - return null; - } - try { - return LockMode.fromExternalForm( value ); - } - catch ( MappingException e ) { - throw new AnnotationException( "Unknown LockMode in hint: " + query - + ":" + HibernateHints.HINT_NATIVE_LOCK_MODE, e ); - } - } - - @Nonnull - public LockOptions determineLockOptions(NamedQuery namedQueryAnnotation) { - return determineLockOptions( namedQueryAnnotation.lockMode(), specLockTimeout(), followOnStrategy() ); - } - - @Nullable - private Integer specLockTimeout() { - final Integer jakartaLockTimeout = getInteger( AvailableSettings.JAKARTA_LOCK_TIMEOUT ); - if ( jakartaLockTimeout != null ) { - return jakartaLockTimeout; - } - - return getInteger( AvailableSettings.JPA_LOCK_TIMEOUT ); - } - - @Nonnull - private Locking.FollowOn followOnStrategy() { - final Object strategyValue = hintsMap.get( HibernateHints.HINT_FOLLOW_ON_STRATEGY ); - if ( strategyValue != null ) { - if ( strategyValue instanceof Locking.FollowOn strategy ) { - return strategy; - } - else { - // assume it is a FollowOn name - return Locking.FollowOn.valueOf( strategyValue.toString() ); - } - } - else { - final Boolean lockingValue = getBooleanWrapper( HibernateHints.HINT_FOLLOW_ON_LOCKING ); - return Locking.FollowOn.fromLegacyValue( lockingValue ); - } - } - - @Nonnull - private LockOptions determineLockOptions( - LockModeType lockModeType, - Integer lockTimeoutHint, - Locking.FollowOn followOnStrategy) { - final var lockOptions = new LockOptions() - .setLockMode( LockModeConverter.convertToLockMode( lockModeType ) ) - .setFollowOnStrategy( followOnStrategy ); - if ( lockTimeoutHint != null ) { - lockOptions.setTimeout( Timeouts.interpretMilliSeconds( lockTimeoutHint ) ); - } - return lockOptions; - } } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ResultSetMappingSecondPass.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ResultSetMappingSecondPass.java index 297547dfa590..068fe7a93ba7 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ResultSetMappingSecondPass.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ResultSetMappingSecondPass.java @@ -22,10 +22,6 @@ public class ResultSetMappingSecondPass implements QuerySecondPass { private final @Nullable AnnotationTarget location; private final boolean isDefault; - public ResultSetMappingSecondPass(SqlResultSetMapping annotation, MetadataBuildingContext context, boolean isDefault) { - this( annotation, context, null, isDefault ); - } - public ResultSetMappingSecondPass( SqlResultSetMapping annotation, MetadataBuildingContext context, diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/TableBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/TableBinder.java index 834860a9c10e..5a1ba059e6ba 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/TableBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/TableBinder.java @@ -117,20 +117,14 @@ public void setJPA2ElementCollection(boolean isJPA2ElementCollection) { private static class AssociationTableNameSource implements ObjectNameSource { private final String explicitName; - private final String logicalName; private AssociationTableNameSource(String explicitName, String logicalName) { this.explicitName = explicitName; - this.logicalName = logicalName; } public String getExplicitName() { return explicitName; } - - public String getLogicalName() { - return logicalName; - } } // only bind association table currently diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/ManagedResourcesBuilder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/ManagedResourcesBuilder.java index 304a193f6628..82ca76e9bc26 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/ManagedResourcesBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/ManagedResourcesBuilder.java @@ -80,12 +80,6 @@ public ManagedResourcesBuilder addQueryImport(String name, Class type) { return this; } - public ManagedResourcesBuilder addResources(ManagedResources resources) { - addNonXmlResources( resources ); - resources.getXmlMappingBindings().forEach( this::addXmlBinding ); - return this; - } - /// Copy retained handles and registrations when replacing an XML batch. public ManagedResourcesBuilder addNonXmlResources(ManagedResources resources) { resources.getAnnotatedClassReferences().forEach( this::addClass ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/OverriddenMappingDefaults.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/OverriddenMappingDefaults.java index c19a7dc2d09b..3dc24526dcde 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/OverriddenMappingDefaults.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/OverriddenMappingDefaults.java @@ -226,32 +226,6 @@ public Builder setImplicitCatalogName(String implicitCatalogName) { return this; } - public Builder setImplicitlyQuoteIdentifiers(boolean implicitlyQuoteIdentifiers) { - this.implicitlyQuoteIdentifiers = implicitlyQuoteIdentifiers; - return this; - } - - public Builder setImplicitIdColumnName(String implicitIdColumnName) { - if ( StringHelper.isNotEmpty( implicitIdColumnName ) ) { - this.implicitIdColumnName = implicitIdColumnName; - } - return this; - } - - public Builder setImplicitTenantIdColumnName(String implicitTenantIdColumnName) { - if ( StringHelper.isNotEmpty( implicitTenantIdColumnName ) ) { - this.implicitTenantIdColumnName = implicitTenantIdColumnName; - } - return this; - } - - public Builder setImplicitDiscriminatorColumnName(String implicitDiscriminatorColumnName) { - if ( StringHelper.isNotEmpty( implicitDiscriminatorColumnName ) ) { - this.implicitDiscriminatorColumnName = implicitDiscriminatorColumnName; - } - return this; - } - public Builder setImplicitPackageName(String implicitPackageName) { if ( StringHelper.isNotEmpty( implicitPackageName ) ) { this.implicitPackageName = implicitPackageName; @@ -295,22 +269,6 @@ public Builder setPluralAttributesImplicitlyLazy(boolean pluralAttributesImplici return this; } - public Builder setImplicitCacheAccessType(AccessType implicitCacheAccessType) { - if ( implicitCacheAccessType != null ) { - this.implicitCacheAccessType = implicitCacheAccessType; - } - return this; - } - - /** - * @deprecated Use {@link org.hibernate.annotations.DefaultListSemantics} on a package or module. - * Scheduled for removal in 9.0. - */ - @Deprecated(since = "8.0", forRemoval = true) - public CollectionClassification getImplicitListClassification() { - return implicitListClassification; - } - /** * @deprecated Use {@link org.hibernate.annotations.DefaultListSemantics} on a package or module. * Scheduled for removal in 9.0. diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/annotations/AdditionalManagedResourcesImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/annotations/AdditionalManagedResourcesImpl.java index aca86b248aad..74ecfe1bc001 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/annotations/AdditionalManagedResourcesImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/annotations/AdditionalManagedResourcesImpl.java @@ -54,11 +54,6 @@ public Builder addClassDetails(List details) { return this; } - public Builder addPackages(String... packages) { - List.of( packages ).forEach( resources::addPackageDescriptor ); - return this; - } - public ManagedResources build() { return resources.build(); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/AbstractHbmSourceNode.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/AbstractHbmSourceNode.java index d1dff51818a9..2da4e4bdc8aa 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/AbstractHbmSourceNode.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/AbstractHbmSourceNode.java @@ -1,7 +1,6 @@ package org.hibernate.boot.model.source.internal.hbm; import org.hibernate.boot.jaxb.Origin; -import org.hibernate.boot.jaxb.hbm.spi.JaxbHbmHibernateMapping; /** * Base class for any and all source objects coming from {@code hbm.xml} parsing. Defines standard access @@ -28,8 +27,4 @@ protected HbmLocalMetadataBuildingContext metadataBuildingContext() { protected Origin origin() { return sourceMappingDocument().getOrigin(); } - - protected JaxbHbmHibernateMapping mappingRoot() { - return sourceMappingDocument().getDocumentRoot(); - } } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/AbstractNamedQueryBuilder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/AbstractNamedQueryBuilder.java index 07a2db342520..0fa182cb03ec 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/AbstractNamedQueryBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/AbstractNamedQueryBuilder.java @@ -111,10 +111,6 @@ public CacheMode getCacheMode() { return cacheMode; } - public QueryFlushMode getFlushMode() { - return flushMode; - } - public Boolean getReadOnly() { return readOnly; } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/AbstractPluralAttributeSourceImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/AbstractPluralAttributeSourceImpl.java index 2e20d753e78c..039a9138eff7 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/AbstractPluralAttributeSourceImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/AbstractPluralAttributeSourceImpl.java @@ -40,7 +40,6 @@ public abstract class AbstractPluralAttributeSourceImpl private static final FilterSource[] NO_FILTER_SOURCES = new FilterSource[0]; private final PluralAttributeInfo pluralAttributeJaxbMapping; - private final AttributeSourceContainer container; private final AttributeRole attributeRole; private final AttributePath attributePath; @@ -63,7 +62,6 @@ protected AbstractPluralAttributeSourceImpl( AttributeSourceContainer container) { super( mappingDocument ); this.pluralAttributeJaxbMapping = pluralAttributeJaxbMapping; - this.container = container; this.attributeRole = container.getAttributeRoleBase().append( pluralAttributeJaxbMapping.getName() ); this.attributePath = container.getAttributePathBase().append( pluralAttributeJaxbMapping.getName() ); @@ -269,10 +267,6 @@ public boolean usesJoinTable() { } } - protected AttributeSourceContainer container() { - return container; - } - @Override public FilterSource[] getFilterSources() { return filterSources == null diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/CompositeIdentifierSingularAttributeSourceManyToOneImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/CompositeIdentifierSingularAttributeSourceManyToOneImpl.java index 531d0fbb100e..0b4b6e6710d2 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/CompositeIdentifierSingularAttributeSourceManyToOneImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/CompositeIdentifierSingularAttributeSourceManyToOneImpl.java @@ -250,10 +250,6 @@ public boolean isCascadeDeleteEnabled() { return "cascade".equals( keyManyToOneElement.getOnDelete().value() ); } - protected String getClassName() { - return sourceMappingDocument().qualifyClassName( keyManyToOneElement.getClazz() ); - } - @Override public ToolingHintContext getToolingHintContext() { return toolingHintContext; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/ConfigParameterHelper.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/ConfigParameterHelper.java index 4f9466dd94c8..5ab28f799432 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/ConfigParameterHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/ConfigParameterHelper.java @@ -4,7 +4,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Properties; import org.hibernate.boot.jaxb.hbm.spi.ConfigParameterContainer; import org.hibernate.boot.jaxb.hbm.spi.JaxbHbmConfigParameterType; @@ -18,12 +17,6 @@ public static Map extractConfigParameters(ConfigParameterContain return extractConfigParameters( container.getConfigParameters() ); } - public static Properties extractConfigParametersAsProperties(ConfigParameterContainer container) { - final Properties properties = new Properties(); - properties.putAll( extractConfigParameters( container.getConfigParameters() ) ); - return properties; - } - private static Map extractConfigParameters(List paramElementList) { if ( CollectionHelper.isEmpty( paramElementList ) ) { return Collections.emptyMap(); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/HbmLocalMetadataBuildingContext.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/HbmLocalMetadataBuildingContext.java index 04ea69979f76..c314793878c5 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/HbmLocalMetadataBuildingContext.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/HbmLocalMetadataBuildingContext.java @@ -3,7 +3,6 @@ import org.hibernate.boot.jaxb.hbm.spi.EntityInfo; import org.hibernate.boot.model.source.spi.LocalMetadataBuildingContext; import org.hibernate.boot.model.source.spi.ToolingHintContext; -import org.hibernate.mapping.PersistentClass; /** * Access to contextual information specific to a {@code hbm.xml} mapping. @@ -18,6 +17,4 @@ public interface HbmLocalMetadataBuildingContext extends LocalMetadataBuildingCo String determineEntityName(String entityName, String clazz); String qualifyClassName(String name); - - PersistentClass findEntityBinding(String entityName, String clazz); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/Helper.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/Helper.java index 0bea2250050d..7f3c854f8a98 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/Helper.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/Helper.java @@ -29,7 +29,6 @@ import java.util.Map; import static org.hibernate.internal.util.StringHelper.nullIfEmpty; -import static org.hibernate.property.access.spi.BuiltInPropertyAccessStrategies.EMBEDDED; /** * @author Steve Ebersole @@ -93,10 +92,6 @@ public static Caching createNaturalIdCaching(JaxbHbmNaturalIdCacheType cacheElem ); } - public static String getPropertyAccessorName(String access, boolean isEmbedded, String defaultAccess) { - return getValue( access, isEmbedded ? EMBEDDED.getExternalName() : defaultAccess ); - } - public static T getValue(T value, T defaultValue){ return value == null ? defaultValue : value; } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/HqlQueryBuilder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/HqlQueryBuilder.java index 605c8bab4d08..ba9f0a1f20cf 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/HqlQueryBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/HqlQueryBuilder.java @@ -1,7 +1,6 @@ package org.hibernate.boot.model.source.internal.hbm; import org.hibernate.boot.query.internal.NamedHqlSelectionDefinitionImpl; -import org.hibernate.models.spi.AnnotationTarget; import java.util.HashMap; import java.util.Map; @@ -20,10 +19,6 @@ public class HqlQueryBuilder extends AbstractNamedQueryBuilder parameterTypes; - public HqlQueryBuilder(String name, AnnotationTarget location) { - super( name, location ); - } - public HqlQueryBuilder(String name) { super( name, null ); } @@ -33,19 +28,11 @@ protected HqlQueryBuilder getThis() { return this; } - public String getHqlString() { - return hqlString; - } - public HqlQueryBuilder setHqlString(String hqlString) { this.hqlString = hqlString; return this; } - public String getEntityGraphName() { - return entityGraphName; - } - public HqlQueryBuilder setEntityGraphName(String entityGraphName) { this.entityGraphName = entityGraphName; return this; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/IdClassSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/IdClassSource.java index 8cc101a609b5..99f0b671de3c 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/IdClassSource.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/IdClassSource.java @@ -20,7 +20,6 @@ class IdClassSource implements EmbeddableSource { private final JavaTypeDescriptor idClassDescriptor; private final RootEntitySourceImpl rootEntitySource; - private final MappingDocument sourceMappingDocument; private final AttributePath attributePathBase; private final AttributeRole attributeRoleBase; @@ -33,7 +32,6 @@ class IdClassSource implements EmbeddableSource { MappingDocument sourceMappingDocument) { this.idClassDescriptor = idClassDescriptor; this.rootEntitySource = rootEntitySource; - this.sourceMappingDocument = sourceMappingDocument; this.attributePathBase = rootEntitySource.getAttributePathBase().append( "" ); this.attributeRoleBase = rootEntitySource.getAttributeRoleBase().append( "" ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/IdentifierSourceAggregatedCompositeImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/IdentifierSourceAggregatedCompositeImpl.java index 25dec6e8fdd6..14a27bfcecd6 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/IdentifierSourceAggregatedCompositeImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/IdentifierSourceAggregatedCompositeImpl.java @@ -153,7 +153,6 @@ public ToolingHintContext getToolingHintContext() { private static class EmbeddedAttributeMappingAdapterAggregatedCompositeId implements EmbeddedAttributeMapping, EmbeddableSourceContainer, EmbeddableMapping { - private final RootEntitySourceImpl rootEntitySource; private final JaxbHbmCompositeIdType jaxbCompositeIdMapping; private final AttributeRole idAttributeRole; @@ -162,7 +161,6 @@ private static class EmbeddedAttributeMappingAdapterAggregatedCompositeId private EmbeddedAttributeMappingAdapterAggregatedCompositeId( RootEntitySourceImpl rootEntitySource) { - this.rootEntitySource = rootEntitySource; this.jaxbCompositeIdMapping = rootEntitySource.jaxbEntityMapping().getCompositeId(); this.idAttributeRole = rootEntitySource.getAttributeRoleBase().append( jaxbCompositeIdMapping.getName() ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/MappingDocument.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/MappingDocument.java index 9a5924280bad..c16129ede85f 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/MappingDocument.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/MappingDocument.java @@ -17,7 +17,6 @@ import org.hibernate.boot.spi.MetadataBuildingContext; import org.hibernate.boot.spi.MetadataBuildingOptions; import org.hibernate.internal.util.StringHelper; -import org.hibernate.mapping.PersistentClass; import static org.hibernate.boot.BootLogging.BOOT_LOGGER; @@ -110,11 +109,6 @@ public String qualifyClassName(String name) { return qualifyIfNeeded( name, mappingDefaults.getDefaultPackageName() ); } - @Override - public PersistentClass findEntityBinding(String entityName, String clazz) { - return getMetadataCollector().getEntityBinding( determineEntityName( entityName, clazz ) ); - } - @Override public Origin getOrigin() { return origin; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/NativeQueryBuilder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/NativeQueryBuilder.java index e03d23278113..33a25ea82026 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/NativeQueryBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/NativeQueryBuilder.java @@ -2,7 +2,6 @@ import org.hibernate.boot.query.NamedNativeQueryDefinition; import org.hibernate.boot.query.internal.NamedNativeSelectionDefinitionImpl; -import org.hibernate.models.spi.AnnotationTarget; import java.util.Collections; import java.util.HashMap; @@ -25,10 +24,6 @@ class NativeQueryBuilder extends AbstractNamedQueryBuilder addSynchronizedQuerySpace(String space) { return getThis(); } - public NativeQueryBuilder setQuerySpaces(Set spaces) { - this.querySpaces = spaces; - return this; - } - public NativeQueryBuilder setResultSetMappingName(String resultSetMappingName) { this.resultSetMappingName = resultSetMappingName; return this; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeElementSourceManyToAnyImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeElementSourceManyToAnyImpl.java index a77b8a46fa33..74e6868c72f9 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeElementSourceManyToAnyImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeElementSourceManyToAnyImpl.java @@ -22,8 +22,6 @@ */ public class PluralAttributeElementSourceManyToAnyImpl implements PluralAttributeElementSourceManyToAny { - private final String cascade; - private final AnyDiscriminatorSource discriminatorSource; private final AnyKeySource keySource; @@ -32,8 +30,6 @@ public PluralAttributeElementSourceManyToAnyImpl( final AbstractPluralAttributeSourceImpl pluralAttributeSource, final JaxbHbmManyToAnyCollectionElementType jaxbManyToAnyMapping, String cascade) { - this.cascade = cascade; - final List relationalValueSources = RelationalValueSourceHelper.buildValueSources( mappingDocument, null, diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeElementSourceOneToManyImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeElementSourceOneToManyImpl.java index 6c568cbe0f9f..987dd1b7332d 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeElementSourceOneToManyImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/PluralAttributeElementSourceOneToManyImpl.java @@ -14,7 +14,6 @@ public class PluralAttributeElementSourceOneToManyImpl implements PluralAttributeElementSourceOneToMany { private final JaxbHbmOneToManyCollectionElementType jaxbOneToManyElement; private final String referencedEntityName; - private final String cascadeString; public PluralAttributeElementSourceOneToManyImpl( MappingDocument mappingDocument, @@ -23,7 +22,6 @@ public PluralAttributeElementSourceOneToManyImpl( String cascadeString) { super( mappingDocument, pluralAttributeSource ); this.jaxbOneToManyElement = jaxbOneToManyElement; - this.cascadeString = cascadeString; this.referencedEntityName = StringHelper.isNotEmpty( jaxbOneToManyElement.getEntityName() ) ? jaxbOneToManyElement.getEntityName() diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/RelationalValueSourceHelper.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/RelationalValueSourceHelper.java index 5b29a7db14de..99e7478a7d19 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/RelationalValueSourceHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/RelationalValueSourceHelper.java @@ -419,35 +419,4 @@ && isNotEmpty( columnsAndFormulasSource.getSourceName() ) ) { } } - private static void validateCustomWriteFragment( - MappingDocument sourceDocument, - ColumnsAndFormulasSource columnsAndFormulasSource, - JaxbHbmColumnType columnMapping, - String customWrite) { - if ( customWrite != null && !customWrite.matches("[^?]*\\?[^?]*") ) { - final String errorMessage; - if ( columnsAndFormulasSource.getSourceType().canBeNamed() - && isNotEmpty( columnsAndFormulasSource.getSourceName() ) ) { - errorMessage = String.format( - Locale.ENGLISH, - "write expression must contain exactly one value placeholder ('?') character near for <%s name=\"%s\" />", - columnMapping.getName(), - customWrite, - columnsAndFormulasSource.getSourceType().getElementName(), - columnsAndFormulasSource.getSourceName() - ); - } - else { - errorMessage = String.format( - Locale.ENGLISH, - "write expression must contain exactly one value placeholder ('?') character near for <%s />", - columnMapping.getName(), - customWrite, - columnsAndFormulasSource.getSourceType().getElementName() - ); - } - throw new MappingException( errorMessage, sourceDocument.getOrigin() ); - } - } - } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/XmlElementMetadata.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/XmlElementMetadata.java index 0f4242c1ffff..22892932d29c 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/XmlElementMetadata.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/XmlElementMetadata.java @@ -11,138 +11,135 @@ public enum XmlElementMetadata { /** * Describes the {@code } element */ - ID( true, true ), + ID( true ), /** * Describes the {@code } element */ - COMPOSITE_ID( false, true ), + COMPOSITE_ID( true ), /** * Describes the {@code } element */ - DISCRIMINATOR( true, false ), + DISCRIMINATOR( false ), /** * Describes the {@code } element */ - MULTI_TENANCY( true, false ), + MULTI_TENANCY( false ), /** * Describes the {@code } element */ - VERSION( true, true ), + VERSION( true ), /** * Describes the {@code } element */ - TIMESTAMP( true, true ), + TIMESTAMP( true ), /** * Describes the {@code } element */ - NATURAL_ID( false, false ), + NATURAL_ID( false ), /** * Describes the {@code } element */ - PROPERTIES( false, true ), + PROPERTIES( true ), /** * Describes the {@code } element */ - PROPERTY( false, true ), + PROPERTY( true ), /** * Describes the {@code } element */ - KEY_PROPERTY( false, true ), + KEY_PROPERTY( true ), /** * Describes the {@code } element */ - MANY_TO_ONE( false, true ), + MANY_TO_ONE( true ), /** * Describes the {@code } element */ - KEY_MANY_TO_ONE( false, true ), + KEY_MANY_TO_ONE( true ), /** * Describes the {@code } element */ - ONE_TO_ONE( false, true ), + ONE_TO_ONE( true ), /** * Describes the {@code } element */ - ANY( false, true ), + ANY( true ), /** * Describes the {@code } element */ - COMPONENT( false, true ), + COMPONENT( true ), /** * Describes the {@code } element */ - KEY( false, false ), + KEY( false ), /** * Describes the {@code } element */ - SET( false, true ), + SET( true ), /** * Describes the {@code } element */ - LIST( false, true ), + LIST( true ), /** * Describes the {@code } element */ - BAG( false, true ), + BAG( true ), /** * Describes the {@code } element */ - ID_BAG( false, true ), + ID_BAG( true ), /** * Describes the {@code } element */ - MAP( false, true ), + MAP( true ), /** * Describes the {@code } element */ - ARRAY( false, true ), + ARRAY( true ), /** * Describes the {@code } element */ - PRIMITIVE_ARRAY( false, true ), + PRIMITIVE_ARRAY( true ), /** * Describes the {@code } element */ - COLLECTION_ID( true, false ), + COLLECTION_ID( false ), /** * Describes the {@code } element */ - ELEMENT( false, false ), + ELEMENT( false ), /** * Describes the {@code } element */ - MANY_TO_MANY( false, false ), + MANY_TO_MANY( false ), /** * Describes the {@code } element */ - MANY_TO_ANY( false, false ), + MANY_TO_ANY( false ), /** * Describes the {@code } element */ - MAP_KEY( false, false ), + MAP_KEY( false ), /** * Describes the {@code } element */ - MAP_KEY_MANY_TO_MANY( false, false ), + MAP_KEY_MANY_TO_MANY( false ), /** * Describes the {@code } element */ - INDEX( false, false ), + INDEX( false ), /** * Describes the {@code } element */ - INDEX_MANY_TO_MANY( false, false ), + INDEX_MANY_TO_MANY( false ), /** * Describes the {@code } element */ - LIST_INDEX( true, false ); - - private final boolean inherentlySingleColumn; + LIST_INDEX( false ); private final boolean canBeNamed; - XmlElementMetadata(boolean inherentlySingleColumn, boolean canBeNamed) { - this.inherentlySingleColumn = inherentlySingleColumn; + XmlElementMetadata(boolean canBeNamed) { this.canBeNamed = canBeNamed; } @@ -155,16 +152,6 @@ public String getElementName() { return name().toLowerCase(Locale.ROOT); } - /** - * Can this source, by nature, define just a single column/formula? - * - * @return {@code true} indicates that the source will refer to just a - * single column. - */ - public boolean isInherentlySingleColumn() { - return inherentlySingleColumn; - } - /** * Can the source be named. This is used in implicit naming (naming strategy). * diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/internal/DomainModelCategorizationCollector.java b/hibernate-core/src/main/java/org/hibernate/boot/models/internal/DomainModelCategorizationCollector.java index 1521a0ec43fd..997b2de6e2e3 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/internal/DomainModelCategorizationCollector.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/internal/DomainModelCategorizationCollector.java @@ -41,18 +41,6 @@ public GlobalRegistrationsImpl getGlobalRegistrations() { return globalRegistrations; } - public Set getRootEntities() { - return rootEntities; - } - - public Map getMappedSuperclasses() { - return mappedSuperclasses; - } - - public Map getEmbeddables() { - return embeddables; - } - public void apply(JaxbEntityMappingsImpl jaxbRoot, XmlDocumentContext xmlDocumentContext) { globalRegistrations.collectJavaTypeRegistrations( jaxbRoot.getJavaTypeRegistrations() ); globalRegistrations.collectJdbcTypeRegistrations( jaxbRoot.getJdbcTypeRegistrations() ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/internal/OrmAnnotationHelper.java b/hibernate-core/src/main/java/org/hibernate/boot/models/internal/OrmAnnotationHelper.java index 983177d121dc..0a4c8b583c50 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/internal/OrmAnnotationHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/internal/OrmAnnotationHelper.java @@ -1,12 +1,6 @@ package org.hibernate.boot.models.internal; import java.lang.annotation.Annotation; -import java.lang.annotation.Documented; -import java.lang.annotation.Repeatable; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; -import java.util.ArrayList; -import java.util.List; import java.util.Locale; import java.util.function.Consumer; @@ -62,24 +56,4 @@ public static V extractJdkValue(A jdkAnnotation, Annot final AttributeDescriptor attributeDescriptor = annotationDescriptor.getAttribute( attributeName ); return extractJdkValue( jdkAnnotation, attributeDescriptor, modelContext ); } - - public static List extractAnnotationTypeAnnotations(Class annotationType) { - final ArrayList result = new ArrayList<>(); - final var annotationTypeAnnotations = annotationType.getAnnotations(); - for ( int i = 0; i < annotationTypeAnnotations.length; i++ ) { - final var annotationTypeAnnotation = annotationTypeAnnotations[i]; - final var annotationTypeAnnotationType = annotationTypeAnnotation.annotationType(); - - // skip a few well-know ones that are irrelevant - if ( annotationTypeAnnotationType == Repeatable.class - || annotationTypeAnnotationType == Target.class - || annotationTypeAnnotationType == Retention.class - || annotationTypeAnnotationType == Documented.class ) { - continue; - } - - result.add( annotationTypeAnnotation ); - } - return result; - } } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/spi/LifecycleEventHandler.java b/hibernate-core/src/main/java/org/hibernate/boot/models/spi/LifecycleEventHandler.java index ad86d52988db..7d9d6e66692b 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/spi/LifecycleEventHandler.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/spi/LifecycleEventHandler.java @@ -393,13 +393,6 @@ private static void errorIfEmpty(LifecycleEventHandler descriptor) { } } - /// Create a handler from annotations based on annotated methods on the given `listenerClassDetails`. - /// Used from XML parsing when no explicit methods are identified indicating that we should use - /// whatever event annotations are available, and errror if none are found. - private static LifecycleEventHandler from(JpaEventListenerStyle consumerType, ClassDetails listenerClassDetails) { - return from( consumerType, listenerClassDetails, true ); - } - /// Create a handler from annotations based on annotated methods on the given `listenerClassDetails`. public static LifecycleEventHandler from( JpaEventListenerStyle consumerType, diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/AttributeProcessor.java b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/AttributeProcessor.java index fb2e1b58ba3e..44a75d9a240b 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/AttributeProcessor.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/AttributeProcessor.java @@ -44,14 +44,6 @@ * @author Steve Ebersole */ public class AttributeProcessor { - public static void processNaturalId( - JaxbNaturalId jaxbNaturalId, - MutableClassDetails mutableClassDetails, - AccessType classAccessType, - XmlDocumentContext xmlDocumentContext) { - processNaturalId( jaxbNaturalId, mutableClassDetails, classAccessType, null, xmlDocumentContext ); - } - public static void processNaturalId( JaxbNaturalId jaxbNaturalId, MutableClassDetails mutableClassDetails, diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/SimpleTypeInterpretation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/SimpleTypeInterpretation.java index cbeebe8846c6..75ae0571d7b6 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/SimpleTypeInterpretation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/SimpleTypeInterpretation.java @@ -85,26 +85,19 @@ public enum SimpleTypeInterpretation { private final Class javaType; - private final SimpleTypeInterpretation objectForm; SimpleTypeInterpretation(Class javaType) { this.javaType = javaType; - this.objectForm = this; } SimpleTypeInterpretation(Class javaType, SimpleTypeInterpretation objectForm) { this.javaType = javaType; - this.objectForm = objectForm; } public Class getJavaType() { return javaType; } - public SimpleTypeInterpretation getObjectForm() { - return objectForm; - } - public static SimpleTypeInterpretation interpret(String name) { assert StringHelper.isNotEmpty( name ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/XmlAnnotationHelper.java b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/XmlAnnotationHelper.java index 5eddcfafef58..6f3ab38b5554 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/XmlAnnotationHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/XmlAnnotationHelper.java @@ -79,7 +79,6 @@ import org.hibernate.boot.models.HibernateAnnotations; import org.hibernate.boot.models.JpaAnnotations; import org.hibernate.boot.models.JpaEventListenerStyle; -import org.hibernate.boot.models.XmlAnnotations; import org.hibernate.boot.models.annotations.internal.AssociationOverrideJpaAnnotation; import org.hibernate.boot.models.annotations.internal.AssociationOverridesJpaAnnotation; import org.hibernate.boot.models.annotations.internal.AuditedTableAnnotation; @@ -140,7 +139,6 @@ import org.hibernate.boot.models.annotations.internal.SynchronizeAnnotation; import org.hibernate.boot.models.annotations.internal.TableGeneratorJpaAnnotation; import org.hibernate.boot.models.annotations.internal.TableJpaAnnotation; -import org.hibernate.boot.models.annotations.internal.TargetXmlAnnotation; import org.hibernate.boot.models.annotations.internal.HistoryPartitioningAnnotation; import org.hibernate.boot.models.annotations.internal.HistoryTableAnnotation; import org.hibernate.boot.models.annotations.internal.TemporalAnnotation; @@ -512,17 +510,6 @@ public static void applyCascading( } } - public static void applyTargetClass( - String name, - MutableMemberDetails memberDetails, - XmlDocumentContext xmlDocumentContext) { - final TargetXmlAnnotation targetAnn = (TargetXmlAnnotation) memberDetails.applyAnnotationUsage( - XmlAnnotations.TARGET, - xmlDocumentContext.getModelBuildingContext() - ); - targetAnn.value( name ); - } - @SuppressWarnings("deprecation") public static void applyTemporal( TemporalType temporalType, @@ -1296,10 +1283,6 @@ public static ClassDetails resolveSimpleJavaType(String value, ClassDetailsRegis return resolveJavaType( null, value, classDetailsRegistry ); } - public static ClassDetails resolveJavaType(String value, ClassDetailsRegistry classDetailsRegistry) { - return resolveJavaType( null, value, classDetailsRegistry ); - } - public static ClassDetails resolveJavaType(String packageName, String name, ClassDetailsRegistry classDetailsRegistry) { if ( isEmpty( name ) ) { name = Object.class.getName(); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/XmlProcessingHelper.java b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/XmlProcessingHelper.java index 07de74917048..7587387e4f9e 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/XmlProcessingHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/XmlProcessingHelper.java @@ -29,10 +29,6 @@ public static String determineClassName(JaxbEntityMappingsImpl jaxbRoot, JaxbMan return StringHelper.qualifyConditionallyIfNot( jaxbRoot.getPackage(), jaxbManagedType.getClazz() ); } - public static AccessType inverse(AccessType accessType) { - return accessType == AccessType.FIELD ? AccessType.PROPERTY : AccessType.FIELD; - } - /** * Find the member backing the named attribute */ diff --git a/hibernate-core/src/main/java/org/hibernate/boot/query/HbmResultSetMappingDescriptor.java b/hibernate-core/src/main/java/org/hibernate/boot/query/HbmResultSetMappingDescriptor.java index c1177d7a1555..493fa282562e 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/query/HbmResultSetMappingDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/query/HbmResultSetMappingDescriptor.java @@ -756,8 +756,6 @@ public FetchMemento resolve(@Nonnull ResultSetMappingResolutionContext resolutio ownerTableAlias, tableAlias, keyColumnNames, - lockMode, - thisAsParentMemento, fetchDescriptorMap, (Fetchable) thisAsParentMemento.getFetchableContainer() ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/query/internal/NamedNativeSelectionDefinitionImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/query/internal/NamedNativeSelectionDefinitionImpl.java index af2cce8f58e7..d4eb80acf23f 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/query/internal/NamedNativeSelectionDefinitionImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/query/internal/NamedNativeSelectionDefinitionImpl.java @@ -187,17 +187,6 @@ public static NamedNativeSelectionDefinitionImpl from( ); } - /// Build a definition from JPA's [jakarta.persistence.NamedNativeQuery] annotation. - /// - /// @param annotation The annotation. - /// @param location Where the annotation was found. - @Nonnull - public static NamedNativeSelectionDefinitionImpl from( - @Nonnull jakarta.persistence.NamedNativeQuery annotation, - @Nullable AnnotationTarget location) { - return from( annotation, location, annotation.resultSetMapping() ); - } - @Nonnull public static NamedNativeSelectionDefinitionImpl from( @Nonnull jakarta.persistence.NamedNativeQuery annotation, diff --git a/hibernate-core/src/main/java/org/hibernate/boot/query/internal/NamedProcedureCallDefinitionImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/query/internal/NamedProcedureCallDefinitionImpl.java index 160a4d33a14a..6c6aad5191c9 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/query/internal/NamedProcedureCallDefinitionImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/query/internal/NamedProcedureCallDefinitionImpl.java @@ -48,7 +48,7 @@ public class NamedProcedureCallDefinitionImpl implements NamedProcedureCallDefin public NamedProcedureCallDefinitionImpl(@Nonnull NamedStoredProcedureQuery annotation) { registeredName = annotation.name(); procedureName = annotation.procedureName(); - hints = new QueryHintDefinition( registeredName, annotation.hints() ).getHintsMap(); + hints = new QueryHintDefinition( annotation.hints() ).getHintsMap(); resultClasses = annotation.resultClasses(); resultSetMappings = annotation.resultSetMappings(); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/registry/internal/BootstrapServiceRegistryImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/registry/internal/BootstrapServiceRegistryImpl.java index 58f5dee5e22e..e58456d754f1 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/registry/internal/BootstrapServiceRegistryImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/registry/internal/BootstrapServiceRegistryImpl.java @@ -116,26 +116,6 @@ public BootstrapServiceRegistryImpl( } - /** - * Constructs a BootstrapServiceRegistryImpl. - * - * Do not use directly generally speaking. Use {@link org.hibernate.boot.registry.BootstrapServiceRegistryBuilder} - * instead. - * - * @param classLoaderService The ClassLoaderService to use - * @param strategySelector The StrategySelector to use - * @param integratorService The IntegratorService to use - * - * @see org.hibernate.boot.registry.BootstrapServiceRegistryBuilder - */ - public BootstrapServiceRegistryImpl( - ClassLoaderService classLoaderService, - StrategySelector strategySelector, - IntegratorService integratorService) { - this( true, classLoaderService, strategySelector, integratorService ); - } - - /** * Constructs a BootstrapServiceRegistryImpl. * diff --git a/hibernate-core/src/main/java/org/hibernate/boot/scan/internal/ScannerLogger.java b/hibernate-core/src/main/java/org/hibernate/boot/scan/internal/ScannerLogger.java index 92e0cab92e28..1eb6ccedd0cf 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/scan/internal/ScannerLogger.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/scan/internal/ScannerLogger.java @@ -11,7 +11,6 @@ import org.jboss.logging.annotations.ValidIdRange; import java.lang.invoke.MethodHandles; -import java.net.URL; import java.util.Locale; /** @@ -38,10 +37,6 @@ public interface ScannerLogger extends BasicLogger { @Message(id = 60002, value = "No ScanningProvider available (to enable scanning add 'hibernate-scan-jandex' dependency or supply a custom ScanningProvider)") void noScannerFactoryAvailable(); - @LogMessage(level = Logger.Level.DEBUG) - @Message(id = 60003, value = "Unable to resolve class [%s] named in persistence unit [%s]") - void unableToResolveClass(String className, URL rootUrl); - @LogMessage(level = Logger.Level.WARN) @Message(id = 60004, value = "Scanning was triggered, but no ScanningProvider available; did you forget to add 'hibernate-scan-jandex' dependency?") void scanningWithNoScannerFactory(); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/InFlightMetadataCollector.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/InFlightMetadataCollector.java index 424a3bad2750..3b7934a4b022 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/spi/InFlightMetadataCollector.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/InFlightMetadataCollector.java @@ -390,8 +390,6 @@ interface EntityTableXref { } class DuplicateSecondaryTableException extends HibernateException { - private final Identifier tableName; - public DuplicateSecondaryTableException(Identifier tableName) { super( String.format( @@ -400,7 +398,6 @@ public DuplicateSecondaryTableException(Identifier tableName) { tableName.render() ) ); - this.tableName = tableName; } } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/xsd/LocalXsdResolver.java b/hibernate-core/src/main/java/org/hibernate/boot/xsd/LocalXsdResolver.java index db207fa3bfc9..f74c7f3b1369 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/xsd/LocalXsdResolver.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/xsd/LocalXsdResolver.java @@ -70,7 +70,7 @@ public static URL resolveLocalXsdUrl(String resourceName) { public static Schema resolveLocalXsdSchema(String schemaResourceName) { final URL url = resolveLocalXsdUrl( schemaResourceName ); if ( url == null ) { - throw new XsdException( "Unable to locate schema [" + schemaResourceName + "] via classpath", schemaResourceName ); + throw new XsdException( "Unable to locate schema [" + schemaResourceName + "] via classpath"); } try { final var schemaStream = url.openStream(); @@ -79,7 +79,7 @@ public static Schema resolveLocalXsdSchema(String schemaResourceName) { .newSchema( new StreamSource( schemaStream ) ); } catch ( SAXException e ) { - throw new XsdException( "Unable to load schema [" + schemaResourceName + "]", e, schemaResourceName ); + throw new XsdException( "Unable to load schema [" + schemaResourceName + "]", e); } finally { try { @@ -91,7 +91,7 @@ public static Schema resolveLocalXsdSchema(String schemaResourceName) { } } catch ( IOException e ) { - throw new XsdException( "Stream error handling schema url [" + url.toExternalForm() + "]", schemaResourceName ); + throw new XsdException( "Stream error handling schema url [" + url.toExternalForm() + "]"); } } diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/BytecodeEnhancementLogging.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/BytecodeEnhancementLogging.java index ab13aee63f40..eb6d119c9c9f 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/BytecodeEnhancementLogging.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/BytecodeEnhancementLogging.java @@ -68,10 +68,6 @@ public interface BytecodeEnhancementLogging extends BasicLogger { @Message(id = 90009009, value = "Weaving in PersistentAttributeInterceptable implementation on [%s]") void weavingPersistentAttributeInterceptable(String className); - @LogMessage(level = TRACE) - @Message(id = 90009010, value = "mappedBy association for field [%s.%s] is [%s.%s]") - void mappedByAssociation(String ownerName, String fieldName, String targetEntityName, String targetFieldName); - @LogMessage(level = TRACE) @Message(id = 90009011, value = "Persistent fields for entity %s: %s") void persistentFieldsForEntity(String entityName, String orderedFields); diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/BridgeMembersClassInfo.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/BridgeMembersClassInfo.java index 0408e1023d00..5e54cb97b45f 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/BridgeMembersClassInfo.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/BridgeMembersClassInfo.java @@ -23,18 +23,10 @@ public Iterable gettersIterable() { return getters; } - public Iterable settersIterable() { - return setters; - } - public boolean containsGetter(Member getter) { return getters.contains( getter ); } - public boolean containsSetter(Member setter) { - return setters.contains( setter ); - } - public void addGetter(Member getter) { getters.add( getter ); } diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/ByteBuddyEnhancementContext.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/ByteBuddyEnhancementContext.java index 221ce1fffddf..27253f22e4c6 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/ByteBuddyEnhancementContext.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/ByteBuddyEnhancementContext.java @@ -81,10 +81,6 @@ public boolean doBiDirectionalAssociationManagement() { return options.doBiDirectionalAssociationManagement(); } - public boolean isDiscoveredType(TypeDescription typeDescription) { - return session.discoveredTypes.containsKey(typeDescription.getName()); - } - public void registerDiscoveredType(TypeDescription typeDescription, Type.PersistenceType type) { session.discoveredTypes.put(typeDescription.getName(), type); } diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/FeatureMismatchException.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/FeatureMismatchException.java index 77df5a3c72c8..1af2ed44f1f3 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/FeatureMismatchException.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/FeatureMismatchException.java @@ -16,10 +16,6 @@ public class FeatureMismatchException extends EnhancementException { public enum Feature { DIRTY_CHECK, ASSOCIATION_MANAGEMENT } - private final String className; - private final Feature mismatchedFeature; - private final boolean previousValue; - public FeatureMismatchException( String className, Feature mismatchedFeature, @@ -31,21 +27,6 @@ public FeatureMismatchException( className, decode( previousValue ) ) ); - this.className = className; - this.mismatchedFeature = mismatchedFeature; - this.previousValue = previousValue; - } - - public String getClassName() { - return className; - } - - public Feature getMismatchedFeature() { - return mismatchedFeature; - } - - public boolean wasPreviouslyEnabled() { - return previousValue; } public static void checkFeatureEnablement( diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/GetPropertyNames.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/GetPropertyNames.java deleted file mode 100644 index 313c9c75f380..000000000000 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/GetPropertyNames.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.hibernate.bytecode.enhance.internal.bytebuddy; - -import net.bytebuddy.description.method.MethodDescription; -import net.bytebuddy.implementation.Implementation; -import net.bytebuddy.implementation.bytecode.ByteCodeAppender; -import net.bytebuddy.jar.asm.MethodVisitor; -import net.bytebuddy.jar.asm.Opcodes; - -public class GetPropertyNames implements ByteCodeAppender { - - private final String[] propertyNames; - private final EnhancerImplConstants constants; - - public GetPropertyNames(String[] propertyNames, EnhancerImplConstants constants) { - this.propertyNames = propertyNames; - this.constants = constants; - } - - @Override - public Size apply( - MethodVisitor methodVisitor, - Implementation.Context implementationContext, - MethodDescription instrumentedMethod) { - methodVisitor.visitLdcInsn( propertyNames.length ); - methodVisitor.visitTypeInsn( Opcodes.ANEWARRAY, constants.internalName_String ); - for ( int i = 0; i < propertyNames.length; i++ ) { - methodVisitor.visitInsn( Opcodes.DUP ); - methodVisitor.visitLdcInsn( i ); - methodVisitor.visitLdcInsn( propertyNames[i] ); - methodVisitor.visitInsn( Opcodes.AASTORE ); - } - methodVisitor.visitInsn( Opcodes.ARETURN ); - return new Size( 4, instrumentedMethod.getStackSize() + 1 ); - } -} diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/BasicProxyFactoryImpl.java b/hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/BasicProxyFactoryImpl.java index a8f3421e9185..901ffa5b270c 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/BasicProxyFactoryImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/BasicProxyFactoryImpl.java @@ -80,8 +80,4 @@ private PrimeAmongSecondarySupertypes instantiateProxy() { } } - public boolean isInstance(Object object) { - return proxyClass.isInstance( object ); - } - } diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/ByteBuddyState.java b/hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/ByteBuddyState.java index 19ea23bb7d87..beb1cce07740 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/ByteBuddyState.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/ByteBuddyState.java @@ -109,19 +109,6 @@ Class loadBasicProxy(Class referenceClass, String proxyClassName, return load( referenceClass, proxyClassName, makeProxyFunction ); } - /** - * Load a class generated by ByteBuddy. - * - * @param referenceClass The main class to proxy - might be an interface. - * @param makeClassFunction A function building the class. - * @return The loaded generated class. - */ - public Class load(Class referenceClass, Function> makeClassFunction) { - return make( makeClassFunction.apply( byteBuddy ) ) - .load( referenceClass.getClassLoader(), resolveClassLoadingStrategy( referenceClass ) ) - .getLoaded(); - } - /** * Rewrite a class, used by the enhancer. *

@@ -198,19 +185,6 @@ public Class load(Class referenceClass, String className, BiFunction load(Class referenceClass, TypeCache cache, - TypeCache.SimpleKey cacheKey, Function> makeProxyFunction) { - return cache.findOrInsert( - referenceClass.getClassLoader(), - cacheKey, - () -> make( makeProxyFunction.apply( byteBuddy ) ) - .load( referenceClass.getClassLoader(), - resolveClassLoadingStrategy( referenceClass ) ) - .getLoaded(), - cache - ); - } - public Unloaded make(Function> makeProxyFunction) { return make( makeProxyFunction.apply( byteBuddy ) ); } diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/InvalidPropertyAccessorException.java b/hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/InvalidPropertyAccessorException.java deleted file mode 100644 index 730dd0236771..000000000000 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/InvalidPropertyAccessorException.java +++ /dev/null @@ -1,10 +0,0 @@ -package org.hibernate.bytecode.internal.bytebuddy; - -import org.hibernate.HibernateException; - -public class InvalidPropertyAccessorException extends HibernateException { - - public InvalidPropertyAccessorException(String message) { - super( message ); - } -} diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/PrivateAccessorException.java b/hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/PrivateAccessorException.java deleted file mode 100644 index e23b20d30c4d..000000000000 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/PrivateAccessorException.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.hibernate.bytecode.internal.bytebuddy; - -public class PrivateAccessorException extends InvalidPropertyAccessorException { - - public PrivateAccessorException(String message) { - super( message ); - } -} diff --git a/hibernate-core/src/main/java/org/hibernate/cache/internal/EnabledCaching.java b/hibernate-core/src/main/java/org/hibernate/cache/internal/EnabledCaching.java index a273102b18bf..e3bcbad50199 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/internal/EnabledCaching.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/internal/EnabledCaching.java @@ -32,7 +32,6 @@ import static org.hibernate.cache.spi.RegionFactory.DEFAULT_QUERY_RESULTS_REGION_UNQUALIFIED_NAME; import static org.hibernate.cache.spi.RegionFactory.DEFAULT_UPDATE_TIMESTAMPS_REGION_UNQUALIFIED_NAME; -import static org.hibernate.internal.util.StringHelper.qualifyConditionally; import static org.hibernate.pretty.MessageHelper.collectionInfoString; import static org.hibernate.pretty.MessageHelper.infoString; @@ -150,14 +149,6 @@ public void prime(@Nonnull Set cacheRegionConfigs) { } - private String qualifiedRegionName(DomainDataRegion region) { - return qualifyConditionally( getRegionPrefix(), region.getName() ); - } - - private String getRegionPrefix() { - return sessionFactory.getSessionFactoryOptions().getCacheRegionPrefix(); - } - private DomainDataRegion buildRegion(DomainDataRegionConfig regionConfig) { return regionFactory.buildDomainDataRegion( regionConfig, this ); } diff --git a/hibernate-core/src/main/java/org/hibernate/cascade/internal/Cascade.java b/hibernate-core/src/main/java/org/hibernate/cascade/internal/Cascade.java index 01adf285ec3d..43bb87bcf5b7 100644 --- a/hibernate-core/src/main/java/org/hibernate/cascade/internal/Cascade.java +++ b/hibernate-core/src/main/java/org/hibernate/cascade/internal/Cascade.java @@ -146,10 +146,6 @@ static void cascade( ); } - static void traverseMetadata(CascadeTraversalContext context) throws HibernateException { - traverseMetadata( context, null ); - } - static void traverseMetadata( CascadeTraversalContext context, CascadePropertySelection propertySelectionOverride) throws HibernateException { diff --git a/hibernate-core/src/main/java/org/hibernate/cascade/spi/CascadingAction.java b/hibernate-core/src/main/java/org/hibernate/cascade/spi/CascadingAction.java index ac63adbe777f..3ffba8d37e0b 100644 --- a/hibernate-core/src/main/java/org/hibernate/cascade/spi/CascadingAction.java +++ b/hibernate-core/src/main/java/org/hibernate/cascade/spi/CascadingAction.java @@ -50,21 +50,6 @@ void cascade( T anything, boolean isCascadeDeleteEnabled); - /** - * @deprecated No longer called. Will be removed. - */ - @Deprecated(since = "7", forRemoval = true) - default void cascade( - EventSource session, - Object child, - String childEntityName, - T anything, - boolean isCascadeDeleteEnabled) { - cascade( session, child, childEntityName, - "", "", null, - anything, isCascadeDeleteEnabled ); - } - /** * Given a collection, get an iterator of the children upon which the * current cascading action should be visited. diff --git a/hibernate-core/src/main/java/org/hibernate/collection/spi/PersistentBag.java b/hibernate-core/src/main/java/org/hibernate/collection/spi/PersistentBag.java index a569d7ba23dd..f9f46cbcb21f 100644 --- a/hibernate-core/src/main/java/org/hibernate/collection/spi/PersistentBag.java +++ b/hibernate-core/src/main/java/org/hibernate/collection/spi/PersistentBag.java @@ -713,27 +713,4 @@ public void operate() { } } } - - final class SimpleRemove extends AbstractValueDelayedOperation { - - public SimpleRemove(E orphan) { - super( null, orphan ); - } - - @Override - public QueuedCollectionOperation toQueuedOperation(int order) { - return new QueuedCollectionOperation( - QueuedCollectionOperation.Kind.REMOVE, - null, - getOrphan(), - null, - order - ); - } - - @Override - public void operate() { - collection.remove( getOrphan() ); - } - } } diff --git a/hibernate-core/src/main/java/org/hibernate/collection/spi/PersistentList.java b/hibernate-core/src/main/java/org/hibernate/collection/spi/PersistentList.java index c33fc402f310..34c866bbae71 100644 --- a/hibernate-core/src/main/java/org/hibernate/collection/spi/PersistentList.java +++ b/hibernate-core/src/main/java/org/hibernate/collection/spi/PersistentList.java @@ -715,29 +715,6 @@ protected final int getIndex() { } } - final class Add extends AbstractListValueDelayedOperation { - - public Add(int index, E addedValue) { - super( index, addedValue, null ); - } - - @Override - public QueuedCollectionOperation toQueuedOperation(int order) { - return new QueuedCollectionOperation( - QueuedCollectionOperation.Kind.ADD, - getAddedInstance(), - null, - getIndex(), - order - ); - } - - @Override - public void operate() { - list.add( getIndex(), getAddedInstance() ); - } - } - final class Set extends AbstractListValueDelayedOperation { public Set(int index, E addedValue, E orphan) { diff --git a/hibernate-core/src/main/java/org/hibernate/context/internal/ManagedSessionContext.java b/hibernate-core/src/main/java/org/hibernate/context/internal/ManagedSessionContext.java index 1cee27b56003..ad45ffebdfee 100644 --- a/hibernate-core/src/main/java/org/hibernate/context/internal/ManagedSessionContext.java +++ b/hibernate-core/src/main/java/org/hibernate/context/internal/ManagedSessionContext.java @@ -22,7 +22,7 @@ * portion is instance-based specific to the session factory owning the given * instance of this impl (there will be one instance of this per each session * factory using this strategy). - *

  • Second is the externally facing methods {@link #hasBind}, {@link #bind}, + *
  • Second is the externally facing methods {@code hasBind}, {@link #bind}, * and {@link #unbind} used by the external thing to manage exposure of the * current session it is scoping. This portion is static to allow easy * reference from that external thing. @@ -58,18 +58,6 @@ public Session currentSession() { } } - /** - * Check to see if there is already a session associated with the current - * thread for the given session factory. - * - * @param factory The factory against which to check for a given session - * within the current thread. - * @return True if there is currently a session bound. - */ - public static boolean hasBind(SessionFactory factory) { - return existingSession( factory ) != null; - } - /** * Binds the given session to the current context for its session factory. * diff --git a/hibernate-core/src/main/java/org/hibernate/context/internal/ThreadLocalSessionContext.java b/hibernate-core/src/main/java/org/hibernate/context/internal/ThreadLocalSessionContext.java index 571fbdb3a332..5600e229ddf8 100644 --- a/hibernate-core/src/main/java/org/hibernate/context/internal/ThreadLocalSessionContext.java +++ b/hibernate-core/src/main/java/org/hibernate/context/internal/ThreadLocalSessionContext.java @@ -39,7 +39,7 @@ * called. If {@code close()} is called on a session managed by this class, it will be automatically * unbound. *

    - * Additionally, the static {@link #bind} and {@link #unbind} methods are provided to allow application + * Additionally, the static {@code bind} and {@link #unbind} methods are provided to allow application * code to explicitly control opening and closing of these sessions. This, with some from of interception, * is the preferred approach. It also allows easy framework integration and one possible approach for * implementing long-sessions. @@ -103,15 +103,6 @@ private boolean needsWrapping(Session session) { || !( Proxy.getInvocationHandler( session ) instanceof TransactionProtectionWrapper ); } - /** - * Getter for property 'factory'. - * - * @return Value for property 'factory'. - */ - protected SessionFactoryImplementor getFactory() { - return factory(); - } - /** * Strictly provided for sub-classing purposes; specifically to allow long-session * support. @@ -171,15 +162,6 @@ protected Session wrap(Session session) { return wrapped; } - /** - * Associates the given session with the current thread of execution. - * - * @param session The session to bind. - */ - public static void bind(Session session) { - doBind( session, session.getSessionFactory() ); - } - private static void terminateOrphanedSession(Session orphan) { if ( orphan != null ) { CURRENT_SESSION_LOGGER.alreadySessionBound(); diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/DB2iDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/DB2iDialect.java index 62aac264428d..29bdbeaf8b8a 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/DB2iDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/DB2iDialect.java @@ -50,9 +50,6 @@ public class DB2iDialect extends DB2Dialect { private final static DatabaseVersion MINIMUM_VERSION = DatabaseVersion.make( 7, 2 ); public final static DatabaseVersion DB2_LUW_VERSION = DB2Dialect.MINIMUM_VERSION; - - private static final String FOR_UPDATE_SQL = " for update with rs"; - private static final String FOR_UPDATE_SKIP_LOCKED_SQL = FOR_UPDATE_SQL + " skip locked data"; private static final SequenceInformationExtractor SEQUENCE_INFORMATION_EXTRACTOR = SequenceInformationExtractors.builder( "select distinct sequence_schema as seqschema, sequence_name as seqname, START, minimum_value as minvalue, maximum_value as maxvalue, increment from qsys2.syssequences " diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/H2Dialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/H2Dialect.java index db3480a3fab0..d19deea680b6 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/H2Dialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/H2Dialect.java @@ -50,10 +50,8 @@ import org.hibernate.dialect.sql.ast.spi.ValuesListSupport; import jakarta.persistence.TemporalType; -import jakarta.persistence.Timeout; import jakarta.annotation.Nullable; import org.hibernate.QueryTimeoutException; -import org.hibernate.Timeouts; import org.hibernate.boot.model.FunctionContributions; import org.hibernate.boot.model.TypeContributions; import org.hibernate.dialect.aggregate.spi.AggregateSupport; @@ -787,14 +785,6 @@ public LockingSupport getLockingSupport() { return getVersion().isSameOrAfter( 2, 2, 220 ) ? H2LockingSupport.INSTANCE : H2LockingSupport.LEGACY_INSTANCE; } - - - - private String withRealTimeout(String lockString, Timeout timeout) { - assert Timeouts.isRealTimeout( timeout ); - return lockString + " wait " + Timeouts.getTimeoutInSeconds( timeout ); - } - @Override @SPI({ IMPLEMENT, SUPPLY }) public synchronized IfExistsSupport getIfExistsSupport() { diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/HANADialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/HANADialect.java index e5fa907a29e8..ebb74095e9e1 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/HANADialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/HANADialect.java @@ -1723,14 +1723,6 @@ protected X doExtract(CallableStatement statement, String name, WrapperOptions o } }; } - - public int getMaxLobPrefetchSize() { - return this.maxLobPrefetchSize; - } - - public boolean isUseUnicodeStringTypes() { - return this.useUnicodeStringTypes; - } } private static class HANANClobJdbcType extends NClobJdbcType { @@ -1827,10 +1819,6 @@ protected X doExtract(CallableStatement statement, String name, WrapperOptions o } }; } - - public int getMaxLobPrefetchSize() { - return maxLobPrefetchSize; - } } public static class HANABlobType implements JdbcType { diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/internal/AggregateColumnDescriptorAdapter.java b/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/internal/AggregateColumnDescriptorAdapter.java index b60d02ad0832..0c2fac04fdd9 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/internal/AggregateColumnDescriptorAdapter.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/internal/AggregateColumnDescriptorAdapter.java @@ -22,12 +22,10 @@ */ public final class AggregateColumnDescriptorAdapter implements AggregateColumnDescriptor { private final Column column; - private final Namespace namespace; private final List components; private AggregateColumnDescriptorAdapter(Column column, Namespace namespace) { this.column = column; - this.namespace = namespace; this.components = column instanceof AggregateColumn aggregateColumn ? descriptors( aggregateColumn.getComponent().getAggregatedColumns(), namespace ) : List.of(); @@ -75,10 +73,6 @@ public static List columns(List descriptors) .toList(); } - public Namespace namespace() { - return namespace; - } - @Override public String columnName() { return column.getName(); diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/internal/AggregateSupportImpl.java b/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/internal/AggregateSupportImpl.java index 94564041d481..1df3b9065595 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/internal/AggregateSupportImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/internal/AggregateSupportImpl.java @@ -1,11 +1,8 @@ package org.hibernate.dialect.aggregate.internal; -import java.util.Collections; import java.util.List; -import org.hibernate.boot.model.relational.AuxiliaryDatabaseObject; -import org.hibernate.boot.model.relational.Namespace; import org.hibernate.dialect.aggregate.spi.AggregateAuxiliaryObject; import org.hibernate.dialect.aggregate.spi.AggregateAuxiliaryObjectRequest; import org.hibernate.dialect.aggregate.spi.AggregateComponentAssignmentRequest; @@ -154,14 +151,6 @@ public WriteExpressionRenderer aggregateCustomWriteExpressionRenderer( throw new UnsupportedOperationException( "Dialect does not support aggregateCustomWriteExpressionRenderer: " + getClass().getName() ); } - public List aggregateAuxiliaryDatabaseObjects( - Namespace namespace, - String aggregatePath, - AggregateColumn aggregateColumn, - List aggregatedColumns) { - return Collections.emptyList(); - } - @Override public int aggregateComponentSqlTypeCode(int aggregateColumnSqlTypeCode, int columnSqlTypeCode) { return switch (aggregateColumnSqlTypeCode) { diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/internal/SybaseASEAggregateSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/internal/SybaseASEAggregateSupport.java index e46a2256773e..a92f31260fdb 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/internal/SybaseASEAggregateSupport.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/internal/SybaseASEAggregateSupport.java @@ -297,7 +297,6 @@ public WriteExpressionRenderer aggregateCustomWriteExpressionRenderer( } interface XmlWriteExpression { - boolean isAggregate(); void append( SqlAppender sb, String path, @@ -313,11 +312,6 @@ private AggregateXmlWriteExpression(SelectableMapping selectableMapping) { this.selectableMapping = selectableMapping; } - @Override - public boolean isAggregate() { - return true; - } - protected void initializeSubExpressions(SelectableMapping aggregateColumn, SelectableMapping[] columns) { for ( SelectableMapping column : columns ) { final SelectablePath selectablePath = column.getSelectablePath(); @@ -447,11 +441,6 @@ private static class BasicXmlWriteExpression implements XmlWriteExpression { } } - @Override - public boolean isAggregate() { - return selectableMapping.getJdbcMapping().getJdbcType().isXml(); - } - @Override public void append( SqlAppender sb, @@ -515,11 +504,6 @@ private static class PassThroughXmlWriteExpression implements XmlWriteExpression this.selectableMapping = selectableMapping; } - @Override - public boolean isAggregate() { - return selectableMapping.getJdbcMapping().getJdbcType().isXml(); - } - @Override public void append( SqlAppender sb, diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/CteGenerateSeriesFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/CteGenerateSeriesFunction.java index cb3f098f6038..8078993eea53 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/CteGenerateSeriesFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/CteGenerateSeriesFunction.java @@ -408,10 +408,6 @@ public CteGenerateSeriesSetReturningFunctionTypeResolver() { super( "v", "i" ); } - public CteGenerateSeriesSetReturningFunctionTypeResolver(@Nullable String defaultValueColumnName, String defaultIndexSelectionExpression) { - super( defaultValueColumnName, defaultIndexSelectionExpression ); - } - @Override public SelectableMapping[] resolveFunctionReturnType( List arguments, diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/SpannerConcatFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/SpannerConcatFunction.java index 5187ce581ad9..644619f288d5 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/SpannerConcatFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/SpannerConcatFunction.java @@ -18,8 +18,6 @@ public class SpannerConcatFunction extends AbstractSqmSelfRenderingFunctionDescriptor { - private static final String CAST = "::text"; - public SpannerConcatFunction(TypeConfiguration typeConfiguration) { super( "concat", FunctionKind.NORMAL, diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/HANAJsonValueFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/HANAJsonValueFunction.java index 4b79404f5b96..e10a7cc9ba47 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/HANAJsonValueFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/HANAJsonValueFunction.java @@ -151,10 +151,6 @@ protected void renderReturningClause(SqlAppender sqlAppender, JsonValueArguments } } - static boolean isEncodedBoolean(JdbcMapping type) { - return type.getJdbcType().isBoolean(); - } - private static boolean requiresSpecialExtraction(int sqlTypeCode) { return switch ( sqlTypeCode ) { case BOOLEAN, UUID, BINARY, VARBINARY, LONG32VARBINARY, BLOB, TIMESTAMP, TIMESTAMP_WITH_TIMEZONE, diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/lock/internal/AbstractPessimisticUpdateLockingStrategy.java b/hibernate-core/src/main/java/org/hibernate/dialect/lock/internal/AbstractPessimisticUpdateLockingStrategy.java index ccab88944740..353371caa196 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/lock/internal/AbstractPessimisticUpdateLockingStrategy.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/lock/internal/AbstractPessimisticUpdateLockingStrategy.java @@ -116,8 +116,4 @@ protected String generateLockString() { } return update.toStatementString(); } - - protected LockMode getLockMode() { - return lockMode; - } } diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/lock/internal/AbstractSelectLockingStrategy.java b/hibernate-core/src/main/java/org/hibernate/dialect/lock/internal/AbstractSelectLockingStrategy.java index 51c81fff3a81..f1383604949d 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/lock/internal/AbstractSelectLockingStrategy.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/lock/internal/AbstractSelectLockingStrategy.java @@ -42,10 +42,6 @@ protected EntityPersister getLockable() { return lockable; } - protected LockMode getLockMode() { - return lockMode; - } - protected String generateLockString(Timeout lockTimeout) { // for now, use the deprecated form passing the milliseconds to avoid copy/paste. // move that logic here when we can remove that overload. diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/lock/internal/HANALockingSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/lock/internal/HANALockingSupport.java index ca2dec42d659..6f51e2005056 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/lock/internal/HANALockingSupport.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/lock/internal/HANALockingSupport.java @@ -31,10 +31,6 @@ public static LockingSupport forDialectVersion(DatabaseVersion version) { return new HANALockingSupport( supportsWait, supportsSkipLocked ); } - public HANALockingSupport(boolean supportsSkipLocked) { - this( false, supportsSkipLocked ); - } - private final boolean supportsWait; private final boolean supportsSkipLocked; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/lock/internal/LockingSupportParameterized.java b/hibernate-core/src/main/java/org/hibernate/dialect/lock/internal/LockingSupportParameterized.java index f7d8b2ba103c..dc481fe19526 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/lock/internal/LockingSupportParameterized.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/lock/internal/LockingSupportParameterized.java @@ -73,16 +73,6 @@ public LockingSupportParameterized( this.readsWaitForUncommittedWrites = readsWaitForUncommittedWrites; } - public LockingSupportParameterized( - PessimisticLockStyle pessimisticLockStyle, - RowLockStrategy rowLockStrategy, - boolean supportsWait, - boolean supportsNoWait, - boolean supportsSkipLocked, - OuterJoinLockingType outerJoinLockingType) { - this( pessimisticLockStyle, rowLockStrategy, supportsWait, supportsNoWait, supportsSkipLocked, outerJoinLockingType, true ); - } - public LockingSupportParameterized( PessimisticLockStyle pessimisticLockStyle, RowLockStrategy rowLockStrategy, diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/lock/internal/MariaDBLockingSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/lock/internal/MariaDBLockingSupport.java index 9269ca40280f..70b991b7ede3 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/lock/internal/MariaDBLockingSupport.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/lock/internal/MariaDBLockingSupport.java @@ -40,10 +40,6 @@ public MariaDBLockingSupport(boolean supportsSkipLocked, boolean supportsNoWait, this.waitType = NONE; } - public MariaDBLockingSupport(boolean supportsSkipLocked, boolean supportsWait) { - this( supportsSkipLocked, supportsWait, supportsWait ); - } - public MariaDBLockingSupport(DatabaseVersion databaseVersion) { this( databaseVersion.isSameOrAfter( 10, 6 ), true, true ); } diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/lock/internal/OptimisticForceIncrementLockingStrategy.java b/hibernate-core/src/main/java/org/hibernate/dialect/lock/internal/OptimisticForceIncrementLockingStrategy.java index 438e402baace..ea9d68095a68 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/lock/internal/OptimisticForceIncrementLockingStrategy.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/lock/internal/OptimisticForceIncrementLockingStrategy.java @@ -22,7 +22,6 @@ * @since 3.5 */ public class OptimisticForceIncrementLockingStrategy implements LockingStrategy { - private final EntityPersister lockable; private final LockMode lockMode; /** @@ -32,7 +31,6 @@ public class OptimisticForceIncrementLockingStrategy implements LockingStrategy * @param lockMode Indicates the type of lock to be acquired. */ public OptimisticForceIncrementLockingStrategy(EntityPersister lockable, LockMode lockMode) { - this.lockable = lockable; this.lockMode = lockMode; if ( lockMode.lessThan( LockMode.OPTIMISTIC_FORCE_INCREMENT ) ) { throw new HibernateException( "Entity '" + lockable.getEntityName() @@ -55,8 +53,4 @@ public void lock(Object id, Object version, Object object, Timeout timeout, Shar throw new UnsupportedOperationException( "Optimistic locking strategies not supported in stateless session" ); } } - - protected LockMode getLockMode() { - return lockMode; - } } diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/lock/internal/OptimisticLockingStrategy.java b/hibernate-core/src/main/java/org/hibernate/dialect/lock/internal/OptimisticLockingStrategy.java index 0c2eaff84245..468cc52a0ab7 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/lock/internal/OptimisticLockingStrategy.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/lock/internal/OptimisticLockingStrategy.java @@ -21,7 +21,6 @@ * @since 3.5 */ public class OptimisticLockingStrategy implements LockingStrategy { - private final EntityPersister lockable; private final LockMode lockMode; /** @@ -31,7 +30,6 @@ public class OptimisticLockingStrategy implements LockingStrategy { * @param lockMode Indicates the type of lock to be acquired. */ public OptimisticLockingStrategy(EntityPersister lockable, LockMode lockMode) { - this.lockable = lockable; this.lockMode = lockMode; if ( lockMode.lessThan( LockMode.OPTIMISTIC ) ) { throw new HibernateException( "Entity '" + lockable.getEntityName() @@ -53,8 +51,4 @@ public void lock(Object id, Object version, Object object, Timeout timeout, Shar throw new UnsupportedOperationException( "Optimistic locking strategies not supported in stateless session" ); } } - - protected LockMode getLockMode() { - return lockMode; - } } diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/lock/internal/PessimisticForceIncrementLockingStrategy.java b/hibernate-core/src/main/java/org/hibernate/dialect/lock/internal/PessimisticForceIncrementLockingStrategy.java index b8ce0cce59b7..1f5ebf7583cc 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/lock/internal/PessimisticForceIncrementLockingStrategy.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/lock/internal/PessimisticForceIncrementLockingStrategy.java @@ -20,7 +20,6 @@ * @since 3.5 */ public class PessimisticForceIncrementLockingStrategy implements LockingStrategy { - private final EntityPersister lockable; private final LockMode lockMode; /** @@ -30,7 +29,6 @@ public class PessimisticForceIncrementLockingStrategy implements LockingStrategy * @param lockMode Indicates the type of lock to be acquired. */ public PessimisticForceIncrementLockingStrategy(EntityPersister lockable, LockMode lockMode) { - this.lockable = lockable; this.lockMode = lockMode; // ForceIncrement can be used for PESSIMISTIC_READ, PESSIMISTIC_WRITE or PESSIMISTIC_FORCE_INCREMENT if ( lockMode.lessThan( LockMode.PESSIMISTIC_READ ) ) { @@ -48,13 +46,4 @@ public void lock(Object id, Object version, Object object, Timeout timeout, Shar final var entry = session.getPersistenceContextInternal().getEntry( object ); OptimisticLockHelper.forceVersionIncrement( object, entry, session ); } - - /** - * Retrieve the specific lock mode defined. - * - * @return The specific lock mode. - */ - protected LockMode getLockMode() { - return lockMode; - } } diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/pagination/spi/SQLServer2012LimitHandler.java b/hibernate-core/src/main/java/org/hibernate/dialect/pagination/spi/SQLServer2012LimitHandler.java index 19d27d24d3af..49caa4a782b3 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/pagination/spi/SQLServer2012LimitHandler.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/pagination/spi/SQLServer2012LimitHandler.java @@ -35,9 +35,7 @@ private enum Keyword { SELECT ("select(\\s+(distinct|all))?"), FROM ("from"), - ORDER_BY ("order\\s+by"), - AS ("as"), - WITH ("with"); + ORDER_BY ("order\\s+by"); final Pattern pattern; Keyword(String keyword) { diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/internal/DB2iSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/internal/DB2iSqlAstTranslator.java index 094e8a62ea59..d8933a269a43 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/internal/DB2iSqlAstTranslator.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/internal/DB2iSqlAstTranslator.java @@ -20,11 +20,8 @@ */ public class DB2iSqlAstTranslator extends DB2SqlAstTranslator { - private final DatabaseVersion version; - public DB2iSqlAstTranslator(SqlAstTranslationRequest request, DatabaseVersion version) { super( request ); - this.version = version; } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/internal/DB2zSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/internal/DB2zSqlAstTranslator.java index 654aa8b9780a..0fe4cb2325b7 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/internal/DB2zSqlAstTranslator.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/internal/DB2zSqlAstTranslator.java @@ -21,11 +21,8 @@ */ public class DB2zSqlAstTranslator extends DB2SqlAstTranslator { - private final DatabaseVersion version; - public DB2zSqlAstTranslator(SqlAstTranslationRequest request, DatabaseVersion version) { super( request ); - this.version = version; } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/internal/NestedCorrelationChecker.java b/hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/internal/NestedCorrelationChecker.java index d94d8f014849..ea07bbdee194 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/internal/NestedCorrelationChecker.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/internal/NestedCorrelationChecker.java @@ -7,7 +7,6 @@ import org.hibernate.Internal; import org.hibernate.sql.ast.spi.AbstractSqlAstWalker; -import org.hibernate.sql.ast.spi.SqlAstNode; import org.hibernate.sql.ast.spi.query.expression.ColumnReference; import org.hibernate.sql.ast.spi.query.select.QuerySpec; @@ -30,16 +29,6 @@ public Throwable fillInStackTrace() { } } - public static boolean hasNestedCorrelation(SqlAstNode node) { - try { - node.accept( new NestedCorrelationChecker() ); - return false; - } - catch (NestedCorrelationException ex) { - return true; - } - } - @Override public void visitQuerySpec(QuerySpec querySpec) { if ( currentLevelAliases != null ) { diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/spi/AbstractSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/spi/AbstractSqlAstTranslator.java index 8fb0fbe60a96..c3c4b1d5d5b5 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/spi/AbstractSqlAstTranslator.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/spi/AbstractSqlAstTranslator.java @@ -532,12 +532,6 @@ protected final void renderStatementPrefix(Consumer renderer) { sqlBuffer.insert( 0, prefixBuffer ); } - // For Blaze-Persistence until its function rendering code doesn't depend on SQL fragments anymore - @Internal - public StringBuilder getSqlBuffer() { - return sqlBuffer; - } - private void cleanup() { this.jdbcParameterBindings = null; this.lockOptions = null; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/temptable/internal/TemporaryTable.java b/hibernate-core/src/main/java/org/hibernate/dialect/temptable/internal/TemporaryTable.java index 75e51f6c2a70..3aaeedc79809 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/temptable/internal/TemporaryTable.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/temptable/internal/TemporaryTable.java @@ -591,8 +591,4 @@ public String getContributor() { public String getExportIdentifier() { return getQualifiedTableName(); } - - public Dialect getDialect() { - return this.dialect; - } } diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/temptable/internal/TemporaryTableColumn.java b/hibernate-core/src/main/java/org/hibernate/dialect/temptable/internal/TemporaryTableColumn.java index 3629367f9727..a12f108a6571 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/temptable/internal/TemporaryTableColumn.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/temptable/internal/TemporaryTableColumn.java @@ -66,10 +66,6 @@ public JdbcMapping getJdbcMapping() { return jdbcMapping; } - public String getDefaultValue() { - return null; - } - @Override public String getSqlTypeDefinition() { return sqlTypeName; @@ -90,10 +86,6 @@ public boolean isPrimaryKey() { return primaryKey; } - public @Nullable String getColumnDefinition() { - return sqlTypeName; - } - @Override public @Nullable Long getLength() { return size.getLength(); diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/type/internal/SybaseJtdsJsonAsStringArrayJdbcType.java b/hibernate-core/src/main/java/org/hibernate/dialect/type/internal/SybaseJtdsJsonAsStringArrayJdbcType.java index daaf906808cd..4454bf106dcf 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/type/internal/SybaseJtdsJsonAsStringArrayJdbcType.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/type/internal/SybaseJtdsJsonAsStringArrayJdbcType.java @@ -24,10 +24,6 @@ */ public class SybaseJtdsJsonAsStringArrayJdbcType extends JsonAsStringArrayJdbcType { - public SybaseJtdsJsonAsStringArrayJdbcType(JdbcType elementJdbcType) { - super( elementJdbcType, SqlTypes.NCLOB ); - } - public SybaseJtdsJsonAsStringArrayJdbcType(JdbcType elementJdbcType, int ddlTypeCode) { super( elementJdbcType, ddlTypeCode ); } diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/type/internal/SybaseJtdsXmlAsStringArrayJdbcType.java b/hibernate-core/src/main/java/org/hibernate/dialect/type/internal/SybaseJtdsXmlAsStringArrayJdbcType.java index f8d276de25cd..bfe11450d28e 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/type/internal/SybaseJtdsXmlAsStringArrayJdbcType.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/type/internal/SybaseJtdsXmlAsStringArrayJdbcType.java @@ -24,10 +24,6 @@ */ public class SybaseJtdsXmlAsStringArrayJdbcType extends XmlAsStringArrayJdbcType { - public SybaseJtdsXmlAsStringArrayJdbcType(JdbcType elementJdbcType) { - super( elementJdbcType, SqlTypes.NCLOB ); - } - public SybaseJtdsXmlAsStringArrayJdbcType(JdbcType elementJdbcType, int ddlTypeCode) { super( elementJdbcType, ddlTypeCode ); } diff --git a/hibernate-core/src/main/java/org/hibernate/engine/creation/internal/AbstractCommonBuilder.java b/hibernate-core/src/main/java/org/hibernate/engine/creation/internal/AbstractCommonBuilder.java index df7d4ae3cea0..964002acd087 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/creation/internal/AbstractCommonBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/creation/internal/AbstractCommonBuilder.java @@ -26,19 +26,11 @@ public abstract class AbstractCommonBuilder implements protected final SessionFactoryImplementor sessionFactory; protected final CommonOptions options; - public AbstractCommonBuilder(SessionFactoryImplementor factory) { - this( factory, new CommonOptions( factory ) ); - } - protected AbstractCommonBuilder(SessionFactoryImplementor factory, CommonOptions options) { sessionFactory = factory; this.options = options; } - protected CommonOptions options() { - return options; - } - protected abstract T getThis(); @Override diff --git a/hibernate-core/src/main/java/org/hibernate/engine/creation/internal/SessionBuilderImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/creation/internal/SessionBuilderImpl.java index 0c71ceb81705..11e4933cf3f8 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/creation/internal/SessionBuilderImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/creation/internal/SessionBuilderImpl.java @@ -37,10 +37,6 @@ protected SessionBuilderImplementor getThis() { return this; } - protected StatefulOptions options() { - return options; - } - // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // SessionBuilder diff --git a/hibernate-core/src/main/java/org/hibernate/engine/creation/internal/options/StatefulOptions.java b/hibernate-core/src/main/java/org/hibernate/engine/creation/internal/options/StatefulOptions.java index dbfe64416dcc..27c540c3a9b0 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/creation/internal/options/StatefulOptions.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/creation/internal/options/StatefulOptions.java @@ -51,18 +51,6 @@ public StatefulOptions apply(EntityManager.CreationOption option) { return this; } - /** - * Apply Jakarta Persistence creation options to this collector. - */ - public StatefulOptions apply(EntityManager.CreationOption... options) { - if ( options != null ) { - for ( var option : options ) { - apply( option ); - } - } - return this; - } - @Override public boolean shouldAutoJoinTransactions() { return autoJoinTransactions; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/CacheHelper.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/CacheHelper.java index 6625f4b5cc28..ca3701af269d 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/internal/CacheHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/CacheHelper.java @@ -106,16 +106,6 @@ public static void writingToCache( } } - public static void readingFromCache( - @Nonnull EntityPersister persister, - @Nonnull Consumer action) { - if ( persister.canReadFromCache() ) { - final var cache = persister.getCacheAccessStrategy(); - assert cache != null; - action.accept( cache ); - } - } - public static T readingFromCache( @Nonnull EntityPersister persister, @Nonnull Function action, diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/FlushProcessingContext.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/FlushProcessingContext.java index 9c89c91bf631..42ba83175aa8 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/internal/FlushProcessingContext.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/FlushProcessingContext.java @@ -159,29 +159,6 @@ public boolean isCollectionReached(PersistentCollection collection) { return entry != null && entry.wasReachedDuringFlush(); } - /// Marks the collection as reachable from a flushed entity. - /// - /// @param collection The collection instance - public void markCollectionReached(PersistentCollection collection) { - final var entry = session.getPersistenceContextInternal().getCollectionEntry( collection ); - if ( entry != null ) { - entry.markReachedDuringFlush(); - } - } - - /// Marks the collection as processed by collection reachability handling. - /// - /// Duplicate processing indicates inconsistent graph traversal and results in an assertion - /// failure, matching the previous {@link org.hibernate.engine.spi.CollectionEntry} guard. - /// - /// @param collection The collection instance - public void markCollectionProcessed(PersistentCollection collection) { - final var entry = session.getPersistenceContextInternal().getCollectionEntry( collection ); - if ( entry != null ) { - entry.markProcessedDuringFlush(); - } - } - /// Records a logical collection create mutation for later queue-neutral registration. /// /// @param collection The collection instance diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/ManagedTypeHelper.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/ManagedTypeHelper.java index 36bd3639f96a..8a7102f56474 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/internal/ManagedTypeHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/ManagedTypeHelper.java @@ -127,16 +127,6 @@ public static boolean isSelfDirtinessTracker(final Object entity) { return false; } - /** - * @return true if and only if the entity implements {@see CompositeOwner} - */ - public static boolean isCompositeOwner(final Object entity) { - if ( entity instanceof PrimeAmongSecondarySupertypes t ) { - return t.asCompositeOwner() != null; - } - return false; - } - /** * @return true if and only if the entity implements {@see CompositeTracker} */ @@ -355,17 +345,6 @@ public static SelfDirtinessTracker asSelfDirtinessTracker(final Object entity) { throw new ClassCastException( "Object of type '" + entity.getClass() + "' can't be cast to SelfDirtinessTracker" ); } - /** - * Cast the object to an HibernateProxy, or return null in case it is not an instance of HibernateProxy - * @param entity the entity to cast - * @return the same instance after casting or null if it is not an instance of HibernateProxy - */ - public static HibernateProxy asHibernateProxyOrNull(final Object entity) { - return entity instanceof PrimeAmongSecondarySupertypes ? - ( (PrimeAmongSecondarySupertypes) entity ).asHibernateProxy() : - null; - } - private static final class TypeMeta { final boolean isManagedType; final boolean isSelfDirtinessTrackerType; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/NaturalIdResolutionsImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/NaturalIdResolutionsImpl.java index 271ea67d6132..a579cc1a5a3b 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/internal/NaturalIdResolutionsImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/NaturalIdResolutionsImpl.java @@ -707,13 +707,6 @@ public void unStashInvalidNaturalIdReferences() { } } - /** - * Clear the resolution cache - */ - public void clear() { - resolutionsByEntity.clear(); - } - /** * Represents the entity-specific cross-reference cache. */ @@ -736,10 +729,6 @@ public EntityMappingType getEntityDescriptor() { return entityDescriptor; } - public EntityPersister getPersister() { - return getEntityDescriptor().getEntityPersister(); - } - /** * Used for testing. */ diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/JdbcLogging.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/JdbcLogging.java index 5a71e5c496b5..8180e97cdc5d 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/JdbcLogging.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/JdbcLogging.java @@ -178,10 +178,6 @@ public interface JdbcLogging extends BasicLogger { @Message(value = "Encountered failure rolling back failed commit", id = 100038) void encounteredFailureRollingBackFailedCommit(@Cause Throwable cause); - @LogMessage(level = DEBUG) - @Message(value = "Could not access DatabaseMetaData while building the JdbcEnvironment", id = 100039) - void noDatabaseMetaData(@Cause SQLException sqle); - @LogMessage(level = WARN) @Message(value = "Could not obtain connection metadata: %s", id = 100045) void unableToObtainConnectionMetadata(SQLException error); diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchBuilderImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchBuilderImpl.java index 44590d5ecbf7..9117e3adbfa2 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchBuilderImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchBuilderImpl.java @@ -45,10 +45,6 @@ public BatchBuilderImpl(int globalBatchSize) { this.globalBatchSize = globalBatchSize; } - public int getJdbcBatchSize() { - return globalBatchSize; - } - private int batchSize(Integer explicitBatchSize) { return explicitBatchSize == null ? globalBatchSize diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchImpl.java index 00771238c274..b6e35e9d2455 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchImpl.java @@ -194,26 +194,6 @@ protected void releaseStatements() { statementGroup.release(); } - protected void clearBatch(PreparedStatementDetails statementDetails) { - final var statement = statementDetails.getStatement(); - assert statement != null; - - try { - // This code can be called after the connection is released - // and the statement is closed. If the statement is closed, - // then SQLException will be thrown when PreparedStatement#clearBatch - // is called. - // Ensure the statement is not closed before - // calling PreparedStatement#clearBatch. - if ( !statement.isClosed() ) { - statement.clearBatch(); - } - } - catch ( SQLException e ) { - BATCH_MESSAGE_LOGGER.unableToReleaseBatchStatement(); - } - } - /** * Convenience method to notify registered observers of an explicit execution of this batch. */ diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/BasicConnectionCreator.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/BasicConnectionCreator.java index a7a907c60b5b..aea36e56f35d 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/BasicConnectionCreator.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/BasicConnectionCreator.java @@ -140,11 +140,4 @@ protected JDBCException convertSqlException(String message, SQLException e) { protected abstract Connection makeConnection(String url, Properties connectionProps); - /** - * Exposed for testing purposes only. - */ - public Properties getConnectionProperties() { - return new Properties( connectionProps ); - } - } diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DatasourceConnectionProviderImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DatasourceConnectionProviderImpl.java deleted file mode 100644 index ff281f9f2072..000000000000 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DatasourceConnectionProviderImpl.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.hibernate.engine.jdbc.connections.internal; - -/** - * @deprecated Use {@link DataSourceConnectionProvider} - */ -@Deprecated(since = "7.1", forRemoval = true) -public class DatasourceConnectionProviderImpl extends DataSourceConnectionProvider { -} diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/internal/DialectResolverSet.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/internal/DialectResolverSet.java index ff1b203fd5c0..c688040a199f 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/internal/DialectResolverSet.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/internal/DialectResolverSet.java @@ -30,10 +30,6 @@ public DialectResolverSet(List resolvers) { this.resolvers = resolvers; } - public DialectResolverSet(DialectResolver... resolvers) { - this( Arrays.asList( resolvers ) ); - } - @Override public Dialect resolveDialect(DialectResolutionInfo info) { for ( DialectResolver resolver : resolvers ) { diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/JdbcEnvironmentImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/JdbcEnvironmentImpl.java index 5e8f28670118..eae8d0a47196 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/JdbcEnvironmentImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/JdbcEnvironmentImpl.java @@ -245,20 +245,6 @@ else if ( supportsSchemas ) { } } - /** - * @deprecated currently used by Hibernate Reactive - * This version of the constructor should handle the case in which we do actually have - * the option to access the {@link DatabaseMetaData}, but since Hibernate Reactive is - * currently not making use of it we take a shortcut. - */ - @Deprecated - public JdbcEnvironmentImpl( - @Nonnull ServiceRegistryImplementor serviceRegistry, - @Nonnull Dialect dialect, - @Nullable DatabaseMetaData databaseMetaData) { - this( serviceRegistry, dialect ); - } - /** * The main constructor form. * Builds a {@code JdbcEnvironment} using the available {@link DatabaseMetaData}. diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/JdbcEnvironmentInitiator.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/JdbcEnvironmentInitiator.java index 2f35e42e6f53..85b7f1d3072b 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/JdbcEnvironmentInitiator.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/JdbcEnvironmentInitiator.java @@ -514,10 +514,6 @@ public MultiTenantConnectionProviderJdbcConnectionAccess(MultiTenantConnectionPr this.connectionProvider = connectionProvider; } - public MultiTenantConnectionProvider getConnectionProvider() { - return connectionProvider; - } - @Override public Connection obtainConnection() throws SQLException { return connectionProvider.getAnyConnection(); diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/LobTypes.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/LobTypes.java index f33cdcef4998..418f2f0d7554 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/LobTypes.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/LobTypes.java @@ -1,34 +1,15 @@ package org.hibernate.engine.jdbc.env.internal; -import java.sql.Blob; -import java.sql.Clob; -import java.sql.NClob; - -import org.hibernate.type.SqlTypes; - /** * Enumeration of the JDBC LOB locator types * * @author Steve Ebersole */ public enum LobTypes { - BLOB( SqlTypes.BLOB, Blob.class ), - CLOB( SqlTypes.CLOB, Clob.class ), - NCLOB( SqlTypes.NCLOB, NClob.class ); - - private final int jdbcTypeCode; - private final Class jdbcTypeClass; - - LobTypes(int jdbcTypeCode, Class jdbcTypeClass) { - this.jdbcTypeCode = jdbcTypeCode; - this.jdbcTypeClass = jdbcTypeClass; - } - - public int getJdbcTypeCode() { - return jdbcTypeCode; - } + BLOB( ), + CLOB( ), + NCLOB( ); - public Class getJdbcTypeClass() { - return jdbcTypeClass; + LobTypes() { } } diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/AntlrBasedSQLFormatterImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/AntlrBasedSQLFormatterImpl.java index 3a540c502dd6..65e4bf9a6640 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/AntlrBasedSQLFormatterImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/AntlrBasedSQLFormatterImpl.java @@ -1064,26 +1064,6 @@ private Token peekAhead(int offset) { return pos < tokens.size() ? tokens.get(pos) : null; } - /** - * NOTE: currently unused, but leaving it in for now, might come in handy in the future? - * Iterate ahead (excluding the current position being processed) through the token stream until reaching the - * delimiter, while looking for an occurrence of the Token that we want to find. If the delimiter itself is not - * found we return 'not found'. - */ - private boolean findBeforeDelimiter(int typeToBeFound, int typeDelimiter) { - boolean tokenFound = false; - for ( int i = position + 1; i < tokens.size(); i++ ) { - int nextTokenType = tokens.get(i).getType(); - if (nextTokenType == typeDelimiter) { - return tokenFound; - } - if (nextTokenType == typeToBeFound) { - tokenFound = true; - } - } - return false; - } - private Token peekBack(int offset) { int pos = position - offset; return pos >= 0 ? tokens.get(pos) : null; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/FormatStyle.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/FormatStyle.java index c7040f8f5bde..8bc5b048b0be 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/FormatStyle.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/FormatStyle.java @@ -9,32 +9,25 @@ public enum FormatStyle { /** * Formatting for SELECT, INSERT, UPDATE and DELETE statements */ - BASIC( "basic", AntlrBasedSQLFormatterImpl.INSTANCE ), + BASIC( AntlrBasedSQLFormatterImpl.INSTANCE ), /** * Formatting for DDL (CREATE, ALTER, DROP, etc) statements */ - DDL( "ddl", DDLFormatterImpl.INSTANCE ), + DDL( DDLFormatterImpl.INSTANCE ), /** * Syntax highlighting via ANSI escape codes */ - HIGHLIGHT( "highlight", HighlightingFormatter.INSTANCE ), + HIGHLIGHT( HighlightingFormatter.INSTANCE ), /** * No formatting */ - NONE( "none", NoFormatImpl.INSTANCE ); - - private final String name; + NONE( NoFormatImpl.INSTANCE ); private final Formatter formatter; - FormatStyle(String name, Formatter formatter) { - this.name = name; + FormatStyle(Formatter formatter) { this.formatter = formatter; } - public String getName() { - return name; - } - public Formatter getFormatter() { return formatter; } diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/group/UnknownParameterException.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/group/UnknownParameterException.java index f94431eb6b9a..1e0a6879e625 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/group/UnknownParameterException.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/group/UnknownParameterException.java @@ -15,11 +15,6 @@ * @author Steve Ebersole */ public class UnknownParameterException extends HibernateException { - private final MutationType mutationType; - private final MutationTarget mutationTarget; - private final String tableName; - private final String columnName; - private final ParameterUsage usage; public UnknownParameterException( MutationType mutationType, @@ -36,11 +31,6 @@ public UnknownParameterException( mutationType.name(), mutationTarget.getRolePath() ) ); - this.mutationType = mutationType; - this.mutationTarget = mutationTarget; - this.tableName = tableName; - this.columnName = columnName; - this.usage = usage; } public UnknownParameterException( @@ -58,10 +48,5 @@ public UnknownParameterException( mutationType.name(), mutationTargetRole ) ); - this.mutationType = mutationType; - this.mutationTarget = null; - this.tableName = tableName; - this.columnName = columnName; - this.usage = usage; } } diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/proxy/NClobProxy.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/proxy/NClobProxy.java index 53286a622b8b..a76036814e92 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/proxy/NClobProxy.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/proxy/NClobProxy.java @@ -54,14 +54,4 @@ public static NClob generateProxy(String string) { public static NClob generateProxy(Reader reader, long length) { return new NClobProxy( reader, length ); } - - /** - * Determines the appropriate class loader to which the generated proxy - * should be scoped. - * - * @return The class loader appropriate for proxy construction. - */ - protected static ClassLoader getProxyClassLoader() { - return NClobImplementer.class.getClassLoader(); - } } diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/jta/JtaStatusHelper.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/jta/JtaStatusHelper.java index 1c5b3126506e..0b384453a2cf 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/jta/JtaStatusHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/jta/JtaStatusHelper.java @@ -2,7 +2,6 @@ import jakarta.transaction.SystemException; import jakarta.transaction.TransactionManager; -import jakarta.transaction.UserTransaction; import org.hibernate.TransactionException; @@ -22,28 +21,6 @@ public final class JtaStatusHelper { private JtaStatusHelper() { } - /** - * Extract the status code from a {@link UserTransaction} - * - * @param userTransaction The {@link UserTransaction} from which to extract the status. - * - * @return The transaction status - * - * @throws TransactionException If the {@link UserTransaction} reports the status as unknown - */ - public static int getStatus(UserTransaction userTransaction) { - try { - final int status = userTransaction.getStatus(); - if ( status == STATUS_UNKNOWN ) { - throw new TransactionException( "UserTransaction reported transaction status as unknown" ); - } - return status; - } - catch ( SystemException se ) { - throw new TransactionException( "Could not determine transaction status", se ); - } - } - /** * Extract the status code from the current {@link jakarta.transaction.Transaction} associated with the * given {@link TransactionManager} @@ -78,18 +55,6 @@ public static boolean isActive(int status) { return status == STATUS_ACTIVE; } - /** - * Does the status code obtained from the given {@link UserTransaction} indicate an active transaction? - * - * @param userTransaction The {@link UserTransaction} whose status is to be checked - * - * @return True if the transaction is active; false otherwise. - */ - public static boolean isActive(UserTransaction userTransaction) { - final int status = getStatus( userTransaction ); - return isActive( status ); - } - /** * Does the status code obtained from the given {@link TransactionManager} indicate an active transaction? * @@ -114,28 +79,6 @@ public static boolean isRollback(int status) { || status == STATUS_ROLLEDBACK; } - /** - * Does the status code obtained from the given {@link UserTransaction} indicate a roll back? - * - * @param userTransaction The {@link UserTransaction} whose status is to be checked - * - * @return True if the transaction indicates roll back; false otherwise. - */ - public static boolean isRollback(UserTransaction userTransaction) { - return isRollback( getStatus( userTransaction ) ); - } - - /** - * Does the status code obtained from the given {@link TransactionManager} indicate a roll back? - * - * @param transactionManager The {@link TransactionManager} whose status is to be checked - * - * @return True if the transaction indicates roll back; false otherwise. - */ - public static boolean isRollback(TransactionManager transactionManager) { - return isRollback( getStatus( transactionManager ) ); - } - /** * Does the given status code indicate a committed transaction? * @@ -147,28 +90,6 @@ public static boolean isCommitted(int status) { return status == STATUS_COMMITTED; } - /** - * Does the status code obtained from the given {@link UserTransaction} indicate a commit? - * - * @param userTransaction The {@link UserTransaction} whose status is to be checked - * - * @return True if the transaction indicates commit; false otherwise. - */ - public static boolean isCommitted(UserTransaction userTransaction) { - return isCommitted( getStatus( userTransaction ) ); - } - - /** - * Does the status code obtained from the given {@link TransactionManager} indicate a commit? - * - * @param transactionManager The {@link TransactionManager} whose status is to be checked - * - * @return True if the transaction indicates commit; false otherwise. - */ - public static boolean isCommitted(TransactionManager transactionManager) { - return isCommitted( getStatus( transactionManager ) ); - } - /** * Does the given status code indicate the transaction has been marked for rollback? * diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/EventListenerLogging.java b/hibernate-core/src/main/java/org/hibernate/event/internal/EventListenerLogging.java index 204737cfabb5..b2bb3dd865eb 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/internal/EventListenerLogging.java +++ b/hibernate-core/src/main/java/org/hibernate/event/internal/EventListenerLogging.java @@ -219,10 +219,6 @@ public interface EventListenerLogging extends BasicLogger { @Message(id = 90060044, value = "Refreshing %s") void refreshing(String infoString); - @LogMessage(level = TRACE) - @Message(id = 90060043, value = "Refreshing transient %s") - void refreshingTransient(String infoString); - @LogMessage(level = TRACE) @Message(id = 90060042, value = "Already refreshed") void alreadyRefreshed(); @@ -267,12 +263,6 @@ public interface EventListenerLogging extends BasicLogger { @Message(id = 90060049, value = "Evicting collection %s") void evictingCollection(String collectionInfo); - // Lock - - @LogMessage(level = TRACE) - @Message(id = 90060064, value = "Reassociating transient instance: %s") - void reassociatingTransientInstance(String infoString); - // EntityState // @LogMessage(level = TRACE) diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/ReattachVisitor.java b/hibernate-core/src/main/java/org/hibernate/event/internal/ReattachVisitor.java index 6254c2b42ef5..1580c685ea67 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/internal/ReattachVisitor.java +++ b/hibernate-core/src/main/java/org/hibernate/event/internal/ReattachVisitor.java @@ -42,24 +42,6 @@ Object processEntity(@Nullable Object value, @Nonnull EntityType entityType) { return null; } - /** - * Retrieve the identifier of the entity being visited. - * - * @return The entity's identifier. - */ - final @Nonnull Object getOwnerIdentifier() { - return ownerIdentifier; - } - - /** - * Retrieve the entity being visited. - * - * @return The entity. - */ - final @Nonnull Object getOwner() { - return owner; - } - /** * {@inheritDoc} */ diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/WrapVisitor.java b/hibernate-core/src/main/java/org/hibernate/event/internal/WrapVisitor.java index 4f5d56c885dd..0d753eb2ed15 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/internal/WrapVisitor.java +++ b/hibernate-core/src/main/java/org/hibernate/event/internal/WrapVisitor.java @@ -34,14 +34,12 @@ public class WrapVisitor extends ProxyVisitor { protected Object entity; - protected Object id; private boolean substitute; public WrapVisitor(@Nonnull Object entity, @Nullable Object id, @Nonnull EventSource session) { super( session ); this.entity = entity; - this.id = id; } public boolean isSubstitutionRequired() { diff --git a/hibernate-core/src/main/java/org/hibernate/event/service/internal/EventListenerGroupImpl.java b/hibernate-core/src/main/java/org/hibernate/event/service/internal/EventListenerGroupImpl.java index 48c412553c61..af82df2f6d5f 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/service/internal/EventListenerGroupImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/event/service/internal/EventListenerGroupImpl.java @@ -58,7 +58,6 @@ public Action getAction() { } private final EventType eventType; - private final boolean isJpaBootstrap; //TODO at least the list of listeners should be made constant; //unfortunately a number of external integrations rely on being able to make @@ -67,9 +66,8 @@ public Action getAction() { private volatile T[] listeners = null; private volatile List listenersAsList = emptyList(); - public EventListenerGroupImpl(@Nonnull EventType eventType, boolean isJpaBootstrap) { + public EventListenerGroupImpl(@Nonnull EventType eventType) { this.eventType = eventType; - this.isJpaBootstrap = isJpaBootstrap; } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/event/service/internal/EventListenerRegistryImpl.java b/hibernate-core/src/main/java/org/hibernate/event/service/internal/EventListenerRegistryImpl.java index a1f6a5ad97d6..929527efd92f 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/service/internal/EventListenerRegistryImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/event/service/internal/EventListenerRegistryImpl.java @@ -323,7 +323,7 @@ public void prepareListeners(@Nonnull EventType type, @Nullable T default || type == EventType.POST_COMMIT_INSERT || type == EventType.POST_COMMIT_UPDATE ? new PostCommitEventListenerGroupImpl<>( type, jpaBootstrap ) - : new EventListenerGroupImpl<>( type, jpaBootstrap ) + : new EventListenerGroupImpl<>( type) ); } diff --git a/hibernate-core/src/main/java/org/hibernate/event/service/internal/PostCommitEventListenerGroupImpl.java b/hibernate-core/src/main/java/org/hibernate/event/service/internal/PostCommitEventListenerGroupImpl.java index 789373fa30c8..df2b737b465f 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/service/internal/PostCommitEventListenerGroupImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/event/service/internal/PostCommitEventListenerGroupImpl.java @@ -24,7 +24,7 @@ class PostCommitEventListenerGroupImpl extends EventListenerGroupImpl { public PostCommitEventListenerGroupImpl( @Nonnull EventType eventType, boolean isJpaBootstrap) { - super( eventType, isJpaBootstrap ); + super( eventType); if ( eventType == EventType.POST_COMMIT_DELETE ) { extendedListenerContract = PostCommitDeleteEventListener.class; diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/PostCollectionRecreateEvent.java b/hibernate-core/src/main/java/org/hibernate/event/spi/PostCollectionRecreateEvent.java index ed8a2252acd2..283812acff0a 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/spi/PostCollectionRecreateEvent.java +++ b/hibernate-core/src/main/java/org/hibernate/event/spi/PostCollectionRecreateEvent.java @@ -27,21 +27,6 @@ public PostCollectionRecreateEvent( ); } - @Internal - public PostCollectionRecreateEvent( - @Nonnull CollectionPersister collectionPersister, - @Nonnull PersistentCollection collection, - @Nonnull EventSource source, - @Nullable Object affectedOwner) { - super( - collectionPersister, - collection, - source, - affectedOwner, - getOwnerIdOrNull( affectedOwner, source ) - ); - } - @Internal public PostCollectionRecreateEvent( @Nonnull CollectionPersister collectionPersister, diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/PostCollectionUpdateEvent.java b/hibernate-core/src/main/java/org/hibernate/event/spi/PostCollectionUpdateEvent.java index c82855cc1c6c..58677402173e 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/spi/PostCollectionUpdateEvent.java +++ b/hibernate-core/src/main/java/org/hibernate/event/spi/PostCollectionUpdateEvent.java @@ -27,21 +27,6 @@ public PostCollectionUpdateEvent( ); } - @Internal - public PostCollectionUpdateEvent( - @Nonnull CollectionPersister collectionPersister, - @Nonnull PersistentCollection collection, - @Nonnull EventSource source, - @Nullable Object affectedOwner) { - super( - collectionPersister, - collection, - source, - affectedOwner, - getOwnerIdOrNull( affectedOwner, source ) - ); - } - @Internal public PostCollectionUpdateEvent( @Nonnull CollectionPersister collectionPersister, diff --git a/hibernate-core/src/main/java/org/hibernate/generator/values/internal/GeneratedValuesHelper.java b/hibernate-core/src/main/java/org/hibernate/generator/values/internal/GeneratedValuesHelper.java index bcecfd42d7d7..c796ce175d35 100644 --- a/hibernate-core/src/main/java/org/hibernate/generator/values/internal/GeneratedValuesHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/generator/values/internal/GeneratedValuesHelper.java @@ -58,18 +58,6 @@ @Internal public class GeneratedValuesHelper { - public static GeneratedValues buildGeneratedValues(EntityPersister entityPersister, EventType timing) { - var mutationDelegate = entityPersister.getMutationDelegate( timing == EventType.INSERT ? INSERT : UPDATE ); - final var mappingProducer = (GeneratedValuesMappingProducer) mutationDelegate.getGeneratedValuesMappingProducer(); - final var resultBuilders = mappingProducer.getResultBuilders(); - final List generatedProperties = new ArrayList<>( resultBuilders.size() ); - for ( var resultBuilder : resultBuilders ) { - generatedProperties.add( resultBuilder.getModelPart() ); - } - - return new GeneratedValuesImpl( generatedProperties ); - } - /** * Reads the {@linkplain EntityPersister#getGeneratedProperties(EventType) generated values} * for the specified {@link ResultSet}. diff --git a/hibernate-core/src/main/java/org/hibernate/graph/internal/parse/GraphParsing.java b/hibernate-core/src/main/java/org/hibernate/graph/internal/parse/GraphParsing.java index 506e9ca629b3..9a2f666ec748 100644 --- a/hibernate-core/src/main/java/org/hibernate/graph/internal/parse/GraphParsing.java +++ b/hibernate-core/src/main/java/org/hibernate/graph/internal/parse/GraphParsing.java @@ -60,20 +60,6 @@ public static RootGraphImplementor parse( return getGraphParsingStrategy( sessionFactory ).parse( graphText, sessionFactory ); } - public static RootGraphImplementor visit( - EntityDomainType rootType, - LegacyGraphLanguageParser.AttributeListContext attributeListContext, - SessionFactoryImplementor sessionFactory) { - return visit( rootType, attributeListContext, sessionFactory.getJpaMetamodel()::findEntityType ); - } - - public static RootGraphImplementor visit( - EntityDomainType rootType, - LegacyGraphLanguageParser.AttributeListContext attributeListContext, - GraphParserEntityNameResolver entityNameResolver) { - return visit( null, rootType, attributeListContext, entityNameResolver ); - } - @Deprecated(forRemoval = true) public static @Nonnull LegacyGraphLanguageParser.GraphContext parseLegacyGraphText(String graphText) { final var lexer = new GraphLanguageLexer( CharStreams.fromString( graphText ) ); diff --git a/hibernate-core/src/main/java/org/hibernate/id/CompositeNestedGeneratedValueGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/CompositeNestedGeneratedValueGenerator.java index 5f47d0032fde..81042309923c 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/CompositeNestedGeneratedValueGenerator.java +++ b/hibernate-core/src/main/java/org/hibernate/id/CompositeNestedGeneratedValueGenerator.java @@ -121,13 +121,6 @@ public interface GenerationPlan extends ExportableProducer { private final boolean needsValueBinding; private final boolean hasAssignedValues; - public CompositeNestedGeneratedValueGenerator( - GenerationContextLocator generationContextLocator, - ComponentType componentType) { - this( generationContextLocator, componentType, - List.of(), null, null, null ); - } - // Used by Hibernate Reactive to override generation plans public CompositeNestedGeneratedValueGenerator(CompositeNestedGeneratedValueGenerator original, List generationPlans) { this.generationContextLocator = original.generationContextLocator; diff --git a/hibernate-core/src/main/java/org/hibernate/id/UUIDLogger.java b/hibernate-core/src/main/java/org/hibernate/id/UUIDLogger.java index 4894bda54d30..da317cb1c93e 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/UUIDLogger.java +++ b/hibernate-core/src/main/java/org/hibernate/id/UUIDLogger.java @@ -43,8 +43,4 @@ public interface UUIDLogger extends BasicLogger { @LogMessage(level = WARN) @Message(value = "Unable to locate requested UUID generation strategy class: %s", id = 90302) void unableToLocateUuidGenerationStrategy(String strategyClassName); - - @LogMessage(level = WARN) - @Message(value = "GUID identifier generated: %s", id = 90305) - void guidGenerated(String result); } diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableGeneratorLogger.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableGeneratorLogger.java index 2d512936ea52..9a870a9a7931 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableGeneratorLogger.java +++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableGeneratorLogger.java @@ -54,11 +54,6 @@ public interface TableGeneratorLogger extends BasicLogger { @Message(value = "Could not update hi value in table: %s", id = 90103) void unableToUpdateHiValue(String tableName, @Cause SQLException e); - @LogMessage(level = INFO) - @Message(value = "Forcing table use for sequence-style generator due to pooled optimizer selection where db does not support pooled sequences", - id = 90107) - void forcingTableUse(); - @LogMessage(level = INFO) @Message(value = "Explicit segment value for id generator [%s.%s] suggested; using default [%s]", id = 90110) void usingDefaultIdGeneratorSegmentValue(String tableName, String segmentColumnName, String defaultToUse); diff --git a/hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java b/hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java index a59b3ec4173c..6f68fab055bd 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java @@ -120,40 +120,10 @@ void missingArguments( @Message(value = "'hibernate.properties' not found", id = 206) void propertiesNotFound(); - @LogMessage(level = WARN) - @Message( - value = """ - Recognized obsolete hibernate namespace %s.\ - Use namespace %s instead. Refer to Hibernate 3.6 Migration Guide""", - id = 223) - void recognizedObsoleteHibernateNamespace(String oldHibernateNamespace, String hibernateNamespace); - -// @LogMessage(level = WARN) -// @Message(value = "Scoping types to session factory %s after already scoped %s", id = 233) -// void scopingTypesToSessionFactoryAfterAlreadyScoped( -// SessionFactoryImplementor factory, -// SessionFactoryImplementor factory2); - -// @LogMessage(level = WARN) -// @Message(value = "SQL Error: %s, SQLState: %s", id = 247) -// void sqlWarning(int errorCode, String sqlState); - - @LogMessage(level = INFO) - @Message(value = "Start time: %s", id = 251) - void startTime(long startTime); - - @LogMessage(level = INFO) - @Message(value = "Transactions: %s", id = 266) - void transactions(long transactionCount); - @LogMessage(level = WARN) @Message(value = "Type [%s] defined no registration keys; ignoring", id = 269) void typeDefinedNoRegistrationKeys(Object type); - @LogMessage(level = WARN) - @Message(value = "Error accessing type info result set: %s", id = 273) - void unableToAccessTypeInfoResultSet(String string); - @LogMessage(level = WARN) @Message(value = "Unable to cleanup temporary id table after use [%s]", id = 283) void unableToCleanupTemporaryIdTable(Throwable t); @@ -214,30 +184,10 @@ void missingArguments( @Message(value = "Could not release a cache lock: %s", id = 353) void unableToReleaseCacheLock(CacheException ce); - @LogMessage(level = WARN) - @Message(value = "Unable to release type info result set", id = 357) - void unableToReleaseTypeInfoResultSet(); - @LogMessage(level = WARN) @Message(value = "Unable to erase previously added bag join fetch", id = 358) void unableToRemoveBagJoinFetch(); - @LogMessage(level = WARN) - @Message(value = "Unable to retrieve type info result set: %s", id = 362) - void unableToRetrieveTypeInfoResultSet(String string); - - @LogMessage(level = WARN) - @Message( - value = """ - The %s.%s.%s version of H2 implements temporary table creation such that it commits current transaction;\ - multi-table, bulk HQL/JPQL will not work properly""", - id = 393) - void unsupportedMultiTableBulkHqlJpaql(int majorVersion, int minorVersion, int buildId); - - @LogMessage(level = ERROR) - @Message(value = "Don't use old DTDs, read the Hibernate 3.x Migration Guide", id = 404) - void usingOldDtd(); - @LogMessage(level = WARN) @Message(value = "Warnings creating temp table: %s", id = 413) void warningsCreatingTempTable(SQLWarning warning); @@ -252,15 +202,6 @@ void missingArguments( ) void tooManyInExpressions(String dialectName, int limit, String paramName, int size); - @LogMessage(level = WARN) - @Message( - value = """ - Encountered request for locking however dialect reports that database prefers locking be done in a \ - separate select (follow-on locking); results will be locked after initial query executes""", - id = 444 - ) - void usingFollowOnLocking(); - @LogMessage(level = WARN) @Message( value = """ @@ -315,11 +256,6 @@ void missingArguments( id = 511) void unsupportedDatabaseVersion(String databaseName, String actualVersion, String minimumVersion); - @LogMessage(level = DEBUG) - @Message(value = "Unable to create the ReflectionOptimizer for [%s]: %s", - id = 513) - void unableToGenerateReflectionOptimizer(String className, String cause); - @LogMessage(level = DEBUG) @Message( id = 517, @@ -345,15 +281,6 @@ void illegalArgumentOnStaticMetamodelFieldInjection( String name3, String name4); - @LogMessage(level = WARN) - @Message( - id = 5002, - value = "Unable to locate static metamodel field: %s#%s; this may or may not indicate a problem with the static metamodel" - ) - void unableToLocateStaticMetamodelField( - String name, - String name2); - @LogMessage(level = DEBUG) @Message( id = 6001, value = "Error creating temp table" ) void errorCreatingTempTable(@Cause Exception e); diff --git a/hibernate-core/src/main/java/org/hibernate/internal/find/AbstractFindMultipleByKeyOperation.java b/hibernate-core/src/main/java/org/hibernate/internal/find/AbstractFindMultipleByKeyOperation.java index 745f112b2c9f..5cf79038840e 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/find/AbstractFindMultipleByKeyOperation.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/find/AbstractFindMultipleByKeyOperation.java @@ -219,30 +219,10 @@ public KeyType getKeyType() { return keyType; } - public CacheStoreMode getCacheStoreMode() { - return cacheStoreMode; - } - - public CacheRetrieveMode getCacheRetrieveMode() { - return cacheRetrieveMode; - } - public LockMode getLockMode() { return lockMode; } - public PessimisticLockScope getLockScope() { - return lockScope; - } - - public Locking.FollowOn getLockFollowOn() { - return lockFollowOn; - } - - public Timeout getLockTimeout() { - return lockTimeout; - } - public ReadOnlyMode getReadOnlyMode() { return readOnlyMode; } diff --git a/hibernate-core/src/main/java/org/hibernate/internal/find/GetReferenceOperation.java b/hibernate-core/src/main/java/org/hibernate/internal/find/GetReferenceOperation.java deleted file mode 100644 index 67a0f0ea101e..000000000000 --- a/hibernate-core/src/main/java/org/hibernate/internal/find/GetReferenceOperation.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.hibernate.internal.find; - - -/// Models the ability to get reference to an entity by a key, either primary or natural. -/// -/// @apiNote It is obviously expected that the entity-type and all options are -/// defined on the implementors of this contract. -/// -/// @param The entity type. -/// -/// @author Steve Ebersole -public interface GetReferenceOperation { - /// Perform the operation based on the given key. - /// - /// @param key The primary or natural key by which to get the entity reference. - T performGetReference(Object key); -} diff --git a/hibernate-core/src/main/java/org/hibernate/internal/find/LoadAccessContext.java b/hibernate-core/src/main/java/org/hibernate/internal/find/LoadAccessContext.java index 229fb8e5f691..c3860f37e017 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/find/LoadAccessContext.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/find/LoadAccessContext.java @@ -1,10 +1,7 @@ package org.hibernate.internal.find; -import org.hibernate.engine.spi.SharedSessionContractImplementor; - /** * @author Steve Ebersole */ public interface LoadAccessContext { - SharedSessionContractImplementor getEntityHandler(); } diff --git a/hibernate-core/src/main/java/org/hibernate/internal/find/StatefulGetReferenceOperation.java b/hibernate-core/src/main/java/org/hibernate/internal/find/StatefulGetReferenceOperation.java index a352fd3e0443..a27a6fa46ee5 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/find/StatefulGetReferenceOperation.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/find/StatefulGetReferenceOperation.java @@ -13,7 +13,7 @@ /// GetReferenceOperation implementation for a [stateful session][org.hibernate.Session]. /// /// @author Steve Ebersole -public class StatefulGetReferenceOperation implements GetReferenceOperation { +public class StatefulGetReferenceOperation { private final EntityPersister entityDescriptor; private final StatefulLoadAccessContext loadAccessContext; @@ -28,7 +28,6 @@ public StatefulGetReferenceOperation( this.keyType = keyType; } - @Override public T performGetReference(Object key) { loadAccessContext.checkOpenOrWaitingForAutoClose(); loadAccessContext.pulseTransactionCoordinator(); diff --git a/hibernate-core/src/main/java/org/hibernate/internal/find/StatefulLoadAccessContext.java b/hibernate-core/src/main/java/org/hibernate/internal/find/StatefulLoadAccessContext.java index 9d916a632f89..edf494a57116 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/find/StatefulLoadAccessContext.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/find/StatefulLoadAccessContext.java @@ -14,11 +14,6 @@ public interface StatefulLoadAccessContext extends LoadAccessContext { */ SessionImplementor getSession(); - @Override - default SessionImplementor getEntityHandler() { - return getSession(); - } - /** * Callback to check whether the session is "active" */ diff --git a/hibernate-core/src/main/java/org/hibernate/internal/find/StatelessLoadAccessContext.java b/hibernate-core/src/main/java/org/hibernate/internal/find/StatelessLoadAccessContext.java index 3a7a6c16ff05..56edc0fc432b 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/find/StatelessLoadAccessContext.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/find/StatelessLoadAccessContext.java @@ -7,9 +7,4 @@ /// @author Steve Ebersole public interface StatelessLoadAccessContext extends LoadAccessContext { StatelessSessionImplementor getStatelessSession(); - - @Override - default StatelessSessionImplementor getEntityHandler() { - return getStatelessSession(); - } } diff --git a/hibernate-core/src/main/java/org/hibernate/internal/log/DeprecationLogger.java b/hibernate-core/src/main/java/org/hibernate/internal/log/DeprecationLogger.java index f2263514abb1..6434b47f0bdd 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/log/DeprecationLogger.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/log/DeprecationLogger.java @@ -164,17 +164,6 @@ void recognizedObsoleteHibernateNamespace( ) void deprecatedSettingForRemoval(String settingName, String defaultValue); - /** - * Different from {@link #deprecatedSetting} in that sometimes there is no - * direct alternative - */ - @LogMessage(level = WARN) - @Message( - id = 90000030, - value = "The [%s] configuration is deprecated and will be removed." - ) - void deprecatedSettingNoReplacement(String settingName); - @LogMessage(level = WARN) @Message( id = 90000031, @@ -196,22 +185,6 @@ void recognizedObsoleteHibernateNamespace( ) void deprecatedAnnotation(Class annotationType, String locationDescription); - @LogMessage(level = WARN) - @Message( - id = 90000035, - value = "Callback method annotated '@%s' declared by embeddable class '%s'" - + " relies on an undocumented and unsupported capability" - + " (lifecycle callback methods should be declared by entity classes)" - ) - void embeddableLifecycleCallback(String annotationType, String embeddable); - - @LogMessage(level = WARN) - @Message( - id = 90000036, - value = "Encountered deprecated hint [%s]" - ) - void deprecatedHint(String deprecatedHint); - @LogMessage(level = WARN) @Message( id = 90000037, @@ -233,13 +206,6 @@ void recognizedObsoleteHibernateNamespace( ) void deprecatedUuidHexGenerator(String name, String name2); - @LogMessage(level = WARN) - @Message( - id = 90000040, - value = "DEPRECATED: use [%s] instead with custom [%s] implementation" - ) - void deprecatedUuidGenerator(String name, String name2); - @LogMessage(level = WARN) @Message( id = 90000041, diff --git a/hibernate-core/src/main/java/org/hibernate/internal/log/LoggingHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/log/LoggingHelper.java index e51c1be4758c..414a337c152b 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/log/LoggingHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/log/LoggingHelper.java @@ -1,10 +1,5 @@ package org.hibernate.internal.log; -import org.hibernate.collection.spi.PersistentCollection; -import org.hibernate.engine.spi.CollectionKey; -import org.hibernate.engine.spi.EntityKey; -import org.hibernate.internal.util.StringHelper; -import org.hibernate.metamodel.model.domain.NavigableRole; import org.hibernate.spi.NavigablePath; /** @@ -14,70 +9,10 @@ * @author Steve Ebersole */ public class LoggingHelper { - public static final String NULL = ""; - public static final String UNREFERENCED = ""; - - public static String toLoggableString(NavigableRole role) { - if ( role == null ) { - return UNREFERENCED; - } - - return role.getFullPath(); - } public static String toLoggableString(NavigablePath path) { assert path != null; return path.getFullPath(); } - - public static String toLoggableString(NavigableRole role, Object key) { - if ( role == null ) { - return UNREFERENCED; - } - - return toLoggableString( toLoggableString( role ), key ); - } - - public static String toLoggableString(NavigablePath path, Object key) { - assert path != null; - return toLoggableString( toLoggableString( path ), key ); - } - - public static String toLoggableString(CollectionKey collectionKey) { - return toLoggableString( collectionKey.getRole(), collectionKey.getKey() ); - } - - public static String toLoggableString(EntityKey entityKey) { - return toLoggableString( StringHelper.collapse( entityKey.getEntityName() ), entityKey.getIdentifierValue() ); - } - - private static String toLoggableString(String roleOrPath, Object key) { - assert roleOrPath != null; - - StringBuilder buffer = new StringBuilder(); - - buffer.append( roleOrPath ); - buffer.append( '#' ); - - if ( key == null ) { - buffer.append( NULL ); - } - else { - buffer.append( key ); - } - - return buffer.toString(); - } - - public static String toLoggableString(PersistentCollection collectionInstance) { - if ( collectionInstance == null ) { - return NULL; - } - - return toLoggableString( - collectionInstance.getRole(), - collectionInstance.getKey() - ); - } } diff --git a/hibernate-core/src/main/java/org/hibernate/internal/log/UrlMessageBundle.java b/hibernate-core/src/main/java/org/hibernate/internal/log/UrlMessageBundle.java index e534f5953611..3752e45059a4 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/log/UrlMessageBundle.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/log/UrlMessageBundle.java @@ -79,17 +79,4 @@ public interface UrlMessageBundle { @LogMessage( level = WARN ) @Message( value = "Expecting resource named by URL [%s] to be a directory, but it was not. URL will be ignored", id = 10000004 ) void logFileIsNotDirectory(URL url); - - /** - * Access to the exception message used when a URL references names a file that does not exist. - *

    - * TODO : detail when this is a warning {@link #logFileDoesNotExist} versus an exception... - * - * @param filePart The "file part" that we gleaned from the URL - * @param url The given URL - * - * @return The message - */ - @Message( value = "File [%s] referenced by given URL [%s] does not exist", id = 10000005 ) - String fileDoesNotExist(String filePart, URL url); } diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/BytesHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/util/BytesHelper.java index 94110aedc21e..c7afa6159f46 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/util/BytesHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/util/BytesHelper.java @@ -53,19 +53,6 @@ public static byte[] fromInt(int intValue) { return bytes; } - /** - * Interpret a long as its binary form - * - * @param longValue The long to interpret to binary - * - * @return The binary - */ - public static byte[] fromLong(long longValue) { - byte[] bytes = new byte[8]; - fromLong(longValue, bytes, 0); - return bytes; - } - /** * Interpret a long as its binary form * @@ -129,13 +116,6 @@ public static String toBinaryString(byte value) { return buf.toString(); } - public static String toBinaryString(int value) { - String formatted = Long.toBinaryString( value ); - StringBuilder buf = new StringBuilder( StringHelper.repeat( '0', 32 ) ); - buf.replace( 64 - formatted.length(), 64, formatted ); - return buf.toString(); - } - public static String toBinaryString(long value) { String formatted = Long.toBinaryString( value ); StringBuilder buf = new StringBuilder( StringHelper.repeat( '0', 64 ) ); diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/CharSequenceHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/util/CharSequenceHelper.java index 9e85f5c36a66..d83fbd776894 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/util/CharSequenceHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/util/CharSequenceHelper.java @@ -20,78 +20,10 @@ else if ( sequence instanceof SubSequence ) { } } - public static CharSequence subSequence(CharSequence sequence) { - return subSequence(sequence, 0, sequence.length()); - } - public static boolean isEmpty(CharSequence string) { return string == null || string.length() == 0; } - public static int lastIndexOf(CharSequence charSequence, char c) { - return lastIndexOf( charSequence, c, 0, charSequence.length() - 1 ); - } - - public static int lastIndexOf(CharSequence charSequence, char c, int fromIndex, int endIndex) { - if ( charSequence instanceof String string ) { - int idx = string.lastIndexOf( c, endIndex ); - if ( idx < fromIndex ) { - return -1; - } - return idx; - } - else if ( charSequence instanceof SubSequence subSequence ) { - return subSequence.lastIndexOf( c, fromIndex, endIndex ); - } - else { - return lastIndexOf( charSequence.toString(), c, fromIndex, endIndex ); - } - } - - public static int indexOf(CharSequence charSequence, char c) { - return indexOf( charSequence, c, 0 ); - } - - public static int indexOf(CharSequence charSequence, char c, int fromIndex) { - return indexOf( charSequence, c, fromIndex, charSequence.length() - 1 ); - } - - public static int indexOf(CharSequence charSequence, char c, int fromIndex, int endIndex) { - if ( charSequence instanceof String string ) { - int idx = string.indexOf( c, fromIndex ); - if ( idx > endIndex ) { - return -1; - } - return idx; - } - else if ( charSequence instanceof SubSequence subSequence ) { - return subSequence.indexOf( c, fromIndex, endIndex ); - } - else { - return indexOf( charSequence.toString(), c, fromIndex, endIndex ); - } - } - - public static int indexOf(CharSequence charSequence, String target, int fromIndex) { - return indexOf( charSequence, target, fromIndex, charSequence.length() - 1 ); - } - - public static int indexOf(CharSequence charSequence, String target, int fromIndex, int endIndex) { - if ( charSequence instanceof String string ) { - int idx = string.indexOf( target, fromIndex ); - if ( idx > endIndex ) { - return -1; - } - return idx; - } - else if ( charSequence instanceof SubSequence subSequence ) { - return subSequence.indexOf( target, fromIndex, endIndex ); - } - else { - return indexOf( charSequence.toString(), target, fromIndex, endIndex ); - } - } - public static boolean regionMatchesIgnoreCase( CharSequence lhs, int lhsStart, diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/ConfigHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/util/ConfigHelper.java index 2761197bf5ac..3ccecae9fd2a 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/util/ConfigHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/util/ConfigHelper.java @@ -120,33 +120,4 @@ public static InputStream getResourceAsStream(String resource) { } return stream; } - - - public static InputStream getUserResourceAsStream(String resource) { - boolean hasLeadingSlash = resource.startsWith( "/" ); - final String stripped = hasLeadingSlash ? resource.substring( 1 ) : resource; - - InputStream stream = null; - - ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); - if ( classLoader != null ) { - stream = classLoader.getResourceAsStream( resource ); - if ( stream == null && hasLeadingSlash ) { - stream = classLoader.getResourceAsStream( stripped ); - } - } - - if ( stream == null ) { - stream = Environment.class.getClassLoader().getResourceAsStream( resource ); - } - if ( stream == null && hasLeadingSlash ) { - stream = Environment.class.getClassLoader().getResourceAsStream( stripped ); - } - - if ( stream == null ) { - throw new HibernateException( resource + " not found" ); - } - - return stream; - } } diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/ImmutableBitSet.java b/hibernate-core/src/main/java/org/hibernate/internal/util/ImmutableBitSet.java index 5b6c8fa49fab..4dada642c722 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/util/ImmutableBitSet.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/util/ImmutableBitSet.java @@ -38,10 +38,6 @@ public boolean get(int bitIndex) { return wordIndex < words.length && ( ( words[wordIndex] & ( 1L << bitIndex ) ) != 0 ); } - public boolean isEmpty() { - return this == EMPTY; - } - public boolean contains(ImmutableBitSet set) { if ( words.length < set.words.length ) { return false; diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/MutableBoolean.java b/hibernate-core/src/main/java/org/hibernate/internal/util/MutableBoolean.java index 5706de5de454..c1f3338b17c8 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/util/MutableBoolean.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/util/MutableBoolean.java @@ -7,20 +7,6 @@ * @author Steve Ebersole */ public class MutableBoolean { - private boolean value; - public MutableBoolean() { } - - public MutableBoolean(boolean value) { - this.value = value; - } - - public boolean getValue() { - return value; - } - - public void setValue(boolean value) { - this.value = value; - } } diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/MutableInteger.java b/hibernate-core/src/main/java/org/hibernate/internal/util/MutableInteger.java index 5dc1389cd746..584bd2c9441d 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/util/MutableInteger.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/util/MutableInteger.java @@ -19,24 +19,10 @@ public MutableInteger(int value) { this.value = value; } - public MutableInteger deepCopy() { - return new MutableInteger( value ); - } - public int getAndIncrement() { return value++; } - public int getAndIncrementBy(int i) { - final int local = value; - value += i; - return local; - } - - public int incrementAndGet() { - return ++value; - } - public int get() { return value; } @@ -45,27 +31,11 @@ public void set(int value) { this.value = value; } - public void increase() { - ++value; - } - public void increment() { ++value; } - public void incrementBy(int i) { - value += i; - } - - public void increase(int i) { - value += i; - } - public void plus(int i) { value += i; } - - public void minus(int i) { - value -= i; - } } diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/MutableLong.java b/hibernate-core/src/main/java/org/hibernate/internal/util/MutableLong.java index 3c1b539ad980..0844f69863d2 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/util/MutableLong.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/util/MutableLong.java @@ -13,22 +13,6 @@ public class MutableLong { public MutableLong() { } - public MutableLong(long value) { - this.value = value; - } - - public MutableLong deepCopy() { - return new MutableLong( value ); - } - - public long getAndIncrement() { - return value++; - } - - public long incrementAndGet() { - return ++value; - } - public long get() { return value; } @@ -36,8 +20,4 @@ public long get() { public void set(long value) { this.value = value; } - - public void increase() { - ++value; - } } diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/MutableObject.java b/hibernate-core/src/main/java/org/hibernate/internal/util/MutableObject.java index a658c71e0c88..fe54427d341c 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/util/MutableObject.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/util/MutableObject.java @@ -1,9 +1,5 @@ package org.hibernate.internal.util; -import java.util.function.BiConsumer; -import java.util.function.Consumer; -import java.util.function.Supplier; - /** * Mutable object reference. Mainly useful with anonymous code blocks * and lambdas. @@ -17,69 +13,11 @@ public class MutableObject { public MutableObject() { } - public MutableObject(T reference) { - this.reference = reference; - } - public T get() { return reference; } - public boolean isSet() { - return reference != null; - } - - public boolean isNotSet() { - return reference == null; - } - public void set(T reference) { this.reference = reference; } - - public void set(T reference, Consumer existingConsumer) { - if ( this.reference != null ) { - existingConsumer.accept( this.reference ); - } - - this.reference = reference; - } - - public void set(T reference, BiConsumer existingConsumer) { - if ( this.reference != null ) { - existingConsumer.accept( reference, this.reference ); - } - - this.reference = reference; - } - - public void setIfNot(T reference) { - if ( this.reference == null ) { - this.reference = reference; - } - } - - public void setIfNot(T reference, Supplier overwriteHandler) { - if ( this.reference == null ) { - this.reference = reference; - } - else { - throw overwriteHandler.get(); - } - } - - public void setIfNot(Supplier referenceSupplier) { - if ( this.reference == null ) { - this.reference = referenceSupplier.get(); - } - } - - public void setIfNot(Supplier referenceSupplier, Supplier overwriteHandler) { - if ( this.reference == null ) { - this.reference = referenceSupplier.get(); - } - else { - throw overwriteHandler.get(); - } - } } diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/NullnessHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/util/NullnessHelper.java index 011a9903fd58..ecbc2122e75f 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/util/NullnessHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/util/NullnessHelper.java @@ -16,10 +16,6 @@ public static T nullif(T test, T fallback) { return coalesce( test, fallback ); } - public static T nullif(T test, Supplier fallbackSupplier) { - return test != null ? test : fallbackSupplier.get(); - } - /** * Operates like SQL coalesce expression, returning the first non-empty value * diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/NullnessUtil.java b/hibernate-core/src/main/java/org/hibernate/internal/util/NullnessUtil.java index 7ab559a50dc2..3eecc7578936 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/util/NullnessUtil.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/util/NullnessUtil.java @@ -69,257 +69,4 @@ private NullnessUtil() { assert ref != null : "Misuse of castNonNull: called with a null argument"; return ref; } - - /** - * Suppress warnings from static nullness analysis, with a custom error message. See {@link - * #castNonNull(Object)} for documentation. - * - * @param the type of the reference - * @param ref a reference of @Nullable type, that is non-null at run time - * @param message text to include if this method is misused - * - * @return the argument, casted to have the type qualifier @Nonnull - * - * @see #castNonNull(Object) - */ - public static @Nonnull T castNonNull( - @Nullable T ref, String message) { - assert ref != null : "Misuse of castNonNull: called with a null argument: " + message; - return ref; - } - - /** - * Like castNonNull, but whereas that method only checks and casts the reference itself, this - * traverses all levels of the argument array. The array is recursively checked to ensure that all - * elements at every array level are non-null. - * - * @param the component type of the array - * @param arr an array all of whose elements, and their elements recursively, are non-null at run - * time - * - * @return the argument, casted to have the type qualifier @Nonnull at all levels - * - * @see #castNonNull(Object) - */ - public static @Nonnull T[] castNonNullDeep( - @Nullable T[] arr) { - return castNonNullArray( arr, null ); - } - - /** - * Like castNonNull, but whereas that method only checks and casts the reference itself, this - * traverses all levels of the argument array. The array is recursively checked to ensure that all - * elements at every array level are non-null. - * - * @param the component type of the array - * @param arr an array all of whose elements, and their elements recursively, are non-null at run - * time - * @param message text to include if this method is misused - * - * @return the argument, casted to have the type qualifier @Nonnull at all levels - * - * @see #castNonNull(Object) - */ - public static @Nonnull T[] castNonNullDeep( - @Nullable T[] arr, String message) { - return castNonNullArray( arr, message ); - } - - /** - * Like castNonNull, but whereas that method only checks and casts the reference itself, this - * traverses all levels of the argument array. The array is recursively checked to ensure that all - * elements at every array level are non-null. - * - * @param the component type of the component type of the array - * @param arr an array all of whose elements, and their elements recursively, are non-null at run - * time - * - * @return the argument, casted to have the type qualifier @Nonnull at all levels - * - * @see #castNonNull(Object) - */ - public static @Nonnull T[][] castNonNullDeep( - @Nullable T[][] arr) { - return castNonNullArray( arr, null ); - } - - /** - * Like castNonNull, but whereas that method only checks and casts the reference itself, this - * traverses all levels of the argument array. The array is recursively checked to ensure that all - * elements at every array level are non-null. - * - * @param the component type of the component type of the array - * @param arr an array all of whose elements, and their elements recursively, are non-null at run - * time - * @param message text to include if this method is misused - * - * @return the argument, casted to have the type qualifier @Nonnull at all levels - * - * @see #castNonNull(Object) - */ - public static @Nonnull T[][] castNonNullDeep( - @Nullable T[][] arr, String message) { - return castNonNullArray( arr, message ); - } - - /** - * Like castNonNull, but whereas that method only checks and casts the reference itself, this - * traverses all levels of the argument array. The array is recursively checked to ensure that all - * elements at every array level are non-null. - * - * @param the component type (three levels in) of the array - * @param arr an array all of whose elements, and their elements recursively, are non-null at run - * time - * - * @return the argument, casted to have the type qualifier @Nonnull at all levels - * - * @see #castNonNull(Object) - */ - public static @Nonnull T[][][] castNonNullDeep( - @Nullable T[][][] arr) { - return castNonNullArray( arr, null ); - } - - /** - * Like castNonNull, but whereas that method only checks and casts the reference itself, this - * traverses all levels of the argument array. The array is recursively checked to ensure that all - * elements at every array level are non-null. - * - * @param the component type (three levels in) of the array - * @param arr an array all of whose elements, and their elements recursively, are non-null at run - * time - * @param message text to include if this method is misused - * - * @return the argument, casted to have the type qualifier @Nonnull at all levels - * - * @see #castNonNull(Object) - */ - public static @Nonnull T[][][] castNonNullDeep( - @Nullable T[][][] arr, String message) { - return castNonNullArray( arr, message ); - } - - /** - * Like castNonNull, but whereas that method only checks and casts the reference itself, this - * traverses all levels of the argument array. The array is recursively checked to ensure that all - * elements at every array level are non-null. - * - * @param the component type of the array - * @param arr an array all of whose elements, and their elements recursively, are non-null at run - * time - * - * @return the argument, casted to have the type qualifier @Nonnull at all levels - * - * @see #castNonNull(Object) - */ - public static @Nonnull T[][][][] castNonNullDeep( - @Nullable T[][][][] arr) { - return castNonNullArray( arr, null ); - } - - /** - * Like castNonNull, but whereas that method only checks and casts the reference itself, this - * traverses all levels of the argument array. The array is recursively checked to ensure that all - * elements at every array level are non-null. - * - * @param the component type (four levels in) of the array - * @param arr an array all of whose elements, and their elements recursively, are non-null at run - * time - * @param message text to include if this method is misused - * - * @return the argument, casted to have the type qualifier @Nonnull at all levels - * - * @see #castNonNull(Object) - */ - public static @Nonnull T[][][][] castNonNullDeep( - @Nullable T[][][][] arr, String message) { - return castNonNullArray( arr, message ); - } - - /** - * Like castNonNull, but whereas that method only checks and casts the reference itself, this - * traverses all levels of the argument array. The array is recursively checked to ensure that all - * elements at every array level are non-null. - * - * @param the component type (four levels in) of the array - * @param arr an array all of whose elements, and their elements recursively, are non-null at run - * time - * - * @return the argument, casted to have the type qualifier @Nonnull at all levels - * - * @see #castNonNull(Object) - */ - public static @Nonnull T[][][][][] castNonNullDeep( - @Nullable T[][][][][] arr) { - return castNonNullArray( arr, null ); - } - - /** - * Like castNonNull, but whereas that method only checks and casts the reference itself, this - * traverses all levels of the argument array. The array is recursively checked to ensure that all - * elements at every array level are non-null. - * - * @param the component type (five levels in) of the array - * @param arr an array all of whose elements, and their elements recursively, are non-null at run - * time - * @param message text to include if this method is misused - * - * @return the argument, casted to have the type qualifier @Nonnull at all levels - * - * @see #castNonNull(Object) - */ - public static @Nonnull T[][][][][] castNonNullDeep( - @Nullable T[][][][][] arr, String message) { - return castNonNullArray( arr, message ); - } - - /** - * The implementation of castNonNullDeep. - * - * @param the component type (five levels in) of the array - * @param arr an array all of whose elements, and their elements recursively, are non-null at run - * time - * @param message text to include if there is a non-null value, or null to use uncustomized - * message - * - * @return the argument, casted to have the type qualifier @Nonnull at all levels - */ - private static @Nonnull T[] castNonNullArray( - @Nullable T[] arr, @Nullable String message) { - assert arr != null - : "Misuse of castNonNullArray: called with a null array argument" - + ( ( message == null ) ? "" : ( ": " + message ) ); - for ( int i = 0; i < arr.length; ++i ) { - assert arr[i] != null - : "Misuse of castNonNull: called with a null array element" - + ( ( message == null ) ? "" : ( ": " + message ) ); - checkIfArray( arr[i], message ); - } - return arr; - } - - /** - * If the argument is an array, requires it to be non-null at all levels. - * - * @param ref a value; if an array, all of its elements, and their elements recursively, are - * non-null at run time - * @param message text to include if there is a non-null value, or null to use uncustomized - * message - */ - private static void checkIfArray(@Nonnull Object ref, @Nullable String message) { - assert ref != null - : "Misuse of checkIfArray: called with a null argument" - + ( ( message == null ) ? "" : ( ": " + message ) ); - Class comp = ref.getClass().getComponentType(); - if ( comp != null ) { - // comp is non-null for arrays, otherwise null. - if ( comp.isPrimitive() ) { - // Nothing to do for arrays of primitive type: primitives are - // never null. - } - else { - castNonNullArray( (Object[]) ref, message ); - } - } - } } diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/Optional.java b/hibernate-core/src/main/java/org/hibernate/internal/util/Optional.java index 72e68503161d..c4a9f5e0fac4 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/util/Optional.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/util/Optional.java @@ -1,8 +1,6 @@ package org.hibernate.internal.util; import java.io.Serializable; -import java.util.function.Consumer; -import java.util.function.Function; import java.util.function.Supplier; /** @@ -21,55 +19,9 @@ static Defined of(T t) { return new Defined<>(t); } - default boolean defined() { - return this instanceof Defined; - } - - default void consume(Consumer consumer) { - if (this instanceof Defined defined) { - consumer.accept( defined.result() ); - } - } - - default void consume(Consumer consumer, T value) { - if (this instanceof Defined defined) { - consumer.accept( defined.result() ); - } - else { - consumer.accept( value ); - } - } - - default void consume(Consumer consumer, Supplier supplier) { - if (this instanceof Defined defined) { - consumer.accept( defined.result() ); - } - else { - consumer.accept( supplier.get() ); - } - } - - default T evaluate(T value) { - return this instanceof Defined defined - ? defined.result() - : value; - } - default T evaluate(Supplier supplier) { return this instanceof Defined defined ? defined.result() : supplier.get(); } - - default X evaluate(Function function, Supplier supplier) { - return this instanceof Defined defined - ? function.apply( defined.result() ) - : supplier.get(); - } - - default X evaluate(Function function, X value) { - return this instanceof Defined defined - ? function.apply( defined.result() ) - : value; - } } diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/ReflectHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/util/ReflectHelper.java index e5d677feb60a..5acdb03c2aec 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/util/ReflectHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/util/ReflectHelper.java @@ -133,21 +133,6 @@ public static boolean overridesHashCode(Class clazz) { return !OBJECT_HASHCODE.equals( hashCode ); } - /** - * Determine if the given class implements the given interface. - * - * @param clazz The class to check - * @param intf The interface to check it against. - * @return True if the class does implement the interface, false otherwise. - * - * @deprecated No longer used - */ - @Deprecated(since = "7", forRemoval = true) - public static boolean implementsInterface(Class clazz, Class intf) { - assert intf.isInterface() : "Interface to check was not an interface"; - return intf.isAssignableFrom( clazz ); - } - /** * Perform resolution of a class name. *

    @@ -706,45 +691,6 @@ public static Method setterMethodOrNull(final Class containerClass, final St return setter; // might be null } - public static Method setterMethodOrNullBySetterName(final Class containerClass, final String setterName, final Class propertyType) { - Class checkClass = containerClass; - Method setter = null; - - // check containerClass, and then its super types (if any) - while ( setter == null && checkClass != null ) { - if ( checkClass.equals( Object.class ) ) { - break; - } - else { - setter = setterOrNullBySetterName( checkClass, setterName, propertyType ); - // if no setter found yet, check all implemented interfaces - if ( setter == null ) { - setter = setterOrNullBySetterName( checkClass.getInterfaces(), setterName, propertyType ); - } - else { - ensureAccessibility( setter ); - } - checkClass = checkClass.getSuperclass(); - } - } - return setter; // might be null - } - - private static Method setterOrNullBySetterName(Class[] interfaces, String setterName, Class propertyType) { - Method setter = null; - for ( int i = 0; setter == null && i < interfaces.length; ++i ) { - final Class anInterface = interfaces[i]; - if ( !shouldSkipInterfaceCheck( anInterface ) ) { - setter = setterOrNullBySetterName( anInterface, setterName, propertyType ); - if ( setter == null ) { - // if no setter found yet, check all implemented interfaces of interface - setter = setterOrNullBySetterName( anInterface.getInterfaces(), setterName, propertyType ); - } - } - } - return setter; - } - private static boolean shouldSkipInterfaceCheck(final Class anInterface) { final String interfaceName = anInterface.getName(); //Skip checking any interface that we've added via bytecode enhancement: @@ -760,22 +706,6 @@ private static boolean shouldSkipInterfaceCheck(final Class anInterface) { return false; } - private static Method setterOrNullBySetterName(Class theClass, String setterName, Class propertyType) { - Method potentialSetter = null; - - for ( Method method : theClass.getDeclaredMethods() ) { - final String methodName = method.getName(); - if ( method.getParameterCount() == 1 && methodName.equals( setterName ) ) { - potentialSetter = method; - if ( propertyType == null || method.getParameterTypes()[0].equals( propertyType ) ) { - break; - } - } - } - - return potentialSetter; - } - public static Method findSetterMethod(final Class containerClass, final String propertyName, final Class propertyType) { final Method setter = setterMethodOrNull( containerClass, propertyName, propertyType ); if ( setter == null ) { @@ -886,11 +816,6 @@ public static Method findGetterMethodForFieldAccess(Field field, String property return null; } - @Deprecated(forRemoval = true) - public static boolean isRecord(Class declaringClass) { - return declaringClass.isRecord(); - } - public static Class[] getRecordComponentTypes(Class javaType) { try { final var recordComponents = javaType.getRecordComponents(); @@ -968,11 +893,6 @@ public static Class getClass(T instance) { return (Class) instance.getClass(); } - @SuppressWarnings("unchecked") - public static > Class getClass(Enum value) { - return (Class) value.getClass(); - } - @AllowReflection public static Class arrayClass(Class clazz) { final Object instance = Array.newInstance( clazz, 0 ); diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/SubSequence.java b/hibernate-core/src/main/java/org/hibernate/internal/util/SubSequence.java index c0a44405decb..5ffd0ecd0b60 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/util/SubSequence.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/util/SubSequence.java @@ -38,30 +38,6 @@ public CharSequence subSequence(int start, int end) { return sequence.subSequence( this.start + start, this.start + end ); } - public int lastIndexOf(char c, int fromIndex, int endIndex) { - int idx = CharSequenceHelper.lastIndexOf( sequence, c, start + fromIndex, this.start + endIndex ); - if ( idx == -1 ) { - return -1; - } - return idx - this.start; - } - - public int indexOf(char c, int fromIndex, int endIndex) { - int idx = CharSequenceHelper.indexOf( sequence, c, this.start + fromIndex, this.start + endIndex ); - if ( idx == -1 ) { - return -1; - } - return idx - this.start; - } - - public int indexOf(String s, int fromIndex, int endIndex) { - int idx = CharSequenceHelper.indexOf( sequence, s, this.start + fromIndex, this.start + endIndex ); - if ( idx == -1 ) { - return -1; - } - return idx - this.start; - } - @Override public String toString() { return sequence.subSequence( start, start + length ).toString(); diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/ValueHolder.java b/hibernate-core/src/main/java/org/hibernate/internal/util/ValueHolder.java index e756f759ab7d..a902e5debb93 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/util/ValueHolder.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/util/ValueHolder.java @@ -38,23 +38,10 @@ public ValueHolder(DeferredInitializer valueInitializer) { this.valueInitializer = valueInitializer; } - @SuppressWarnings( {"unchecked"}) - public ValueHolder(T value) { - this( NO_DEFERRED_INITIALIZER ); - this.value = value; - } - public T getValue() { if ( value == null ) { value = valueInitializer.initialize(); } return value; } - - private static final DeferredInitializer NO_DEFERRED_INITIALIZER = new DeferredInitializer() { - @Override - public Void initialize() { - return null; - } - }; } diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/beans/BeanInfoHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/util/beans/BeanInfoHelper.java index fd72a955ecad..c7d87f649eef 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/util/beans/BeanInfoHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/util/beans/BeanInfoHelper.java @@ -53,23 +53,11 @@ public interface ReturningBeanInfoDelegate { private final Class beanClass; private final Class stopClass; - public BeanInfoHelper(Class beanClass) { - this( beanClass, Object.class ); - } - public BeanInfoHelper(Class beanClass, Class stopClass) { this.beanClass = beanClass; this.stopClass = stopClass; } - public void applyToBeanInfo(Object bean, BeanInfoDelegate delegate) { - if ( ! beanClass.isInstance( bean ) ) { - throw new BeanIntrospectionException( "Bean [" + bean + "] was not of declared bean type [" + beanClass.getName() + "]" ); - } - - visitBeanInfo( beanClass, stopClass, delegate ); - } - public static void visitBeanInfo(Class beanClass, BeanInfoDelegate delegate) { visitBeanInfo( beanClass, Object.class, delegate ); } diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/beans/BeanIntrospectionException.java b/hibernate-core/src/main/java/org/hibernate/internal/util/beans/BeanIntrospectionException.java index 6354790de23e..8c8a8f03914f 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/util/beans/BeanIntrospectionException.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/util/beans/BeanIntrospectionException.java @@ -11,8 +11,4 @@ public class BeanIntrospectionException extends HibernateException { public BeanIntrospectionException(String string, Throwable root) { super( string, root ); } - - public BeanIntrospectionException(String s) { - super( s ); - } } diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/ArrayHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/ArrayHelper.java index ad927e634285..b8cbdb894a7f 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/ArrayHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/ArrayHelper.java @@ -10,8 +10,6 @@ import org.hibernate.internal.build.AllowReflection; import org.hibernate.type.Type; -import static java.lang.reflect.Array.get; -import static java.lang.reflect.Array.getLength; import static java.util.Arrays.asList; public final class ArrayHelper { @@ -20,15 +18,6 @@ public static boolean contains(T[] array, T object) { return indexOf( array, object ) > -1; } - public static boolean containsAll(T[] array, T[] elements) { - for ( T element : elements ) { - if ( !contains( array, element ) ) { - return false; - } - } - return true; - } - public static boolean contains(int[] array, int value) { //noinspection ForLoopReplaceableByForEach for ( int i = 0; i < array.length; i++ ) { @@ -60,31 +49,14 @@ public static T[] filledArray(T value, Class valueJavaType, int size) { return array; } - public static String[] toStringArray(Object[] objects) { - int length = objects.length; - String[] result = new String[length]; - for ( int i = 0; i < length; i++ ) { - result[i] = objects[i].toString(); - } - return result; - } - public static String[] toStringArray(Collection coll) { return coll.toArray( EMPTY_STRING_ARRAY ); } - public static Object[] toObjectArray(Collection coll) { - return coll.toArray( EMPTY_OBJECT_ARRAY ); - } - public static String[][] to2DStringArray(Collection coll) { return coll.toArray( new String[0][] ); } - public static int[][] to2DIntArray(Collection coll) { - return coll.toArray( new int[0][] ); - } - public static Type[] toTypeArray(Collection coll) { return coll.toArray( EMPTY_TYPE_ARRAY ); } @@ -128,18 +100,6 @@ public static String[] join(String[] x, String[] y) { return result; } - public static String[] join(String[] x, String[] y, boolean[] use) { - final var result = new String[x.length + countTrue( use )]; - System.arraycopy( x, 0, result, 0, x.length ); - int k = x.length; - for ( int i = 0; i < y.length; i++ ) { - if ( use[i] ) { - result[k++] = y[i]; - } - } - return result; - } - public static int[] join(int[] x, int[] y) { final var result = new int[x.length + y.length]; System.arraycopy( x, 0, result, 0, x.length ); @@ -156,15 +116,6 @@ public static T[] join(T[] x, T... y) { return result; } - @SuppressWarnings("unchecked") - @AllowReflection - public static T[] add(T[] x, T y) { - final T[] result = (T[]) Array.newInstance( x.getClass().getComponentType(), x.length + 1 ); - System.arraycopy( x, 0, result, 0, x.length ); - result[x.length] = y; - return result; - } - public static final boolean[] TRUE = {true}; public static final boolean[] FALSE = {false}; @@ -184,15 +135,6 @@ public static String toString(Object[] array) { return string.toString(); } - public static boolean isAllNegative(int[] array) { - for ( int element : array ) { - if ( element >= 0 ) { - return false; - } - } - return true; - } - public static boolean isAllTrue(boolean... array) { for ( boolean element : array ) { if ( !element ) { @@ -212,15 +154,6 @@ public static int countTrue(boolean... array) { return result; } - public static boolean isAllFalse(boolean... array) { - for ( boolean element : array ) { - if ( element ) { - return false; - } - } - return true; - } - public static boolean isAnyTrue(boolean... values) { for ( boolean value : values ) { if ( value ) { @@ -230,19 +163,6 @@ public static boolean isAnyTrue(boolean... values) { return false; } - public static boolean[] negate(boolean[] valueNullness) { - final var result = new boolean[valueNullness.length]; - for (int i = 0; i < valueNullness.length; i++) { - result[i] = !valueNullness[i]; - } - return result; - } - - - public static void addAll(Collection collection, T[] array) { - collection.addAll( asList( array ) ); - } - public static final String[] EMPTY_STRING_ARRAY = {}; public static final int[] EMPTY_INT_ARRAY = {}; public static final boolean[] EMPTY_BOOLEAN_ARRAY = {}; @@ -251,21 +171,6 @@ public static void addAll(Collection collection, T[] array) { public static final Type[] EMPTY_TYPE_ARRAY = {}; public static final byte[] EMPTY_BYTE_ARRAY = {}; - - /** - * Reverse the elements of the incoming array - * - * @return New array with all elements in reversed order - */ - public static String[] reverse(String[] source) { - final int length = source.length; - final var destination = new String[length]; - for ( int i = 0; i < length; i++ ) { - destination[length - i - 1] = source[i]; - } - return destination; - } - /** * Reverse the first n elements of the incoming array * @@ -306,20 +211,6 @@ public static int[] trim(int[] from, int length) { return trimmed; } - public static Object[] toObjectArray(Object array) { - if ( array instanceof Object[] objects ) { - return objects; - } - else { - final int arrayLength = getLength( array ); - final var result = new Object[arrayLength]; - for ( int i = 0; i < arrayLength; ++i ) { - result[i] = get( array, i ); - } - return result; - } - } - public static List toExpandableList(T[] values) { return values == null ? new ArrayList<>() : asList( values ); } @@ -328,10 +219,6 @@ public static boolean isEmpty(Object[] array) { return array == null || array.length == 0; } - public static int size(T[] array) { - return array == null ? 0 : array.length; - } - public static void forEach(T[] array, Consumer consumer) { if ( array != null ) { //noinspection ForLoopReplaceableByForEach diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/BoundedConcurrentHashMap.java b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/BoundedConcurrentHashMap.java index 7697c16f2e9a..37270496f3eb 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/BoundedConcurrentHashMap.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/BoundedConcurrentHashMap.java @@ -295,13 +295,6 @@ public interface EvictionPolicy { */ void clear(); - /** - * Returns type of eviction algorithm (strategy). - * - * @return type of eviction algorithm - */ - Eviction strategy(); - /** * Returns true if batching threshold has expired, false otherwise. *

    @@ -404,11 +397,6 @@ public void clear() { accessQueueSize.addAndGet(-removed); } - @Override - public Eviction strategy() { - return Eviction.LRU; - } - private boolean isAboveThreshold() { return size() > trimDownSize; } @@ -1019,11 +1007,6 @@ public void clear() { accessQueueSize.addAndGet(-removed); } - @Override - public Eviction strategy() { - return Eviction.LIRS; - } - /** * Returns the entry at the bottom of the stack. */ @@ -1115,13 +1098,6 @@ static final class Segment extends ReentrantLock { */ transient int modCount; - /** - * The table is rehashed when its size exceeds this threshold. - * (The value of this field is always {@code (int)(capacity * - * loadFactor)}.) - */ - transient int threshold; - /** * The per-segment table. */ @@ -1157,7 +1133,6 @@ private static Segment[] newArray(int i) { * Call only while holding lock or in constructor. */ void setTable(HashEntry[] newTable) { - threshold = (int) ( newTable.length * loadFactor ); table = newTable; } @@ -1490,21 +1465,6 @@ public BoundedConcurrentHashMap( } } - /** - * Creates a new, empty map with the specified maximum capacity, load factor, concurrency - * level and LRU eviction policy. - * - * @param capacity is the upper bound capacity for the number of elements in this map - * @param concurrencyLevel the estimated number of concurrently updating threads. The implementation performs - * internal sizing to try to accommodate this many threads. - * - * @throws IllegalArgumentException if the initial capacity is negative or the load factor or concurrencyLevel are - * nonpositive. - */ - public BoundedConcurrentHashMap(int capacity, int concurrencyLevel) { - this( capacity, concurrencyLevel, Eviction.LRU ); - } - /** * @return {@code true} if this map contains no key-value mappings */ @@ -1708,27 +1668,6 @@ public boolean containsValue(Object value) { return found; } - /** - * Legacy method testing if some key maps into the specified value - * in this table. This method is identical in functionality to - * {@link #containsValue}, and exists solely to ensure - * full compatibility with class {@link java.util.Hashtable}, - * which supported this method prior to introduction of the - * Java Collections framework. - * - * @param value a value to search for - * - * @return {@code true} if and only if some key maps to the - * {@code value} argument in this table as - * determined by the {@code equals} method; - * {@code false} otherwise - * - * @throws NullPointerException if the specified value is null - */ - public boolean contains(Object value) { - return containsValue( value ); - } - /** * Maps the specified key to the specified value in this table. * Neither the key nor the value can be null. diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/CollectionHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/CollectionHelper.java index 0fcbcaa361c1..f104e7b05b10 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/CollectionHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/CollectionHelper.java @@ -13,9 +13,7 @@ import java.util.Properties; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import java.util.function.Function; -import static java.util.Arrays.asList; import static java.util.Collections.addAll; import static java.util.Collections.emptyList; import static java.util.Collections.emptyMap; @@ -138,61 +136,6 @@ public static int determineProperSizing(Map original) { return determineProperSizing( original.size() ); } - public static Map makeCopy(Map map) { - final Map copy = mapOfSize( map.size() + 1 ); - copy.putAll( map ); - return copy; - } - - public static HashMap makeCopy( - Map original, - Function keyTransformer, - Function valueTransformer) { - if ( original == null ) { - return null; - } - else { - final HashMap copy = new HashMap<>( determineProperSizing( original ) ); - original.forEach( (key, value) -> copy.put( keyTransformer.apply( key ), - valueTransformer.apply( value ) ) ); - return copy; - } - } - - public static Map makeMap( - Collection collection, - Function keyProducer) { - return makeMap( collection, keyProducer, v -> v ); - } - - public static Map makeMap( - Collection collection, - Function keyProducer, - Function valueProducer) { - if ( isEmpty( collection ) ) { - return emptyMap(); - } - else { - final Map map = new HashMap<>( determineProperSizing( collection.size() ) ); - for ( E element : collection ) { - map.put( keyProducer.apply( element ), valueProducer.apply( element ) ); - } - return map; - } - } - - /** - * Given a set, determine the proper initial size for a new set to hold the same number of values. - * Specifically we want to account for load size and load factor to prevent immediate resizing. - * - * @param original The original set - * - * @return The proper size. - */ - public static int determineProperSizing(Set original) { - return determineProperSizing( original.size() ); - } - /** * Determine the proper initial size for a new collection in order for it to hold the given a number of elements. * Specifically we want to account for load size and load factor to prevent immediate resizing. @@ -237,14 +180,6 @@ public static ArrayList arrayList(int expectedNumberOfElements) { return new ArrayList<>( Math.max( expectedNumberOfElements + 1, DEFAULT_LIST_CAPACITY ) ); } - public static ArrayList populatedArrayList(int expectedNumberOfElements, T value) { - final ArrayList list = new ArrayList<>( Math.max( expectedNumberOfElements + 1, DEFAULT_LIST_CAPACITY ) ); - for ( int i = 0; i < expectedNumberOfElements; i++ ) { - list.add( value ); - } - return list; - } - public static Set makeCopy(Set source) { if ( source == null ) { return null; @@ -300,10 +235,6 @@ public static Set setOf(T... values) { return set; } - public static Set setOf(Collection values) { - return isEmpty( values ) ? emptySet() : new HashSet<>( values ); - } - public static Properties asProperties(Map map) { if ( map instanceof Properties properties ) { return properties; @@ -401,15 +332,6 @@ public static List combineUntyped(List list1, List list2) { return combined; } - @SafeVarargs - public static List combine(List... lists) { - final ArrayList combined = new ArrayList<>(); - for ( List list : lists ) { - combined.addAll( list ); - } - return combined; - } - public static int size(List values) { return values == null ? 0 : values.size(); } @@ -418,37 +340,6 @@ public static int size(Collection values) { return values == null ? 0 : values.size(); } - public static int size(Map values) { - return values == null ? 0 : values.size(); - } - - @SafeVarargs - public static Set toSet(X... values) { - final HashSet result = new HashSet<>(); - if ( isNotEmpty( values ) ) { - result.addAll( asList( values ) ); - } - return result; - } - - public static List mutableJoin(Collection first, Collection second) { - final int totalCount = ( first == null ? 0 : first.size() ) - + ( second == null ? 0 : second.size() ); - if ( totalCount == 0 ) { - return new ArrayList<>(); - } - else { - final ArrayList joined = new ArrayList<>( totalCount ); - if ( first != null ) { - joined.addAll( first ); - } - if ( second != null ) { - joined.addAll( second ); - } - return joined; - } - } - @SafeVarargs public static List mutableJoin(Collection first, Collection... others) { // it can be empty, but not null diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/EmptyReadOnlyMap.java b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/EmptyReadOnlyMap.java deleted file mode 100644 index 862cc8c49190..000000000000 --- a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/EmptyReadOnlyMap.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.hibernate.internal.util.collections; - -final class EmptyReadOnlyMap implements ReadOnlyMap { - - @Override - public V get(K key) { - return null; - } - - @Override - public void dispose() { - //no-op - } - -} diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/IdentityMap.java b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/IdentityMap.java index c1c3c8b26824..ebfcced1b07e 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/IdentityMap.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/IdentityMap.java @@ -20,8 +20,6 @@ public final class IdentityMap implements Map { private final LinkedHashMap,V> map; - private transient Entry[] entryArray = null; - /** * Return a new instance of this class, with iteration * order defined as the order in which entries were added @@ -42,17 +40,6 @@ private IdentityMap(LinkedHashMap,V> underlyingMap) { map = underlyingMap; } - /** - * Return the map entries (as instances of {@code Map.Entry} in a collection that - * is safe from concurrent modification). That is, we may safely add new instances - * to the underlying {@code Map} during iteration of the {@code entries()}. - * - * @param map The map of entries - */ - public static Entry[] concurrentEntries(Map map) { - return ( (IdentityMap) map ).entryArray(); - } - public static void onEachKey(Map map, Consumer consumer) { final IdentityMap identityMap = (IdentityMap) map; identityMap.map.forEach( (kIdentityKey, v) -> consumer.accept( kIdentityKey.key ) ); @@ -99,13 +86,11 @@ public V get(Object key) { @Override public V put(K key, V value) { - this.entryArray = null; return map.put( new IdentityKey<>( key ), value ); } @Override public V remove(Object key) { - this.entryArray = null; return map.remove( new IdentityKey<>( key ) ); } @@ -118,7 +103,6 @@ public void putAll(Map otherMap) { @Override public void clear() { - entryArray = null; map.clear(); } @@ -143,20 +127,6 @@ public Set> entrySet() { return set; } - public Entry[] entryArray() { - if ( entryArray == null ) { - //noinspection unchecked - entryArray = new Entry[ map.size() ]; - final var iterator = map.entrySet().iterator(); - int i = 0; - while ( iterator.hasNext() ) { - final var entry = iterator.next(); - entryArray[i++] = new IdentityMapEntry<>( entry.getKey().key, entry.getValue() ); - } - } - return entryArray; - } - @Override public String toString() { return map.toString(); diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/ReadOnlyMap.java b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/ReadOnlyMap.java deleted file mode 100644 index f30ca30d4a5a..000000000000 --- a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/ReadOnlyMap.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.hibernate.internal.util.collections; - -public interface ReadOnlyMap { - - //To help saving memory - ReadOnlyMap EMPTY = new EmptyReadOnlyMap(); - - /** - * The main operation. - * @param key - * @return the corresponding object, or null if there is no association with any entry. - */ - V get(K key); - - /** - * Some implementations might hold on to references, - * which could be just heavy or potentially harmful, - * such as ClassLoader leaks: allow for proper cleanup. - */ - void dispose(); - -} diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/config/ConfigurationHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/util/config/ConfigurationHelper.java index a1bc1823c22c..a5fbdddea7f3 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/util/config/ConfigurationHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/util/config/ConfigurationHelper.java @@ -22,7 +22,6 @@ import static org.hibernate.cfg.MappingSettings.PREFERRED_UUID_JDBC_TYPE; import static org.hibernate.internal.log.IncubationLogger.INCUBATION_LOGGER; import static org.hibernate.internal.util.StringHelper.isBlank; -import static org.hibernate.internal.util.StringHelper.isNotEmpty; /** * Collection of helper methods for dealing with configuration settings. @@ -241,22 +240,6 @@ else if (value instanceof String string) { } } - /** - * Replace a property value with a starred version - * - * @param properties properties to check - * @param key property to mask - * - * @return cloned and masked properties - */ - public static Properties maskOut(Properties properties, String key) { - final var clone = (Properties) properties.clone(); - if ( clone.get( key ) != null ) { - clone.setProperty( key, "****" ); - } - return clone; - } - /** * Replace property values with starred versions * @@ -298,21 +281,6 @@ public static Map maskOut(Map properties, String } return result; } - - /** - * Extract a property value by name from the given properties object. - *

    - * Both {@code null} and {@code empty string} are viewed as the same, and return null. - * - * @param propertyName The name of the property for which to extract value - * @param properties The properties object - * @return The property value; may be null. - */ - public static String extractPropertyValue(String propertyName, Properties properties) { - final String value = properties.getProperty( propertyName ); - return isBlank( value ) ? null : value.trim(); - - } /** * Extract a property value by name from the given properties object. *

    @@ -468,12 +436,6 @@ public static synchronized int getPreferredSqlTypeCodeForArray(ServiceRegistry s .getDialect().getPreferredSqlTypeCodeForArray(); } - public static void setIfNotEmpty(String value, String settingName, Map configuration) { - if ( isNotEmpty( value ) ) { - configuration.put( settingName, value ); - } - } - private static class TypeCodeConverter implements ConfigurationService.Converter { public static final TypeCodeConverter INSTANCE = new TypeCodeConverter(); diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/xml/XsdException.java b/hibernate-core/src/main/java/org/hibernate/internal/util/xml/XsdException.java index 35ada5789c18..20d3b3550f63 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/util/xml/XsdException.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/util/xml/XsdException.java @@ -8,19 +8,11 @@ * @author Steve Ebersole */ public class XsdException extends HibernateException { - private final String xsdName; - - public XsdException(String message, String xsdName) { + public XsdException(String message) { super( message ); - this.xsdName = xsdName; } - public XsdException(String message, Throwable root, String xsdName) { + public XsdException(String message, Throwable root) { super( message, root ); - this.xsdName = xsdName; - } - - public String getXsdName() { - return xsdName; } } diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/Helper.java b/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/Helper.java deleted file mode 100644 index 789aff0aff19..000000000000 --- a/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/Helper.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.hibernate.jpa.boot.internal; - -import jakarta.persistence.PersistenceException; - -import org.hibernate.jpa.boot.spi.PersistenceUnitDescriptor; - -/** - * @author Steve Ebersole - */ -public class Helper { - - public static PersistenceException persistenceException( - PersistenceUnitDescriptor persistenceUnit, - String message) { - return persistenceException( persistenceUnit, message, null ); - } - - public static PersistenceException persistenceException( - PersistenceUnitDescriptor persistenceUnit, - String message, - Exception cause) { - return new PersistenceException( - getExceptionHeader( persistenceUnit ) + message, - cause - ); - } - - private static String getExceptionHeader(PersistenceUnitDescriptor persistenceUnit) { - return "[PersistenceUnit: " + persistenceUnit.getName() + "] "; - } -} diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/ParsedPersistenceXmlDescriptor.java b/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/ParsedPersistenceXmlDescriptor.java index 86807c772347..65f73dd41545 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/ParsedPersistenceXmlDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/ParsedPersistenceXmlDescriptor.java @@ -17,7 +17,6 @@ import java.net.URL; import java.net.URLClassLoader; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.Properties; @@ -147,10 +146,6 @@ public void setValidationMode(ValidationMode validationMode) { this.validationMode = validationMode; } - public void setValidationMode(String validationMode) { - setValidationMode( ValidationMode.valueOf( validationMode ) ); - } - @Override public SharedCacheMode getSharedCacheMode() { return sharedCacheMode; @@ -160,10 +155,6 @@ public void setSharedCacheMode(SharedCacheMode sharedCacheMode) { this.sharedCacheMode = sharedCacheMode; } - public void setSharedCacheMode(String sharedCacheMode) { - setSharedCacheMode( SharedCacheMode.valueOf( sharedCacheMode ) ); - } - @Override public List getManagedClassNames() { return classes; @@ -174,10 +165,6 @@ public List getAllClassNames() { return classes; } - public void addClasses(String... classes) { - addClasses( Arrays.asList( classes ) ); - } - public void addClasses(List classes) { this.classes.addAll( classes ); } @@ -205,10 +192,6 @@ public List getMappingFileNames() { return mappingFiles; } - public void addMappingFiles(String... mappingFiles) { - addMappingFiles( Arrays.asList( mappingFiles ) ); - } - public void addMappingFiles(List mappingFiles) { this.mappingFiles.addAll( mappingFiles ); } diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/internal/enhance/ClientClassTransformer.java b/hibernate-core/src/main/java/org/hibernate/jpa/internal/enhance/ClientClassTransformer.java index c7ac8e79614f..46508c249893 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/internal/enhance/ClientClassTransformer.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/internal/enhance/ClientClassTransformer.java @@ -1,7 +1,6 @@ package org.hibernate.jpa.internal.enhance; import java.security.ProtectionDomain; -import org.hibernate.bytecode.enhance.spi.EnhancementModel; import org.hibernate.bytecode.enhance.spi.EnhancementOptions; import org.hibernate.bytecode.spi.BytecodeProvider; @@ -21,11 +20,6 @@ public final class ClientClassTransformer implements ClassTransformer { private final Object transformerToken = new Object(); private final EnhancementOptions options = EnhancementOptions.of(false, false, false); - public ClientClassTransformer(EnhancementModel model, BytecodeProvider provider, ClassLoader temporaryLoader) { - this(new PersistenceUnitEnhancementState(model), provider); - state.discoverTemporaryTypes(temporaryLoader, this.provider); - } - public ClientClassTransformer(PersistenceUnitEnhancementState state, BytecodeProvider provider) { this.state = state; this.provider = state.resolveProvider(provider); diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/CacheModeHelper.java b/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/CacheModeHelper.java index 6c233a2e9ee9..59717bd8cbff 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/CacheModeHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/CacheModeHelper.java @@ -46,20 +46,6 @@ public static CacheMode interpretCacheMode(CacheStoreMode storeMode, CacheRetrie }; } - /** - * Given a JPA {@link CacheStoreMode} and {@link CacheRetrieveMode}, determine the corresponding - * legacy Hibernate {@link CacheMode}. - * - * @param storeMode The JPA shared-cache store mode. - * @param retrieveMode The JPA shared-cache retrieve mode. - * - * @return Corresponding {@link CacheMode}, or null if both arguments are null. - */ - public static CacheMode effectiveCacheMode(CacheStoreMode storeMode, CacheRetrieveMode retrieveMode) { - return storeMode == null && retrieveMode == null ? null - : interpretCacheMode( storeMode, retrieveMode ); - } - public static CacheStoreMode interpretCacheStoreMode(CacheMode cacheMode) { if ( cacheMode == null ) { cacheMode = DEFAULT_LEGACY_MODE; diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/ConfigurationHelper.java b/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/ConfigurationHelper.java index 7948f386160a..638e4124188b 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/ConfigurationHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/ConfigurationHelper.java @@ -8,7 +8,6 @@ import org.hibernate.CacheMode; import org.hibernate.FlushMode; -import jakarta.persistence.QueryFlushMode; /** * @author Emmanuel Bernard @@ -25,24 +24,6 @@ public static void overrideProperties(Properties properties, Map overrides) } } - public static QueryFlushMode resolveQueryFlushModeHint(Object value) { - if ( value == null ) { - return QueryFlushMode.DEFAULT; - } - if ( value instanceof QueryFlushMode ref ) { - return ref; - } - else if ( value instanceof FlushModeType jpaMode ) { - return FlushModeTypeHelper.queryFlushModeFromFlushModeType( jpaMode ); - } - else if ( value instanceof FlushMode hibernateMode ) { - return FlushModeTypeHelper.queryFlushModeFromFlushMode( hibernateMode ); - } - else { - return FlushModeTypeHelper.interpretQueryFlushMode( value.toString() ); - } - } - public static FlushMode getFlushMode(Object value, FlushMode defaultFlushMode) { if ( value instanceof FlushMode mode ) { return mode; diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/FlushModeTypeHelper.java b/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/FlushModeTypeHelper.java index 75de4a34fc16..ab14a3c413e0 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/FlushModeTypeHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/FlushModeTypeHelper.java @@ -39,19 +39,6 @@ public static FlushModeType getFlushModeType(FlushMode flushMode) { }; } - public static QueryFlushMode getQueryFlushMode(FlushMode flushMode) { - if ( flushMode == null ) { - return QueryFlushMode.DEFAULT; - } - return switch (flushMode) { - case ALWAYS -> QueryFlushMode.FLUSH; - case COMMIT, MANUAL -> QueryFlushMode.NO_FLUSH; - case AUTO -> - // this is not precisely correctly correct, but good enough - QueryFlushMode.DEFAULT; - }; - } - public static FlushMode getFlushMode(FlushModeType flushModeType) { if ( flushModeType == null ) { return null; @@ -63,50 +50,6 @@ public static FlushMode getFlushMode(FlushModeType flushModeType) { }; } - public static FlushMode getFlushMode(QueryFlushMode queryFlushMode) { - if ( queryFlushMode == null ) { - return null; - } - return switch (queryFlushMode) { - case FLUSH -> FlushMode.ALWAYS; - case NO_FLUSH -> FlushMode.MANUAL; - default -> null; - }; - } - - public static FlushMode interpretFlushMode(QueryFlushMode queryFlushMode) { - if ( queryFlushMode == QueryFlushMode.DEFAULT ) { - return null; - } - else if ( queryFlushMode == QueryFlushMode.NO_FLUSH ) { - return FlushMode.MANUAL; - } - else { - return FlushMode.AUTO; - } - } - - public static FlushMode interpretFlushMode(Object value) { - if ( value == null ) { - return FlushMode.AUTO; - } - if ( value instanceof FlushMode flushMode ) { - return flushMode; - } - if ( value instanceof QueryFlushMode queryFlushMode ) { - return interpretFlushMode( queryFlushMode ); - } - else if ( value instanceof FlushModeType flushModeType ) { - return getFlushMode( flushModeType ); - } - else if ( value instanceof String string ) { - return interpretExternalSetting( string ); - } - else { - throw new IllegalArgumentException( "Unknown FlushMode source : " + value ); - } - } - public static QueryFlushMode queryFlushModeFromHint(Object value) { if ( value == null ) { return QueryFlushMode.DEFAULT; diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/LockModeTypeHelper.java b/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/LockModeTypeHelper.java index de6d7ee06095..6e40bc7cc069 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/LockModeTypeHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/LockModeTypeHelper.java @@ -22,22 +22,4 @@ public static LockMode getLockMode(LockModeType lockModeType) { return LockModeConverter.convertToLockMode( lockModeType ); } - public static LockMode interpretLockMode(Object value) { - if ( value == null ) { - return LockMode.NONE; - } - else if ( value instanceof LockMode lockMode ) { - return lockMode; - } - else if ( value instanceof LockModeType lockModeType ) { - return getLockMode( lockModeType ); - } - else if ( value instanceof String string ) { - return LockMode.fromExternalForm( string ); - } - else { - throw new IllegalArgumentException( "Could not interpret '" + value.getClass().getName() + "' as a LockMode" ); - } - } - } diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/AbstractCollectionBatchLoader.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/AbstractCollectionBatchLoader.java index 390ba8be7d34..8307106537b3 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/AbstractCollectionBatchLoader.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/AbstractCollectionBatchLoader.java @@ -69,10 +69,6 @@ public SessionFactoryImplementor getSessionFactory() { return sessionFactory; } - public int getKeyJdbcCount() { - return keyJdbcCount; - } - abstract void initializeKeys(@Nonnull Object key, @Nonnull Object[] keysToInitialize, @Nonnull SharedSessionContractImplementor session); @Nonnull diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionBatchLoaderInPredicate.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionBatchLoaderInPredicate.java index 7b01c7a9059e..5cfac691f46a 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionBatchLoaderInPredicate.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionBatchLoaderInPredicate.java @@ -106,7 +106,6 @@ void initializeKeys(@Nonnull Object key, @Nonnull Object[] keysToInitialize, @No keyColumnCount, getLoadable().getKeyDescriptor(), jdbcParameters, - sqlAst, jdbcSelect ); diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionElementLoaderByIndex.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionElementLoaderByIndex.java index 37cfb0d77cb9..e1c4aee84770 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionElementLoaderByIndex.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionElementLoaderByIndex.java @@ -106,16 +106,6 @@ public PluralAttributeMapping getAttributeMapping() { return attributeMapping; } - @Nonnull - public SelectStatement getSqlAst() { - return sqlAst; - } - - @Nonnull - public JdbcParametersList getJdbcParameters() { - return jdbcParameters; - } - @Nullable public Object load(@Nonnull Object key, @Nonnull Object index, @Nonnull SharedSessionContractImplementor session) { diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionLoaderSingleKey.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionLoaderSingleKey.java index f674f133a487..56c6152436fb 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionLoaderSingleKey.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionLoaderSingleKey.java @@ -96,11 +96,6 @@ public SelectStatement getSqlAst() { return sqlAst; } - @Nonnull - public JdbcParametersList getJdbcParameters() { - return jdbcParameters; - } - @Nonnull @Override public PersistentCollection load(@Nonnull Object key, @Nonnull SharedSessionContractImplementor session) { diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/EntityBatchLoaderInPredicate.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/EntityBatchLoaderInPredicate.java index d82f78d99fdc..a7b12c08490a 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/EntityBatchLoaderInPredicate.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/EntityBatchLoaderInPredicate.java @@ -27,10 +27,10 @@ /** * An {@link EntityBatchLoader} using one or more SQL queries, which each initialize up - * to {@linkplain #getSqlBatchSize()} entities using a SQL IN predicate restriction - + * to {@code getSqlBatchSize()} entities using a SQL IN predicate restriction - * e.g., {@code ... where id in (?,?,...)}. *

    - * The number of parameters rendered into the SQL is controlled by {@linkplain #getSqlBatchSize()}. + * The number of parameters rendered into the SQL is controlled by {@code getSqlBatchSize()}. * Any unused parameter slots for a particular execution are set to {@code null}. * * @author Steve Ebersole @@ -99,10 +99,6 @@ public int getDomainBatchSize() { return domainBatchSize; } - public int getSqlBatchSize() { - return sqlBatchSize; - } - @Nullable @Override public final T load(@Nonnull Object pkValue, @Nonnull LockOptions lockOptions, @Nullable Boolean readOnly, @Nonnull SharedSessionContractImplementor session) { @@ -179,7 +175,6 @@ private MultiKeyLoadChunker getChunker(@Nonnull EntityIdentifierMapping identifierMapping.getJdbcTypeCount(), identifierMapping, jdbcParameters, - sqlAst, jdbcSelectOperation ); } diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/ExecutionContextWithSubselectFetchHandler.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/ExecutionContextWithSubselectFetchHandler.java index 3695e27397fa..305b15efddee 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/ExecutionContextWithSubselectFetchHandler.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/ExecutionContextWithSubselectFetchHandler.java @@ -16,7 +16,6 @@ class ExecutionContextWithSubselectFetchHandler extends BaseExecutionContext { @Nullable private final SubselectFetch.RegistrationHandler subSelectFetchableKeysHandler; - private final boolean readOnly; private final QueryOptions queryOptions; public ExecutionContextWithSubselectFetchHandler( @@ -24,7 +23,6 @@ public ExecutionContextWithSubselectFetchHandler( @Nullable SubselectFetch.RegistrationHandler subSelectFetchableKeysHandler) { super( session ); this.subSelectFetchableKeysHandler = subSelectFetchableKeysHandler; - this.readOnly = false; this.queryOptions = QueryOptions.NONE; } @@ -35,7 +33,6 @@ public ExecutionContextWithSubselectFetchHandler( @Nonnull LockOptions lockOptions) { super( session ); this.subSelectFetchableKeysHandler = subSelectFetchableKeysHandler; - this.readOnly = readOnly; this.queryOptions = determineQueryOptions( readOnly, lockOptions ); } diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/LoadPlan.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/LoadPlan.java deleted file mode 100644 index 1556c72eeb6a..000000000000 --- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/LoadPlan.java +++ /dev/null @@ -1,32 +0,0 @@ -package org.hibernate.loader.ast.internal; - -import jakarta.annotation.Nonnull; - -import org.hibernate.loader.ast.spi.Loadable; -import org.hibernate.metamodel.mapping.ModelPart; -import org.hibernate.sql.exec.spi.JdbcSelect; - -/** - * Common contract for SQL AST based loading - * - * @author Steve Ebersole - */ -public interface LoadPlan { - /** - * The thing being loaded - */ - @Nonnull - Loadable getLoadable(); - - /** - * The part of the thing being loaded used to restrict which loadables get loaded - */ - @Nonnull - ModelPart getRestrictivePart(); - - /** - * The JdbcSelect for the load - */ - @Nonnull - JdbcSelect getJdbcSelect(); -} diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/LoaderHelper.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/LoaderHelper.java index 7f612f74d8e7..6218e47d8840 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/LoaderHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/LoaderHelper.java @@ -9,7 +9,6 @@ import org.hibernate.ObjectDeletedException; import org.hibernate.engine.internal.CacheHelper.CacheLock; import org.hibernate.engine.spi.EntityEntry; -import org.hibernate.engine.spi.LoadQueryInfluencers; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.engine.spi.SubselectFetch; @@ -161,22 +160,6 @@ private static void acquireLock( } } - /** - * Determine if the influencers associated with the given Session indicate read-only - */ - @Nullable - public static Boolean getReadOnlyFromLoadQueryInfluencers(@Nonnull SharedSessionContractImplementor session) { - return getReadOnlyFromLoadQueryInfluencers( session.getLoadQueryInfluencers() ); - } - - /** - * Determine if given influencers indicate read-only - */ - @Nullable - public static Boolean getReadOnlyFromLoadQueryInfluencers(@Nullable LoadQueryInfluencers influencers) { - return influencers == null ? null : influencers.getReadOnly(); - } - /** * Normalize an array of keys (primary, foreign or natural). *

    diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/LoaderSelectBuilder.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/LoaderSelectBuilder.java index 45335f550d52..c2925c670fe9 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/LoaderSelectBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/LoaderSelectBuilder.java @@ -683,11 +683,6 @@ private LoaderSqlAstCreationState createSqlAstCreationState(@Nonnull QuerySpec r ); } - @Nonnull - private SqlAliasBaseGenerator getSqlAliasBaseGenerator() { - return sqlAliasBasGenerator; - } - private void applyRestriction( @Nonnull QuerySpec rootQuerySpec, @Nonnull NavigablePath rootNavigablePath, diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiKeyLoadChunker.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiKeyLoadChunker.java index e47c45e69a8d..627a3dc6c203 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiKeyLoadChunker.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiKeyLoadChunker.java @@ -7,7 +7,6 @@ import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.metamodel.mapping.Bindable; -import org.hibernate.sql.ast.spi.query.select.SelectStatement; import org.hibernate.sql.exec.internal.JdbcParameterBindingsImpl; import org.hibernate.sql.exec.spi.ExecutionContext; import org.hibernate.sql.exec.spi.JdbcParameterBindings; @@ -52,7 +51,6 @@ interface ChunkBoundaryListener { private final Bindable bindable; private final JdbcParametersList jdbcParameters; - private final SelectStatement sqlAst; private final JdbcSelect jdbcSelect; public MultiKeyLoadChunker( @@ -60,13 +58,11 @@ public MultiKeyLoadChunker( int keyColumnCount, @Nonnull Bindable bindable, @Nonnull JdbcParametersList jdbcParameters, - @Nonnull SelectStatement sqlAst, @Nonnull JdbcSelect jdbcSelect) { this.chunkSize = chunkSize; this.keyColumnCount = keyColumnCount; this.bindable = bindable; this.jdbcParameters = jdbcParameters; - this.sqlAst = sqlAst; this.jdbcSelect = jdbcSelect; } diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleEntityLoadPlan.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleEntityLoadPlan.java deleted file mode 100644 index 1fc3018e88de..000000000000 --- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleEntityLoadPlan.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.hibernate.loader.ast.internal; - -/** - * Defines a plan for loading a single entity - by id, by uk, etc - * - * @author Steve Ebersole - */ -public interface SingleEntityLoadPlan extends LoadPlan { -} diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleIdLoadPlan.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleIdLoadPlan.java index 76cffd344427..46b1ffeec48b 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleIdLoadPlan.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleIdLoadPlan.java @@ -36,7 +36,7 @@ */ // todo (6.0) : this can generically define a load-by-uk as well. // only the SQL AST and `restrictivePart` vary and they are passed as constructor args -public class SingleIdLoadPlan implements SingleEntityLoadPlan { +public class SingleIdLoadPlan { private final EntityMappingType entityMappingType; private final ModelPart restrictivePart; private final LockOptions lockOptions; @@ -81,19 +81,16 @@ protected JdbcParametersList getJdbcParameters() { } @Nonnull - @Override public Loadable getLoadable() { return entityMappingType; } @Nonnull - @Override public ModelPart getRestrictivePart() { return restrictivePart; } @Nonnull - @Override public JdbcSelect getJdbcSelect() { return jdbcSelect; } @@ -108,11 +105,6 @@ public T load(@Nonnull Object restrictedValue, @Nonnull SharedSessionContractImp return load( restrictedValue, null, null, false, session ); } - @Nullable - public T load(@Nonnull Object restrictedValue, @Nullable Boolean readOnly, @Nonnull SharedSessionContractImplementor session) { - return load( restrictedValue, null, readOnly, false, session ); - } - @Nullable public T load( @Nonnull Object restrictedValue, diff --git a/hibernate-core/src/main/java/org/hibernate/loader/internal/BaseNaturalIdLoadAccessImpl.java b/hibernate-core/src/main/java/org/hibernate/loader/internal/BaseNaturalIdLoadAccessImpl.java index 43fa20545152..698bb3cbc350 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/internal/BaseNaturalIdLoadAccessImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/internal/BaseNaturalIdLoadAccessImpl.java @@ -242,16 +242,6 @@ protected final IdentifierLoadAccess identifierLoadAccess() { return loadAccess; } - @Nonnull - protected StatefulLoadAccessContext getContext() { - return context; - } - - @Nonnull - public EntityMappingType getEntityDescriptor() { - return entityDescriptor; - } - @Nonnull protected EntityPersister entityPersister() { return entityDescriptor.getEntityPersister(); diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Property.java b/hibernate-core/src/main/java/org/hibernate/mapping/Property.java index e0a5ccb30631..4c1ca147b1d6 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/Property.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/Property.java @@ -12,7 +12,6 @@ import org.hibernate.cascade.spi.CascadeStyles; import org.hibernate.generator.Generator; import org.hibernate.generator.GeneratorCreationContext; -import org.hibernate.jpa.boot.spi.CallbackDefinition; import org.hibernate.metamodel.RepresentationMode; import org.hibernate.metamodel.spi.RuntimeModelCreationContext; import org.hibernate.models.spi.MemberDetails; @@ -73,7 +72,6 @@ public class Property implements Serializable, MetaAttributable { private boolean isGeneric; private boolean isGenericSpecialization; private boolean lob; - private java.util.List callbackDefinitions; private String returnedClassName; public boolean isBackRef() { diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AbstractDynamicMapInstantiator.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AbstractDynamicMapInstantiator.java index 6bc40daa137a..76e305cb97c1 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AbstractDynamicMapInstantiator.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AbstractDynamicMapInstantiator.java @@ -33,10 +33,6 @@ public boolean isInstance(Object object) { && roleName.equals( map.get( TYPE_KEY ) ); } - protected boolean isSameRole(String type) { - return roleName.equals( type ); - } - @Override public boolean isSameClass(Object object) { return isInstance( object ); diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AttributeFactory.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AttributeFactory.java index 45b5cf6c124d..c8fe5bcb7c4b 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AttributeFactory.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AttributeFactory.java @@ -282,7 +282,6 @@ private static EmbeddableTypeImpl embeddableType( context.getJavaTypeRegistry().resolveManagedTypeDescriptor( subclass ), castSuperType, discriminatorType, - false, context.getJpaMetamodel() ); } @@ -292,7 +291,6 @@ private static EmbeddableTypeImpl dynamicEmbeddableType(MetadataContext conte context.getJavaTypeRegistry().resolveDescriptor( java.util.Map.class ), null, null, - true, context.getJpaMetamodel() ); diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AttributeMetadata.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AttributeMetadata.java index 122d24980973..127e725acdef 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AttributeMetadata.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AttributeMetadata.java @@ -52,11 +52,4 @@ public interface AttributeMetadata { * @return The Hibernate property mapping */ Property getPropertyMapping(); - - /** - * Is the attribute plural (a collection)? - * - * @return True if it is plural, false otherwise. - */ - boolean isPlural(); } diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/BaseAttributeMetadata.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/BaseAttributeMetadata.java index 5af7fd428f53..e77de9157307 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/BaseAttributeMetadata.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/BaseAttributeMetadata.java @@ -8,7 +8,6 @@ import org.hibernate.metamodel.AttributeClassification; import org.hibernate.metamodel.model.domain.ManagedDomainType; import org.hibernate.metamodel.model.domain.internal.MapMember; -import org.hibernate.type.CollectionType; /** * @author Steve Ebersole @@ -81,10 +80,6 @@ public ManagedDomainType getOwnerType() { return ownerType; } - public boolean isPlural() { - return propertyMapping.getType() instanceof CollectionType; - } - public Property getPropertyMapping() { return propertyMapping; } diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EntityInstantiatorDynamicMap.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EntityInstantiatorDynamicMap.java index 4380304b5a91..343b5c4944c8 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EntityInstantiatorDynamicMap.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EntityInstantiatorDynamicMap.java @@ -34,15 +34,6 @@ public Object instantiate() { return generateDataMap(); } - @Override - protected boolean isSameRole(String type) { - return super.isSameRole( type ) || isPartOfHierarchy( type ); - } - - private boolean isPartOfHierarchy(String type) { - return entityRoleNames.contains( type ); - } - public static final EntityNameResolver ENTITY_NAME_RESOLVER = entity -> entity instanceof Map map ? extractEmbeddedEntityName( map ) : null; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/MetadataContext.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/MetadataContext.java index 6b5b24bc822f..ec2cad29e577 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/MetadataContext.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/MetadataContext.java @@ -597,7 +597,6 @@ private EmbeddableTypeImpl embeddableType(Component idClassComponent, Cla getJavaTypeRegistry().resolveManagedTypeDescriptor( componentClass ), getMappedSuperclassDomainType( idClassComponent, componentClass ), null, - false, getJpaMetamodel() ); } diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractEntityCollectionPart.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractEntityCollectionPart.java index c64a86a82f3d..7c3f21ce5683 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractEntityCollectionPart.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractEntityCollectionPart.java @@ -33,7 +33,6 @@ import org.hibernate.sql.results.graph.DomainResultCreationState; import org.hibernate.sql.results.graph.FetchOptions; import org.hibernate.sql.results.graph.FetchParent; -import org.hibernate.sql.results.graph.collection.internal.EagerCollectionFetch; import org.hibernate.sql.results.graph.entity.EntityFetch; import org.hibernate.sql.results.graph.entity.internal.EntityFetchJoinedImpl; import org.hibernate.type.ComponentType; @@ -80,18 +79,6 @@ public AbstractEntityCollectionPart( ); } - /** - * For Hibernate Reactive - */ - protected AbstractEntityCollectionPart(AbstractEntityCollectionPart original) { - this.navigableRole = original.navigableRole; - this.nature = original.nature; - this.collectionDescriptor = original.collectionDescriptor; - this.associatedEntityTypeDescriptor = original.associatedEntityTypeDescriptor; - this.notFoundAction = original.notFoundAction; - this.targetKeyPropertyNames = original.targetKeyPropertyNames; - } - @Override public String toString() { return "EntityCollectionPart(" + navigableRole.getFullPath() + ")@" + System.identityHashCode( this ); @@ -235,25 +222,6 @@ public EntityFetch generateFetch( return fetch; } - /** - * For Hibernate Reactive - */ - protected EagerCollectionFetch buildEagerCollectionFetch( - NavigablePath fetchedPath, - PluralAttributeMapping fetchedAttribute, - TableGroup collectionTableGroup, - FetchParent fetchParent, - DomainResultCreationState creationState) { - return new EagerCollectionFetch( - fetchedPath, - fetchedAttribute, - collectionTableGroup, - true, - fetchParent, - creationState - ); - } - /** * For Hibernate Reactive */ diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AnyKeyPart.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AnyKeyPart.java index 0e6c8618b8f1..1ced287800a3 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AnyKeyPart.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AnyKeyPart.java @@ -53,42 +53,6 @@ public class AnyKeyPart implements BasicValuedModelPart, FetchOptions { private final boolean partitioned; private final JdbcMapping jdbcMapping; - public AnyKeyPart( - NavigableRole navigableRole, - DiscriminatedAssociationModelPart anyPart, - String table, - String column, - SelectablePath selectablePath, - String customReadExpression, - String customWriteExpression, - Long length, - Integer precision, - Integer scale, - boolean nullable, - boolean insertable, - boolean updateable, - boolean partitioned, - JdbcMapping jdbcMapping) { - this( - navigableRole, - anyPart, - table, - column, - selectablePath, - customReadExpression, - customWriteExpression, - length, - null, - precision, - scale, - nullable, - insertable, - updateable, - partitioned, - jdbcMapping - ); - } - public AnyKeyPart( NavigableRole navigableRole, DiscriminatedAssociationModelPart anyPart, diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/BasicAttributeMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/BasicAttributeMapping.java index a9821fb432c4..6c1840780f59 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/BasicAttributeMapping.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/BasicAttributeMapping.java @@ -245,10 +245,6 @@ public boolean isNullable() { return nullable; } - public boolean isLazy() { - return isLazy; - } - @Override public boolean isInsertable() { return insertable; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/CaseStatementDiscriminatorMappingImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/CaseStatementDiscriminatorMappingImpl.java index a5a0c1c62506..e3eb916ae9a7 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/CaseStatementDiscriminatorMappingImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/CaseStatementDiscriminatorMappingImpl.java @@ -2,9 +2,7 @@ import jakarta.annotation.Nonnull; -import java.util.ArrayList; import java.util.LinkedHashMap; -import java.util.List; import jakarta.annotation.Nullable; import org.hibernate.engine.FetchTiming; @@ -26,7 +24,6 @@ import org.hibernate.sql.ast.spi.query.expression.SelfRenderingExpression; import org.hibernate.sql.ast.spi.query.from.LazyTableGroup; import org.hibernate.sql.ast.spi.query.from.TableGroup; -import org.hibernate.sql.ast.spi.query.from.TableReference; import org.hibernate.sql.ast.spi.query.predicate.NullnessPredicate; import org.hibernate.sql.results.graph.DomainResult; import org.hibernate.sql.results.graph.DomainResultCreationState; @@ -262,28 +259,6 @@ public CaseStatementDiscriminatorExpression(TableGroup entityTableGroup) { this.entityTableGroup = entityTableGroup; } - public List getUsedTableReferences() { - final ArrayList usedTableReferences = - new ArrayList<>( tableDiscriminatorDetailsMap.size() ); - tableDiscriminatorDetailsMap.forEach( - (tableName, tableDiscriminatorDetails) -> { - // Ensure, we're not accidentally initializing a table group racy (concurrency) fashion - assert !(entityTableGroup instanceof LazyTableGroup lazyTableGroup) - || lazyTableGroup.isInitialized(); - final var tableReference = entityTableGroup.getTableReference( - entityTableGroup.getNavigablePath(), - tableName, - false - ); - - if ( tableReference != null ) { - usedTableReferences.add( tableReference ); - } - } - ); - return usedTableReferences; - } - @Override public void renderToSql( SqlAppender sqlAppender, diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/CollectionIdentifierDescriptorImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/CollectionIdentifierDescriptorImpl.java index dd0621ed3dc2..4c2ba04bf053 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/CollectionIdentifierDescriptorImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/CollectionIdentifierDescriptorImpl.java @@ -26,7 +26,6 @@ import org.hibernate.sql.results.graph.FetchOptions; import org.hibernate.sql.results.graph.FetchParent; import org.hibernate.sql.results.graph.basic.BasicFetch; -import org.hibernate.sql.results.graph.basic.BasicResult; import org.hibernate.type.BasicType; import org.hibernate.type.descriptor.java.JavaType; @@ -284,34 +283,6 @@ public Fetch generateFetch( ); } - public DomainResult createDomainResult( - NavigablePath collectionPath, - TableGroup tableGroup, - DomainResultCreationState creationState) { - final var astCreationState = creationState.getSqlAstCreationState(); - final var sqlExpressionResolver = astCreationState.getSqlExpressionResolver(); - - final var sqlSelection = sqlExpressionResolver.resolveSqlSelection( - sqlExpressionResolver.resolveSqlExpression( - tableGroup.getPrimaryTableReference(), - this - ), - type.getJdbcJavaType(), - null, - astCreationState.getCreationContext() - .getTypeConfiguration() - ); - - return new BasicResult<>( - sqlSelection.getValuesArrayPosition(), - null, - type, - collectionPath, - false, - !sqlSelection.isVirtual() - ); - } - @Override public String toString() { return getClass().getSimpleName() + "(" + collectionDescriptor.getRole() + ")"; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatedAssociationMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatedAssociationMapping.java index d16f554e1abc..c34d67edc32f 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatedAssociationMapping.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatedAssociationMapping.java @@ -337,10 +337,6 @@ private void ensureMapped(EntityMappingType treatTarget) { } } - public MappingType getPartMappingType() { - return this; - } - public JavaType getJavaType() { return baseAssociationJtd; } diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ExplicitColumnDiscriminatorMappingImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ExplicitColumnDiscriminatorMappingImpl.java index 63685a58842d..bd05ca3815ef 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ExplicitColumnDiscriminatorMappingImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ExplicitColumnDiscriminatorMappingImpl.java @@ -36,35 +36,6 @@ public class ExplicitColumnDiscriminatorMappingImpl extends AbstractDiscriminato private final @Nullable Integer precision; private final @Nullable Integer scale; - public ExplicitColumnDiscriminatorMappingImpl( - ManagedMappingType mappingType, - String name, - String tableExpression, - String columnExpression, - boolean isFormula, - boolean isPhysical, - boolean isUpdateable, - String customReadExpression, - Long length, - Integer precision, - Integer scale, - DiscriminatorType discriminatorType) { - this( - mappingType, - name, - tableExpression, - columnExpression, - isFormula, - isPhysical, - isUpdateable, - customReadExpression, - length, - null, - precision, - scale, - discriminatorType ); - } - public ExplicitColumnDiscriminatorMappingImpl( ManagedMappingType mappingType, String name, diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/MappingModelCreationProcess.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/MappingModelCreationProcess.java index 892f36629a47..4626c53b1d8b 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/MappingModelCreationProcess.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/MappingModelCreationProcess.java @@ -13,7 +13,6 @@ import org.hibernate.metamodel.spi.RuntimeModelCreationContext; import org.hibernate.persister.collection.CollectionPersister; import org.hibernate.persister.entity.EntityPersister; -import org.hibernate.query.sqm.function.SqmFunctionRegistry; import static org.hibernate.metamodel.mapping.internal.MappingModelCreationLogging.MAPPING_MODEL_CREATION_MESSAGE_LOGGER; @@ -62,10 +61,6 @@ public EntityPersister getEntityPersister(String name) { return entityPersisterMap.get( name ); } - public SqmFunctionRegistry getSqmFunctionRegistry() { - return creationContext.getFunctionRegistry(); - } - /** * Instance-level trigger for {@link #process} */ diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/OneToManyCollectionPart.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/OneToManyCollectionPart.java index 97c4918607b7..3f5d2c0798e2 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/OneToManyCollectionPart.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/OneToManyCollectionPart.java @@ -73,15 +73,6 @@ public OneToManyCollectionPart( : null; } - /** - * For Hibernate Reactive - */ - protected OneToManyCollectionPart(OneToManyCollectionPart original) { - super( original ); - this.mapKeyPropertyName = original.mapKeyPropertyName; - this.fetchAssociationKey = original.fetchAssociationKey; - } - @Override public Cardinality getCardinality() { return Cardinality.ONE_TO_MANY; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/PluralAttributeMappingImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/PluralAttributeMappingImpl.java index de3ff72acf8d..06218cc792d0 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/PluralAttributeMappingImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/PluralAttributeMappingImpl.java @@ -693,25 +693,6 @@ public Fetch generateFetch( } } - /** - * For Hibernate Reactive - */ - protected Fetch buildDelayedCollectionFetch( - NavigablePath fetchedPath, - PluralAttributeMapping fetchedAttribute, - FetchParent fetchParent, - DomainResult collectionKeyResult, - boolean unfetched) { - return buildDelayedCollectionFetch( - fetchedPath, - fetchedAttribute, - fetchParent, - collectionKeyResult, - unfetched, - org.hibernate.engine.spi.FetchOptions.NONE - ); - } - protected Fetch buildDelayedCollectionFetch( NavigablePath fetchedPath, PluralAttributeMapping fetchedAttribute, @@ -729,23 +710,6 @@ protected Fetch buildDelayedCollectionFetch( ); } - /** - * For Hibernate Reactive - */ - protected Fetch buildSelectEagerCollectionFetch( - NavigablePath fetchedPath, - PluralAttributeMapping fetchedAttribute, - DomainResult collectionKeyDomainResult, - FetchParent fetchParent) { - return buildSelectEagerCollectionFetch( - fetchedPath, - fetchedAttribute, - collectionKeyDomainResult, - fetchParent, - org.hibernate.engine.spi.FetchOptions.NONE - ); - } - protected Fetch buildSelectEagerCollectionFetch( NavigablePath fetchedPath, PluralAttributeMapping fetchedAttribute, diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SelectableMappingsImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SelectableMappingsImpl.java index b78aa5335595..53c7d1f7b466 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SelectableMappingsImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SelectableMappingsImpl.java @@ -7,7 +7,6 @@ import jakarta.annotation.Nullable; import org.hibernate.mapping.Value; -import org.hibernate.metamodel.mapping.EmbeddableMappingType; import org.hibernate.metamodel.mapping.JdbcMapping; import org.hibernate.metamodel.mapping.SelectableConsumer; import org.hibernate.metamodel.mapping.SelectableMapping; @@ -19,8 +18,6 @@ import org.hibernate.type.Type; import org.hibernate.type.MappingContext; -import static org.hibernate.internal.util.collections.CollectionHelper.arrayList; - /** * @author Christian Beikov */ @@ -79,17 +76,6 @@ public static SelectableMappings from( return new SelectableMappingsImpl( selectableMappings ); } - public static SelectableMappings from(EmbeddableMappingType embeddableMappingType) { - final int propertySpan = embeddableMappingType.getNumberOfAttributeMappings(); - final List selectableMappings = arrayList( propertySpan ); - embeddableMappingType.forEachAttributeMapping( - (index, attributeMapping) -> attributeMapping.forEachSelectable( - (columnIndex, selection) -> selectableMappings.add( selection ) - ) - ); - return new SelectableMappingsImpl( selectableMappings.toArray( new SelectableMapping[0] ) ); - } - @Nonnull @Override public SelectableMapping getSelectable(int columnIndex) { diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SqlTypedMappingImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SqlTypedMappingImpl.java index adadc1eaf151..06801a84f2c3 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SqlTypedMappingImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SqlTypedMappingImpl.java @@ -23,15 +23,6 @@ public SqlTypedMappingImpl(JdbcMapping jdbcMapping) { this( null, null, null, null, null, jdbcMapping ); } - public SqlTypedMappingImpl( - @Nullable Long length, - @Nullable Integer precision, - @Nullable Integer scale, - @Nullable Integer temporalPrecision, - JdbcMapping jdbcMapping) { - this( length, null, precision, scale, temporalPrecision, jdbcMapping ); - } - public SqlTypedMappingImpl( @Nullable Long length, @Nullable Integer arrayLength, diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ToOneAttributeMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ToOneAttributeMapping.java index 880406449c2c..6627d9c2e580 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ToOneAttributeMapping.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ToOneAttributeMapping.java @@ -83,7 +83,6 @@ import org.hibernate.sql.results.graph.DomainResultAssembler; import org.hibernate.sql.results.graph.DomainResultCreationState; import org.hibernate.sql.results.graph.Fetch; -import org.hibernate.sql.results.graph.FetchOptions; import org.hibernate.sql.results.graph.FetchParent; import org.hibernate.sql.results.graph.Fetchable; import org.hibernate.sql.results.graph.InitializerParent; @@ -216,34 +215,6 @@ protected ToOneAttributeMapping(ToOneAttributeMapping original) { temporalTableStrategy = original.temporalTableStrategy; } - public ToOneAttributeMapping( - String name, - NavigableRole navigableRole, - int stateArrayPosition, - int fetchableIndex, - ToOne bootValue, - AttributeMetadata attributeMetadata, - FetchOptions mappedFetchOptions, - EntityMappingType entityMappingType, - ManagedMappingType declaringType, - EntityPersister declaringEntityPersister, - PropertyAccess propertyAccess) { - this( - name, - navigableRole, - stateArrayPosition, - fetchableIndex, - bootValue, - attributeMetadata, - mappedFetchOptions.getTiming(), - mappedFetchOptions.getStyle(), - entityMappingType, - declaringType, - declaringEntityPersister, - propertyAccess - ); - } - public ToOneAttributeMapping( String name, NavigableRole navigableRole, @@ -2730,10 +2701,6 @@ public NotFoundAction getNotFoundAction() { return notFoundAction; } - public boolean isIgnoreNotFound(){ - return notFoundAction == NotFoundAction.IGNORE; - } - public boolean hasNotFoundAction() { return notFoundAction != null; } diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/VirtualEmbeddedAttributeMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/VirtualEmbeddedAttributeMapping.java index ad7e4d8f7d8c..61d5f19a3eb2 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/VirtualEmbeddedAttributeMapping.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/VirtualEmbeddedAttributeMapping.java @@ -51,35 +51,6 @@ public VirtualEmbeddedAttributeMapping( ); } - public VirtualEmbeddedAttributeMapping( - String name, - NavigableRole navigableRole, - int stateArrayPosition, - int fetchableIndex, - String tableExpression, - AttributeMetadata attributeMetadata, - PropertyAccess parentInjectionAttributePropertyAccess, - FetchTiming mappedFetchTiming, - FetchStyle mappedFetchStyle, - EmbeddableMappingType embeddableMappingType, - @Nullable ManagedMappingType declaringType, - @Nullable PropertyAccess propertyAccess) { - super( - name, - navigableRole, - stateArrayPosition, - fetchableIndex, - tableExpression, - attributeMetadata, - parentInjectionAttributePropertyAccess, - mappedFetchTiming, - mappedFetchStyle, - embeddableMappingType, - declaringType, - propertyAccess - ); - } - // Constructor is only used for creating the inverse attribute mapping VirtualEmbeddedAttributeMapping( @Nullable ManagedMappingType keyDeclaringType, diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/CollectionPartPath.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/CollectionPartPath.java index 7d1ef29a9a47..b6d4ba33958e 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/CollectionPartPath.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/CollectionPartPath.java @@ -5,7 +5,6 @@ import org.hibernate.metamodel.mapping.CollectionPart; import org.hibernate.metamodel.mapping.ModelPart; import org.hibernate.metamodel.mapping.ModelPartContainer; -import org.hibernate.metamodel.mapping.PluralAttributeMapping; import org.hibernate.metamodel.mapping.internal.AbstractDomainPath; import org.hibernate.metamodel.mapping.ordering.TranslationContext; import org.hibernate.spi.NavigablePath; @@ -17,34 +16,21 @@ */ public class CollectionPartPath extends AbstractDomainPath { private final NavigablePath navigablePath; - private final PluralAttributePath lhs; private final CollectionPart referencedPart; CollectionPartPath( PluralAttributePath lhs, CollectionPart referencedPart) { - this.lhs = lhs; this.referencedPart = referencedPart; this.navigablePath = lhs.getNavigablePath().append( referencedPart.getPartName() ); } - @Override - public PluralAttributeMapping getPluralAttribute() { - return lhs.getPluralAttribute(); - } - @Override public NavigablePath getNavigablePath() { return navigablePath; } - @Nonnull - @Override - public PluralAttributePath getLhs() { - return lhs; - } - @Override public CollectionPart getReferenceModelPart() { return referencedPart; @@ -62,7 +48,7 @@ public SequencePart resolvePathPart( if ( subPart == null ) { throw new PathResolutionException( name ); } - return new DomainPathContinuation( navigablePath.append( name ), this, subPart ); + return new DomainPathContinuation( navigablePath.append( name ), subPart ); } else { throw new PathResolutionException( name ); diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/ColumnReference.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/ColumnReference.java index 6ab6d54c58e8..af186aaa49ee 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/ColumnReference.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/ColumnReference.java @@ -40,14 +40,6 @@ public ColumnReference(String columnExpression, boolean isColumnExpressionFormul this.isColumnExpressionFormula = isColumnExpressionFormula; } - public String getColumnExpression() { - return columnExpression; - } - - public boolean isColumnExpressionFormula() { - return isColumnExpressionFormula; - } - @Override public Expression resolve( QuerySpec ast, diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/DomainPath.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/DomainPath.java index da974ad67450..93a0ad0ebc46 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/DomainPath.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/DomainPath.java @@ -1,13 +1,8 @@ package org.hibernate.metamodel.mapping.ordering.ast; -import jakarta.annotation.Nullable; - import org.hibernate.metamodel.mapping.ModelPart; -import org.hibernate.metamodel.mapping.PluralAttributeMapping; import org.hibernate.spi.NavigablePath; -import static org.hibernate.internal.util.NullnessUtil.castNonNull; - /** * Represents a domain-path (model part path) used in an order-by fragment * @@ -16,15 +11,8 @@ public interface DomainPath extends OrderingExpression, SequencePart { NavigablePath getNavigablePath(); - @Nullable - DomainPath getLhs(); - ModelPart getReferenceModelPart(); - default PluralAttributeMapping getPluralAttribute() { - return castNonNull( getLhs() ).getPluralAttribute(); - } - @Override default String toDescriptiveText() { return "domain path (" + getNavigablePath().getFullPath() + ")"; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/DomainPathContinuation.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/DomainPathContinuation.java index edeadaa78238..5a5315571ed8 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/DomainPathContinuation.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/DomainPathContinuation.java @@ -17,11 +17,8 @@ public class DomainPathContinuation extends AbstractDomainPath { protected final NavigablePath navigablePath; protected final ModelPart referencedModelPart; - private final DomainPath lhs; - - public DomainPathContinuation(NavigablePath navigablePath, DomainPath lhs, ModelPart referencedModelPart) { + public DomainPathContinuation(NavigablePath navigablePath, ModelPart referencedModelPart) { this.navigablePath = navigablePath; - this.lhs = lhs; this.referencedModelPart = referencedModelPart; } @@ -30,12 +27,6 @@ public NavigablePath getNavigablePath() { return navigablePath; } - @Nonnull - @Override - public DomainPath getLhs() { - return lhs; - } - @Override public ModelPart getReferenceModelPart() { return referencedModelPart; @@ -57,7 +48,6 @@ public SequencePart resolvePathPart( return new DomainPathContinuation( navigablePath.append( name ), - this, subPart ); } diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/FkDomainPathContinuation.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/FkDomainPathContinuation.java index 85fb0ea323ae..adab506374b8 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/FkDomainPathContinuation.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/FkDomainPathContinuation.java @@ -19,7 +19,7 @@ public FkDomainPathContinuation( NavigablePath navigablePath, DomainPath lhs, ToOneAttributeMapping referencedModelPart) { - super( navigablePath, lhs, referencedModelPart ); + super( navigablePath, referencedModelPart ); this.possiblePaths = referencedModelPart.getTargetKeyPropertyNames(); } @@ -28,7 +28,7 @@ public FkDomainPathContinuation( DomainPath lhs, ModelPart referencedModelPart, Set possiblePaths) { - super( navigablePath, lhs, referencedModelPart ); + super( navigablePath, referencedModelPart ); this.possiblePaths = possiblePaths; } diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/FunctionExpression.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/FunctionExpression.java index 69f96eb21730..43bdc91bca6e 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/FunctionExpression.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/FunctionExpression.java @@ -38,14 +38,6 @@ public FunctionExpression(String name, int numberOfArguments) { : new ArrayList<>( numberOfArguments ); } - public String getName() { - return name; - } - - public List getArguments() { - return arguments; - } - public void addArgument(OrderingExpression argument) { arguments.add( argument ); } diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/Node.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/Node.java deleted file mode 100644 index bfb45dd0448d..000000000000 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/Node.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.hibernate.metamodel.mapping.ordering.ast; - -/** - * Common contract for all nodes in the order-by fragment AST - * - * @author Steve Ebersole - */ -public interface Node { -} diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/OrderByComplianceViolation.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/OrderByComplianceViolation.java index fe31a124e09e..ac85ed7b5f72 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/OrderByComplianceViolation.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/OrderByComplianceViolation.java @@ -11,8 +11,4 @@ public class OrderByComplianceViolation extends HibernateException implements Jp public OrderByComplianceViolation(String message) { super( message ); } - - public OrderByComplianceViolation(String message, Throwable cause) { - super( message, cause ); - } } diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/OrderingExpression.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/OrderingExpression.java index 11282679edab..655c1ca6e1e2 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/OrderingExpression.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/OrderingExpression.java @@ -21,7 +21,7 @@ * * @author Steve Ebersole */ -public interface OrderingExpression extends Node { +public interface OrderingExpression { SqlAstNode resolve(QuerySpec ast, TableGroup tableGroup, @Nullable String modelPartName, SqlAstCreationState creationState); diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/OrderingSpecification.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/OrderingSpecification.java index c687a75db158..30f7678ba192 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/OrderingSpecification.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/OrderingSpecification.java @@ -10,7 +10,7 @@ * * @author Steve Ebersole */ -public class OrderingSpecification implements Node { +public class OrderingSpecification { private final OrderingExpression orderingExpression; @Nullable private String collation; @@ -55,8 +55,4 @@ public void setNullPrecedence(Nulls nullPrecedence) { public String getOrderByValue() { return orderByValue; } - - public void setOrderByValue(String orderByValue) { - this.orderByValue = orderByValue; - } } diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/PathResolutionException.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/PathResolutionException.java index 29c8522ad29a..6c627b843dc5 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/PathResolutionException.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/PathResolutionException.java @@ -12,8 +12,4 @@ public class PathResolutionException extends HibernateException implements NonTr public PathResolutionException(String message) { super( message ); } - - public PathResolutionException(String message, Throwable cause) { - super( message, cause ); - } } diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/PluralAttributePath.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/PluralAttributePath.java index 157ec1befb75..57fd2962118b 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/PluralAttributePath.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/PluralAttributePath.java @@ -31,12 +31,6 @@ public NavigablePath getNavigablePath() { return navigablePath; } - @Nullable - @Override - public DomainPath getLhs() { - return null; - } - @Override public PluralAttributeMapping getReferenceModelPart() { return pluralAttributeMapping; @@ -55,7 +49,7 @@ public SequencePart resolvePathPart( return new CollectionPartPath( this, collectionPart ); } else if ( subPart instanceof EmbeddableValuedModelPart ) { - return new DomainPathContinuation( navigablePath.append( name ), this, subPart ); + return new DomainPathContinuation( navigablePath.append( name ), subPart ); } else if ( subPart instanceof ToOneAttributeMapping toOneMapping ) { return new FkDomainPathContinuation( navigablePath.append( name ), this, toOneMapping ); @@ -77,7 +71,6 @@ else if ( subPart instanceof ToOneAttributeMapping toOneMapping ) { // create the CollectionSubPath to use as the `lhs` for the element sub-path new CollectionPartPath( this, (CollectionPart) elementDescriptor ) .getNavigablePath().append( name ), - this, elementSubPart ); } @@ -90,7 +83,6 @@ else if ( subPart instanceof ToOneAttributeMapping toOneMapping ) { // create the CollectionSubPath to use as the `lhs` for the element sub-path new CollectionPartPath( this, (CollectionPart) indexDescriptor ) .getNavigablePath().append( name ), - this, indexSubPart ); } diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EmbeddableTypeImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EmbeddableTypeImpl.java index f8c5824e331e..11ea5454f5df 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EmbeddableTypeImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EmbeddableTypeImpl.java @@ -31,8 +31,6 @@ public class EmbeddableTypeImpl extends AbstractManagedType implements SqmEmbeddableDomainType, Serializable { - @SuppressWarnings("FieldCanBeLocal") - private final boolean isDynamic; private final EmbeddedDiscriminatorSqmPathSource discriminatorPathSource; private final List> subtypes = new ArrayList<>(); @@ -40,10 +38,8 @@ public EmbeddableTypeImpl( JavaType javaType, ManagedDomainType superType, DomainType discriminatorType, - boolean isDynamic, JpaMetamodelImplementor domainMetamodel) { super( javaType.getTypeName(), javaType, superType, domainMetamodel ); - this.isDynamic = isDynamic; discriminatorPathSource = discriminatorType == null ? null : new EmbeddedDiscriminatorSqmPathSource<>( discriminatorType, this ); diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EmbeddedDiscriminatorSqmPath.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EmbeddedDiscriminatorSqmPath.java index 0bc2c7aa4a71..d6aec83660d8 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EmbeddedDiscriminatorSqmPath.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EmbeddedDiscriminatorSqmPath.java @@ -3,7 +3,6 @@ import jakarta.annotation.Nullable; import jakarta.annotation.Nonnull; import org.hibernate.query.sqm.spi.DiscriminatorSqmPath; -import org.hibernate.metamodel.model.domain.EmbeddableDomainType; import org.hibernate.query.sqm.spi.NodeBuilder; import org.hibernate.query.sqm.spi.SemanticQueryWalker; import org.hibernate.query.sqm.spi.SqmPathSource; @@ -20,21 +19,12 @@ * @author Marco Belladelli */ public class EmbeddedDiscriminatorSqmPath extends AbstractSqmPath implements DiscriminatorSqmPath { - private final EmbeddableDomainType embeddableDomainType; - protected EmbeddedDiscriminatorSqmPath( @Nonnull NavigablePath navigablePath, @Nonnull SqmPathSource referencedPathSource, @Nullable SqmPath lhs, - @Nonnull EmbeddableDomainType embeddableDomainType, @Nonnull NodeBuilder nodeBuilder) { super( navigablePath, referencedPathSource, lhs, nodeBuilder ); - this.embeddableDomainType = embeddableDomainType; - } - - @Nonnull - public EmbeddableDomainType getEmbeddableDomainType() { - return embeddableDomainType; } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EmbeddedDiscriminatorSqmPathSource.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EmbeddedDiscriminatorSqmPathSource.java index af4e74b7ab92..d80de4a06d88 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EmbeddedDiscriminatorSqmPathSource.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EmbeddedDiscriminatorSqmPathSource.java @@ -26,7 +26,6 @@ public SqmPath createSqmPath(SqmPath lhs, @Nullable SqmPathSource inter PathHelper.append( lhs, this, intermediatePathSource ), pathModel, lhs, - (EmbeddableDomainType) embeddableDomainType, lhs.nodeBuilder() ); } diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EntityDiscriminatorSqmPath.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EntityDiscriminatorSqmPath.java index 8b251ef4bf08..f28ed69935e2 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EntityDiscriminatorSqmPath.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EntityDiscriminatorSqmPath.java @@ -4,7 +4,6 @@ import jakarta.annotation.Nonnull; import org.hibernate.metamodel.mapping.EntityMappingType; import org.hibernate.query.sqm.spi.DiscriminatorSqmPath; -import org.hibernate.metamodel.model.domain.EntityDomainType; import org.hibernate.query.sqm.spi.NodeBuilder; import org.hibernate.query.sqm.spi.SemanticQueryWalker; import org.hibernate.query.sqm.spi.SqmPathSource; @@ -40,11 +39,6 @@ protected EntityDiscriminatorSqmPath( this.entityDescriptor = entityDescriptor; } - @Nonnull - public EntityDomainType getEntityDomainType() { - return entityDomainType; - } - @Nonnull public EntityMappingType getEntityDescriptor() { return entityDescriptor; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MappingMetamodelImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MappingMetamodelImpl.java index 8ffba23dc08c..ee2672e0357c 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MappingMetamodelImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MappingMetamodelImpl.java @@ -330,10 +330,6 @@ public MappingMetamodel getMappingMetamodel() { return this; } - public ServiceRegistry getServiceRegistry() { - return jpaMetamodel.getServiceRegistry(); - } - @Override public void forEachEntityDescriptor(Consumer action) { for ( var value : entityPersisterMap.values() ) { diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/SingularAttributeImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/SingularAttributeImpl.java index a008bc1018b5..2e1508719c7f 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/SingularAttributeImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/SingularAttributeImpl.java @@ -679,32 +679,6 @@ public BooleanIdentifierAttributeImpl( } } - /** - * Subclass used to simply instantiation of singular attributes representing an entity's - * version. - */ - public static class Version extends SingularAttributeImpl { - public Version( - ManagedDomainType declaringType, - String name, - AttributeClassification attributeClassification, - SqmDomainType attributeType, - Member member) { - super( - declaringType, - name, - attributeClassification, - attributeType, - attributeType.getExpressibleJavaType(), - member, - false, - true, - false, - false - ); - } - } - @Override public boolean isId() { return isIdentifier; diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/AbstractCollectionPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/AbstractCollectionPersister.java index 0a15d55a38e1..aa465227c7e3 100644 --- a/hibernate-core/src/main/java/org/hibernate/persister/collection/AbstractCollectionPersister.java +++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/AbstractCollectionPersister.java @@ -188,7 +188,6 @@ public abstract class AbstractCollectionPersister private final String mappedByProperty; protected final boolean indexContainsFormula; - protected final boolean elementIsPureFormula; // columns protected final String[] keyColumnNames; @@ -201,8 +200,6 @@ public abstract class AbstractCollectionPersister @Nullable protected final String[] indexFormulas; @Nullable - protected final boolean[] indexColumnIsGettable; - @Nullable protected final boolean[] indexColumnIsSettable; protected final String[] elementColumnNames; protected final String[] elementColumnWriters; @@ -210,7 +207,6 @@ public abstract class AbstractCollectionPersister protected final String[] elementColumnReaderTemplates; protected final String[] elementFormulaTemplates; protected final String[] elementFormulas; - protected final boolean[] elementColumnIsGettable; protected final boolean[] elementColumnIsSettable; @Nullable @@ -381,7 +377,6 @@ else if ( selectable instanceof Column column ) { elementFormulaTemplates = new String[elementSpan]; elementFormulas = new String[elementSpan]; elementColumnIsSettable = new boolean[elementSpan]; - elementColumnIsGettable = new boolean[elementSpan]; boolean isPureFormula = true; final boolean oneToMany = collectionBootDescriptor.isOneToMany(); final boolean[] columnInsertability = oneToMany ? null : elementBootDescriptor.getColumnInsertability(); @@ -401,7 +396,6 @@ else if ( selectable instanceof Column column ) { ); elementColumnReaders[j] = column.getReadExpr( dialect ); elementColumnReaderTemplates[j] = column.getTemplate( dialect, typeConfiguration ); - elementColumnIsGettable[j] = true; if ( elementType instanceof ComponentType || elementType instanceof AnyType ) { // Implements desired behavior specifically for @ElementCollection mappings. elementColumnIsSettable[j] = columnInsertability[j]; @@ -414,7 +408,6 @@ else if ( selectable instanceof Column column ) { } j++; } - elementIsPureFormula = isPureFormula; // INDEX AND ROW SELECT @@ -429,7 +422,6 @@ else if ( selectable instanceof Column column ) { indexColumnNames = new String[indexSpan]; indexFormulaTemplates = new String[indexSpan]; indexFormulas = new String[indexSpan]; - indexColumnIsGettable = new boolean[indexSpan]; indexColumnIsSettable = new boolean[indexSpan]; indexColumnAliases = new String[indexSpan]; int i = 0; @@ -452,7 +444,6 @@ else if ( selectable instanceof Column indexColumn ) { hasFormula = true; // this is incorrect, but needed for some reason } indexColumnNames[i] = indexColumn.getQuotedName( dialect ); - indexColumnIsGettable[i] = true; indexColumnIsSettable[i] = indexColumnInsertability[i] || indexColumnUpdatability[i]; } i++; @@ -461,7 +452,6 @@ else if ( selectable instanceof Column indexColumn ) { } else { indexContainsFormula = false; - indexColumnIsGettable = null; indexColumnIsSettable = null; indexFormulaTemplates = null; indexFormulas = null; @@ -1408,11 +1398,6 @@ public EntityPersister getElementPersister() { return elementPersister; } - @Nullable - protected EntityPersister getElementPersisterInternal() { - return elementPersister; - } - @Nonnull @Override public String[] getCollectionSpaces() { @@ -1616,11 +1601,6 @@ public boolean isExtraLazy() { return isExtraLazy; } - @Nonnull - protected Dialect getDialect() { - return dialect; - } - @Override public int getBatchSize() { return batchSize; diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/OneToManyPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/OneToManyPersister.java index eb261a287c21..4274ddedfd44 100644 --- a/hibernate-core/src/main/java/org/hibernate/persister/collection/OneToManyPersister.java +++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/OneToManyPersister.java @@ -174,11 +174,6 @@ public RemoveCoordinator getRemoveCoordinator() { return removeCoordinator; } - @Nonnull - public WriteIndexCoordinator getWriteIndexCoordinator() { - return writeIndexCoordinator; - } - @Override public boolean isRowDeleteEnabled() { return super.isRowDeleteEnabled() && keyIsNullable; diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/CollectionAuditSupport.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/CollectionAuditSupport.java index ee4bb953f288..472f042b1d42 100644 --- a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/CollectionAuditSupport.java +++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/CollectionAuditSupport.java @@ -132,10 +132,6 @@ public CollectionMutationTarget getMutationTarget() { return mutationTarget; } - public @Nullable EntityAuditSupport getOwnerMutationSupport() { - return ownerMutationSupport; - } - /// Resolve the owning entity change implied by an audited collection change. /// /// Collection audit rows record the row-level ADD/DEL changes, while the diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java index ca6d2bf5672e..f6fbd5e0bbaf 100644 --- a/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java +++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java @@ -265,7 +265,6 @@ import static java.util.Collections.emptyMap; import static java.util.Collections.emptySet; import static java.util.Collections.unmodifiableList; -import static java.util.function.Function.identity; import static org.hibernate.engine.internal.CacheHelper.fromSharedCache; import static org.hibernate.engine.internal.CacheHelper.readingFromCache; import static org.hibernate.engine.internal.ManagedTypeHelper.asPersistentAttributeInterceptable; @@ -529,20 +528,6 @@ public abstract class AbstractEntityPersister @Nullable private ConcurrentHashMap nonLazyPropertyLoadPlansByName; - public AbstractEntityPersister( - @Nonnull final PersistentClass persistentClass, - @Nullable final EntityDataAccess cacheAccessStrategy, - @Nullable final NaturalIdDataAccess naturalIdRegionAccessStrategy, - @Nonnull final RuntimeModelCreationContext creationContext) throws HibernateException { - this( - persistentClass, - cacheAccessStrategy, - naturalIdRegionAccessStrategy, - creationContext, - identity() - ); - } - protected AbstractEntityPersister( @Nonnull final PersistentClass persistentClass, @Nullable final EntityDataAccess cacheAccessStrategy, @@ -2029,24 +2014,6 @@ private Object copiedLazyPropertyValue(int index, @Nullable Object propValue) { return lazyPropertyTypes[index].deepCopy( propValue, factory ); } - /** - * Used by Hibernate Reactive - * @deprecated - */ - @Deprecated(since = "7.2", forRemoval = true) - protected boolean initializeLazyProperty( - @Nonnull final String fieldName, - @Nonnull final Object entity, - @Nonnull final EntityEntry entry, - @Nonnull final LazyAttributeDescriptor fetchGroupAttributeDescriptor, - @Nullable final Object propValue) { - final String name = fetchGroupAttributeDescriptor.getName(); - initializeLazyProperty( entity, entry, propValue, - getPropertyIndex( name ), - fetchGroupAttributeDescriptor.getType() ); - return fieldName.equals( name ); - } - // Used by Hibernate Reactive protected void initializeLazyProperty(@Nonnull Object entity, @Nonnull EntityEntry entry, @Nullable Object propValue, int index, @Nonnull Type type) { setPropertyValue( entity, index, propValue ); @@ -4781,17 +4748,6 @@ public int[] findModified(@Nonnull Object[] old, @Nonnull Object[] current, @Non } } - /** - * Which properties appear in the SQL update? - * (Initialized, updateable ones!) - */ - @Nonnull - public boolean[] getPropertyUpdateability(@Nonnull Object entity) { - return hasUninitializedLazyProperties( entity ) - ? getNonLazyPropertyUpdateability() - : getPropertyUpdateability(); - } - @Override public boolean isPropertyTemporalExcluded(int attributeIndex) { return propertyTemporalExcluded[attributeIndex]; diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/BaseEntityPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/BaseEntityPersister.java index 6a9d6ea693c4..cd399b25f638 100644 --- a/hibernate-core/src/main/java/org/hibernate/persister/entity/BaseEntityPersister.java +++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/BaseEntityPersister.java @@ -834,11 +834,6 @@ public int getSubclassId() { return subclassId; } - @Nonnull - public EntityType getEntityType() { - return entityType; - } - @Nullable protected String getIdentifierAttributeName() { return identifierPropertyName; diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/InsertCoordinatorStandard.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/InsertCoordinatorStandard.java index 33c78b8172ac..70ae043fa795 100644 --- a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/InsertCoordinatorStandard.java +++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/InsertCoordinatorStandard.java @@ -636,13 +636,4 @@ private static boolean needsValueBinding(@Nonnull OnExecutionGenerator generator return false; } } - - /** - * @deprecated Use {@link #getBatchKey()} - */ - @Nullable - @Deprecated - public BatchKey getInsertBatchKey() { - return batchKey; - } } diff --git a/hibernate-core/src/main/java/org/hibernate/persister/filter/internal/FilterHelper.java b/hibernate-core/src/main/java/org/hibernate/persister/filter/internal/FilterHelper.java index 2dc686bbaa7c..0a9a7e5910af 100644 --- a/hibernate-core/src/main/java/org/hibernate/persister/filter/internal/FilterHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/persister/filter/internal/FilterHelper.java @@ -10,10 +10,8 @@ import java.util.regex.Pattern; import org.hibernate.Filter; -import org.hibernate.engine.spi.LoadQueryInfluencers; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.mapping.FilterConfiguration; -import org.hibernate.metamodel.mapping.Restrictable; import org.hibernate.persister.entity.EntityNameUse; import org.hibernate.persister.filter.FilterAliasGenerator; import org.hibernate.sql.Template; @@ -24,10 +22,8 @@ import static org.hibernate.internal.util.NullnessUtil.castNonNull; import static org.hibernate.internal.FilterImpl.MARKER; -import static org.hibernate.internal.util.StringHelper.isNotEmpty; import static org.hibernate.internal.util.StringHelper.replace; import static org.hibernate.internal.util.StringHelper.safeInterning; -import static org.hibernate.internal.util.collections.CollectionHelper.isNotEmpty; /** * Utility methods for dealing with {@linkplain FilterConfiguration filters}. @@ -145,24 +141,6 @@ public boolean isAffectedBy(@Nonnull Map enabledFilters, boolean return false; } - public static void applyBaseRestrictions( - @Nonnull Consumer predicateConsumer, - @Nonnull Restrictable restrictable, - @Nonnull TableGroup rootTableGroup, - boolean useIdentificationVariable, - @Nonnull LoadQueryInfluencers loadQueryInfluencers, - @Nonnull SqlAstCreationState astCreationState) { - restrictable.applyBaseRestrictions( - predicateConsumer, - rootTableGroup, - useIdentificationVariable, - loadQueryInfluencers.getEnabledFilters(), - astCreationState.applyOnlyLoadByKeyFilters(), - null, - astCreationState - ); - } - public void applyEnabledFilters( @Nonnull Consumer predicateConsumer, @Nullable FilterAliasGenerator aliasGenerator, @@ -203,27 +181,6 @@ private FilterPredicate generateFilterPredicate( } - @Nonnull - public String render(@Nullable FilterAliasGenerator aliasGenerator, @Nonnull Map enabledFilters) { - final var buffer = new StringBuilder(); - render( buffer, aliasGenerator, enabledFilters ); - return buffer.toString(); - } - - public void render(@Nonnull StringBuilder buffer, @Nullable FilterAliasGenerator aliasGenerator, @Nonnull Map enabledFilters) { - if ( isNotEmpty( filterNames ) ) { - for ( int i = 0, max = filterNames.length; i < max; i++ ) { - if ( enabledFilters.containsKey( filterNames[i] ) - && isNotEmpty( filterConditions[i] ) ) { - if ( !buffer.isEmpty() ) { - buffer.append( " and " ); - } - buffer.append( render( aliasGenerator, i, null, null ) ); - } - } - } - } - @Nonnull private String render( @Nullable FilterAliasGenerator aliasGenerator, diff --git a/hibernate-core/src/main/java/org/hibernate/pretty/MessageHelper.java b/hibernate-core/src/main/java/org/hibernate/pretty/MessageHelper.java index e02a64d6994a..fcced2cf46b9 100644 --- a/hibernate-core/src/main/java/org/hibernate/pretty/MessageHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/pretty/MessageHelper.java @@ -103,74 +103,6 @@ else if ( factory != null ) { } - /** - * Generate an info message string relating to a particular entity,. - * - * @param persister The persister for the entity - * @param id The entity id value - * @param identifierType The entity identifier type mapping - * @param factory The session factory - * @return An info string, in the form [FooBar#1] - */ - public static String infoString( - @Nullable EntityPersister persister, - @Nullable Object id, - Type identifierType, - SessionFactoryImplementor factory) { - final StringBuilder info = new StringBuilder(); - info.append( '[' ); - if( persister == null ) { - info.append( "unknown entity" ); - } - else { - info.append( persister.getEntityName() ); - } - - if ( id == null ) { - info.append( " with null id" ); - } - else { - info.append( " with id '" ).append( identifierType.toLoggableString( id, factory ) ).append( "'" ); - } - info.append( ']' ); - - return info.toString(); - } - - /** - * Generate an info message string relating to a series of entities. - * - * @param persister The persister for the entities - * @param ids The entity id values - * @param factory The session factory - * @return An info string, in the form [FooBar#<1,2,3>] - */ - public static String infoString( - @Nullable EntityPersister persister, - Object[] ids, - SessionFactoryImplementor factory) { - final StringBuilder info = new StringBuilder(); - info.append( '[' ); - if ( persister == null ) { - info.append( "unknown entity" ); - } - else { - info.append( persister.getEntityName() ); - info.append( " with ids " ); - for ( int i=0; i getType() { - return type; - } - @Nullable public BindableType getHibernateType() { return hibernateType; diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParamBindings.java b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParamBindings.java index 0d01238f216a..16e891d14da9 100644 --- a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParamBindings.java +++ b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParamBindings.java @@ -38,10 +38,6 @@ public ProcedureParamBindings( this.sessionFactory = sessionFactory; } - public ProcedureParameterMetadataImplementor getParameterMetadata() { - return parameterMetadata; - } - @Override public boolean isBound(QueryParameterImplementor parameter) { return parameter instanceof ProcedureParameterImplementor diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/internal/Util.java b/hibernate-core/src/main/java/org/hibernate/procedure/internal/Util.java index ee7f06390db1..893ca44d973c 100644 --- a/hibernate-core/src/main/java/org/hibernate/procedure/internal/Util.java +++ b/hibernate-core/src/main/java/org/hibernate/procedure/internal/Util.java @@ -42,26 +42,6 @@ else if ( !isEmpty( resultSetMappingClasses ) ) { } } - public static void resolveResultSetMappings( - String[] resultSetMappingNames, - Class[] resultSetMappingClasses, - ResultSetMapping resultSetMapping, - Consumer querySpaceConsumer, - ResultSetMappingResolutionContext context) { - if ( !isEmpty( resultSetMappingNames ) ) { - // cannot specify both - if ( !isEmpty( resultSetMappingClasses ) ) { - throw new IllegalArgumentException( "Cannot specify both result-set mapping names and classes" ); - } - resolveResultSetMappingNames( resultSetMappingNames, resultSetMapping, querySpaceConsumer, context ); - } - else if ( !isEmpty( resultSetMappingClasses ) ) { - resolveResultSetMappingClasses( resultSetMappingClasses, resultSetMapping, querySpaceConsumer, context ); - } - - // otherwise, nothing to resolve - } - public static void resolveResultSetMappingNames( String[] resultSetMappingNames, ResultSetMapping resultSetMapping, diff --git a/hibernate-core/src/main/java/org/hibernate/property/access/internal/AbstractFieldSerialForm.java b/hibernate-core/src/main/java/org/hibernate/property/access/internal/AbstractFieldSerialForm.java deleted file mode 100644 index d1f76fb90e59..000000000000 --- a/hibernate-core/src/main/java/org/hibernate/property/access/internal/AbstractFieldSerialForm.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.hibernate.property.access.internal; - -import java.io.Serializable; -import java.lang.reflect.Field; - -import org.hibernate.internal.util.ReflectHelper; -import org.hibernate.property.access.spi.PropertyAccessSerializationException; - -/** - * Base Serializable form for field (used as Getter or Setter) - * - * @author Steve Ebersole - */ -public abstract class AbstractFieldSerialForm implements Serializable { - private final Class declaringClass; - private final String fieldName; - - protected AbstractFieldSerialForm(Field field) { - this( field.getDeclaringClass(), field.getName() ); - } - - protected AbstractFieldSerialForm(Class declaringClass, String fieldName) { - this.declaringClass = declaringClass; - this.fieldName = fieldName; - } - - protected Field resolveField() { - try { - final var field = declaringClass.getDeclaredField( fieldName ); - ReflectHelper.ensureAccessibility( field ); - return field; - } - catch (NoSuchFieldException e) { - throw new PropertyAccessSerializationException( - "Unable to resolve field on deserialization : " + declaringClass.getName() + "#" + fieldName - ); - } - } -} diff --git a/hibernate-core/src/main/java/org/hibernate/property/access/internal/AbstractSetterMethodSerialForm.java b/hibernate-core/src/main/java/org/hibernate/property/access/internal/AbstractSetterMethodSerialForm.java deleted file mode 100644 index e0cd941c3885..000000000000 --- a/hibernate-core/src/main/java/org/hibernate/property/access/internal/AbstractSetterMethodSerialForm.java +++ /dev/null @@ -1,63 +0,0 @@ -package org.hibernate.property.access.internal; - -import java.io.Serializable; -import java.lang.reflect.Method; - -import org.hibernate.internal.util.ReflectHelper; -import org.hibernate.property.access.spi.PropertyAccessSerializationException; - -/** - * Base Serializable form for setter methods - * - * @author Steve Ebersole - */ -public abstract class AbstractSetterMethodSerialForm implements Serializable { - private final Class containerClass; - private final String propertyName; - - private final Class declaringClass; - private final String methodName; - private final Class argumentType; - - public AbstractSetterMethodSerialForm(Class containerClass, String propertyName, Method method) { - this.containerClass = containerClass; - this.propertyName = propertyName; - this.declaringClass = method.getDeclaringClass(); - this.methodName = method.getName(); - this.argumentType = method.getParameterTypes()[0]; - } - - public Class getContainerClass() { - return containerClass; - } - - public String getPropertyName() { - return propertyName; - } - - public Class getDeclaringClass() { - return declaringClass; - } - - public String getMethodName() { - return methodName; - } - - public Class getArgumentType() { - return argumentType; - } - - protected Method resolveMethod() { - try { - final var method = declaringClass.getDeclaredMethod( methodName, argumentType ); - ReflectHelper.ensureAccessibility( method ); - return method; - } - catch (NoSuchMethodException e) { - throw new PropertyAccessSerializationException( - "Unable to resolve setter method on deserialization : " + declaringClass.getName() + "#" - + methodName + "(" + argumentType.getName() + ")" - ); - } - } -} diff --git a/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessGetterImpl.java b/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessGetterImpl.java deleted file mode 100644 index da4b2ce5b1fb..000000000000 --- a/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessGetterImpl.java +++ /dev/null @@ -1,93 +0,0 @@ -package org.hibernate.property.access.internal; - -import jakarta.annotation.Nullable; -import org.hibernate.property.access.spi.Getter; -import org.hibernate.property.access.spi.GetterFieldImpl; -import org.hibernate.property.access.spi.GetterMethodImpl; -import org.hibernate.property.access.spi.PropertyAccess; -import org.hibernate.property.access.spi.PropertyAccessBuildingException; -import org.hibernate.property.access.spi.PropertyAccessStrategy; -import org.hibernate.property.access.spi.PropertyValueAccessor; -import org.hibernate.property.access.spi.Setter; - -import java.lang.reflect.Field; -import java.lang.reflect.Method; - -import static org.hibernate.internal.util.ReflectHelper.getterMethodOrNull; -import static org.hibernate.property.access.internal.AccessStrategyHelper.fieldOrNull; -import static org.hibernate.property.access.internal.AccessStrategyHelper.getAccessType; - -/** - * A {@link PropertyAccess} based on mix of getter method or field. - * - * @author Gavin King - */ -public class PropertyAccessGetterImpl implements PropertyAccess { - private final PropertyAccessStrategy strategy; - - private final Getter getter; - - public PropertyAccessGetterImpl(PropertyAccessStrategy strategy, Class containerJavaType, String propertyName) { - this.strategy = strategy; - - final var propertyAccessType = getAccessType( containerJavaType, propertyName ); - switch ( propertyAccessType ) { - case FIELD: { - final var field = fieldOrNull( containerJavaType, propertyName ); - if ( field == null ) { - throw new PropertyAccessBuildingException( - "Could not locate field for property named [" + containerJavaType.getName() + "#" + propertyName + "]" - ); - } - getter = fieldGetter( containerJavaType, propertyName, field ); - break; - } - case PROPERTY: { - final var getterMethod = getterMethodOrNull( containerJavaType, propertyName ); - if ( getterMethod == null ) { - throw new PropertyAccessBuildingException( - "Could not locate getter for property named [" + containerJavaType.getName() + "#" + propertyName + "]" - ); - } - getter = propertyGetter( containerJavaType, propertyName, getterMethod ); - break; - } - default: { - throw new PropertyAccessBuildingException( - "Invalid access type " + propertyAccessType + " for property named [" + containerJavaType.getName() + "#" + propertyName + "]" - ); - } - } - } - - // --- // - - private static Getter fieldGetter(Class containerJavaType, String propertyName, Field field) { - return new GetterFieldImpl( containerJavaType, propertyName, field ); - } - - private static Getter propertyGetter(Class containerJavaType, String propertyName, Method method) { - return new GetterMethodImpl( containerJavaType, propertyName, method ); - } - - @Override - public PropertyAccessStrategy getPropertyAccessStrategy() { - return strategy; - } - - @Override - public Getter getGetter() { - return getter; - } - - @Override - public @Nullable Setter getSetter() { - return null; - } - - @Override - public PropertyValueAccessor getPropertyValueAccessor() { - throw new UnsupportedOperationException( - "This PropertyAccess is not supposed to be used for setting/getting values" ); - } -} diff --git a/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessStrategyEnhancedImpl.java b/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessStrategyEnhancedImpl.java index 620b5d989213..6f63135599d0 100644 --- a/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessStrategyEnhancedImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessStrategyEnhancedImpl.java @@ -15,15 +15,6 @@ * @author Gavin King */ public class PropertyAccessStrategyEnhancedImpl implements PropertyAccessStrategy { - public static PropertyAccessStrategy with(AccessType getterAccessType) { - return getterAccessType == null - ? STANDARD - : switch ( getterAccessType ) { - case FIELD -> FIELD; - case PROPERTY -> PROPERTY; - }; - } - private final @Nullable AccessType classAccessType; public static PropertyAccessStrategy STANDARD = new PropertyAccessStrategyEnhancedImpl( null ); diff --git a/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessStrategyGetterImpl.java b/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessStrategyGetterImpl.java deleted file mode 100644 index a21679ffb348..000000000000 --- a/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessStrategyGetterImpl.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.hibernate.property.access.internal; - -import org.hibernate.property.access.spi.PropertyAccess; -import org.hibernate.property.access.spi.PropertyAccessStrategy; -import org.hibernate.property.access.spi.PropertyAccessorService; - -/** - * A PropertyAccessStrategy that selects between available getter method or field. - * - * @author Gavin King - */ -public class PropertyAccessStrategyGetterImpl implements PropertyAccessStrategy { - /** - * Singleton access - */ - public static final PropertyAccessStrategy INSTANCE = new PropertyAccessStrategyGetterImpl(); - - @Override - public PropertyAccess buildPropertyAccess(PropertyAccessorService propertyAccessorService, Class containerJavaType, String propertyName, boolean setterRequired) { - return new PropertyAccessGetterImpl( this, containerJavaType, propertyName ); - } -} diff --git a/hibernate-core/src/main/java/org/hibernate/property/access/spi/SetterFieldImpl.java b/hibernate-core/src/main/java/org/hibernate/property/access/spi/SetterFieldImpl.java index d39495ee5b88..96efed73b9a4 100644 --- a/hibernate-core/src/main/java/org/hibernate/property/access/spi/SetterFieldImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/property/access/spi/SetterFieldImpl.java @@ -31,10 +31,6 @@ public SetterFieldImpl(Class containerClass, String propertyName, Field field this.setterMethod = setterMethodOrNull( containerClass, propertyName, field.getType() ); } - public Class getContainerClass() { - return containerClass; - } - public String getPropertyName() { return propertyName; } diff --git a/hibernate-core/src/main/java/org/hibernate/property/access/spi/SetterMethodImpl.java b/hibernate-core/src/main/java/org/hibernate/property/access/spi/SetterMethodImpl.java index 094eb75c2124..ec5bbe929944 100644 --- a/hibernate-core/src/main/java/org/hibernate/property/access/spi/SetterMethodImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/property/access/spi/SetterMethodImpl.java @@ -105,10 +105,6 @@ public void set(Object target, @Nullable Object value) { } } - public Class getContainerClass() { - return containerClass; - } - @Override public String getMethodName() { return setterMethod.getName(); diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/FetchMementoBasicStandard.java b/hibernate-core/src/main/java/org/hibernate/query/internal/FetchMementoBasicStandard.java index 54969a9110b1..78cc541981b6 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/internal/FetchMementoBasicStandard.java +++ b/hibernate-core/src/main/java/org/hibernate/query/internal/FetchMementoBasicStandard.java @@ -2,14 +2,10 @@ import java.util.function.Consumer; -import jakarta.persistence.sql.FieldMapping; import jakarta.persistence.sql.MemberMapping; import jakarta.persistence.sql.ResultSetMapping; import org.hibernate.SessionFactory; -import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.metamodel.mapping.BasicValuedModelPart; -import org.hibernate.metamodel.mapping.internal.BasicAttributeMapping; -import org.hibernate.persister.entity.EntityPersister; import org.hibernate.spi.NavigablePath; import org.hibernate.query.named.spi.FetchMementoBasic; import org.hibernate.query.results.spi.FetchBuilder; @@ -35,28 +31,11 @@ public FetchMementoBasicStandard( this.columnAlias = columnAlias; } - public static FetchMementoBasicStandard from( - FieldMapping basicMapping, - NavigablePath attributePath, - EntityPersister entityDescriptor, - BasicAttributeMapping attributeMapping, - SessionFactoryImplementor factory) { - return null; - } - @Override public NavigablePath getNavigablePath() { return navigablePath; } - public BasicValuedModelPart getFetchedAttribute() { - return fetchedAttribute; - } - - public String getColumnAlias() { - return columnAlias; - } - @Override public FetchBuilder resolve( Parent parent, diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/FetchMementoEmbeddableStandard.java b/hibernate-core/src/main/java/org/hibernate/query/internal/FetchMementoEmbeddableStandard.java index a02f3a809029..565f06fc93c5 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/internal/FetchMementoEmbeddableStandard.java +++ b/hibernate-core/src/main/java/org/hibernate/query/internal/FetchMementoEmbeddableStandard.java @@ -38,12 +38,4 @@ public FetchBuilder resolve( public NavigablePath getNavigablePath() { return navigablePath; } - - public EmbeddableValuedModelPart getAttributeMapping() { - return attributeMapping; - } - - public List getColumnNames() { - return columnNames; - } } diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/FetchMementoHbmStandard.java b/hibernate-core/src/main/java/org/hibernate/query/internal/FetchMementoHbmStandard.java index 16bcbef354c7..09a5f017d9da 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/internal/FetchMementoHbmStandard.java +++ b/hibernate-core/src/main/java/org/hibernate/query/internal/FetchMementoHbmStandard.java @@ -6,7 +6,6 @@ import java.util.function.Consumer; import org.hibernate.AssertionFailure; -import org.hibernate.LockMode; import org.hibernate.metamodel.mapping.EntityMappingType; import org.hibernate.metamodel.mapping.PluralAttributeMapping; import org.hibernate.metamodel.mapping.internal.ToOneAttributeMapping; @@ -37,8 +36,6 @@ public interface FetchParentMemento { private final String ownerTableAlias; private final String tableAlias; private final List keyColumnNames; - private final LockMode lockMode; - private final FetchParentMemento parent; private final Map fetchMementoMap; private final Fetchable fetchable; @@ -47,16 +44,12 @@ public FetchMementoHbmStandard( String ownerTableAlias, String tableAlias, List keyColumnNames, - LockMode lockMode, - FetchParentMemento parent, Map fetchMementoMap, Fetchable fetchable) { this.navigablePath = navigablePath; this.ownerTableAlias = ownerTableAlias; this.tableAlias = tableAlias; this.keyColumnNames = keyColumnNames; - this.lockMode = lockMode; - this.parent = parent; this.fetchMementoMap = fetchMementoMap; this.fetchable = fetchable; } diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/QueryHelper.java b/hibernate-core/src/main/java/org/hibernate/query/internal/QueryHelper.java index 503e6127849f..6d55adc496ec 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/internal/QueryHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/query/internal/QueryHelper.java @@ -5,7 +5,6 @@ import jakarta.annotation.Nullable; import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.query.TupleTransformer; -import org.hibernate.query.results.spi.ResultSetMapping; import org.hibernate.query.spi.HqlInterpretation; import org.hibernate.query.sqm.spi.SqmBindableType; import org.hibernate.query.sqm.spi.SqmPathSource; @@ -246,26 +245,6 @@ private static String[] buildTupleAliasArray(List> selections) { } } - public static Class determineResultType(Class explicitType, ResultSetMapping resultSetMapping) { - if ( explicitType != null ) { - return explicitType; - } - - assert resultSetMapping.getResultBuilders() != null; - if ( resultSetMapping.getResultBuilders().isEmpty() ) { - //noinspection unchecked - return (Class) Object.class; - } - else if ( resultSetMapping.getResultBuilders().size() > 1 ) { - //noinspection unchecked - return (Class) Object[].class; - } - else { - //noinspection unchecked - return (Class) resultSetMapping.getResultBuilders().get( 0 ).getJavaType(); - } - } - @Nullable public static int[] unnamedParameterIndices(DomainParameterXref domainParameterXref) { diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterIdentifiedImpl.java b/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterIdentifiedImpl.java index 7757687a6e2d..04326ce4dadc 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterIdentifiedImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterIdentifiedImpl.java @@ -41,10 +41,6 @@ private QueryParameterIdentifiedImpl( this.unnamedParameterId = unnamedParameterId; } - public int getUnnamedParameterId() { - return unnamedParameterId; - } - @Override @Nonnull public NamedQueryMemento.ParameterMemento toMemento() { diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/ResultMementoBasicStandard.java b/hibernate-core/src/main/java/org/hibernate/query/internal/ResultMementoBasicStandard.java index ac44fa129ac0..c5fa89de7a64 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/internal/ResultMementoBasicStandard.java +++ b/hibernate-core/src/main/java/org/hibernate/query/internal/ResultMementoBasicStandard.java @@ -79,10 +79,6 @@ public ResultMementoBasicStandard( } } - public String getColumnName() { - return explicitColumnName; - } - private static ResultBuilderBasicValued resolveBuilder( @@ -162,11 +158,6 @@ private static BasicValuedMapping resolveUnderlyingMapping( return typeConfiguration.standardBasicTypeForJavaType( typeArguments[1] ); } - private ResultMementoBasicStandard(String explicitColumnName, ResultBuilderBasicValued builder) { - this.explicitColumnName = explicitColumnName; - this.builder = builder; - } - public ResultMementoBasicStandard( String explicitColumnName, BasicType explicitType) { diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/ResultMementoInstantiationStandard.java b/hibernate-core/src/main/java/org/hibernate/query/internal/ResultMementoInstantiationStandard.java index 49f8b2822f75..eb3963d9276e 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/internal/ResultMementoInstantiationStandard.java +++ b/hibernate-core/src/main/java/org/hibernate/query/internal/ResultMementoInstantiationStandard.java @@ -12,7 +12,6 @@ import org.hibernate.query.results.internal.complete.CompleteResultBuilderInstantiation; import org.hibernate.type.descriptor.java.JavaType; -import static java.util.Collections.unmodifiableList; import static org.hibernate.internal.util.collections.CollectionHelper.arrayList; /** @@ -34,10 +33,6 @@ public JavaType getInstantiatedJavaType() { return instantiatedJtd; } - public List getArgumentMementos() { - return unmodifiableList( argumentMementos ); - } - @Override public Class getResultJavaType() { return instantiatedJtd.getJavaTypeClass(); diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/SqlOmittingQueryOptions.java b/hibernate-core/src/main/java/org/hibernate/query/internal/SqlOmittingQueryOptions.java index 3844ffcaa0e9..549560d9117f 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/internal/SqlOmittingQueryOptions.java +++ b/hibernate-core/src/main/java/org/hibernate/query/internal/SqlOmittingQueryOptions.java @@ -32,14 +32,6 @@ public SqlOmittingQueryOptions(QueryOptions queryOptions, boolean omitLimit, boo this.originalLimit = unwrappedLimit( queryOptions ); } - public SqlOmittingQueryOptions(QueryOptions queryOptions, boolean omitLimit, boolean omitLocks, ListResultsConsumer.UniqueSemantic semantic) { - super( queryOptions ); - this.omitLimit = omitLimit; - this.omitLocks = omitLocks; - this.uniqueSemantic = semantic; - this.originalLimit = unwrappedLimit( queryOptions ); - } - private static Limit unwrappedLimit(QueryOptions queryOptions) { return queryOptions instanceof SqlOmittingQueryOptions wrapped ? wrapped.peekOriginalLimit() diff --git a/hibernate-core/src/main/java/org/hibernate/query/named/internal/CriteriaMutationMementoImpl.java b/hibernate-core/src/main/java/org/hibernate/query/named/internal/CriteriaMutationMementoImpl.java index 5b94ce2eae10..0dcbd6559726 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/named/internal/CriteriaMutationMementoImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/query/named/internal/CriteriaMutationMementoImpl.java @@ -8,6 +8,7 @@ import org.hibernate.query.IllegalSelectQueryException; import org.hibernate.query.internal.AbstractSqmQuery; import org.hibernate.query.internal.MutationQueryImpl; +import org.hibernate.query.named.spi.NamedMutationMemento; import org.hibernate.query.named.spi.NamedSqmQueryMemento; import org.hibernate.query.spi.MutationQueryImplementor; import org.hibernate.query.spi.QueryEngine; @@ -24,7 +25,7 @@ */ public class CriteriaMutationMementoImpl extends AbstractQueryMemento - implements SqmMutationMemento, Serializable { + implements NamedSqmQueryMemento, NamedMutationMemento, Serializable { private final SqmDmlStatement mutationAst; public CriteriaMutationMementoImpl( diff --git a/hibernate-core/src/main/java/org/hibernate/query/named/internal/HqlMutationMementoImpl.java b/hibernate-core/src/main/java/org/hibernate/query/named/internal/HqlMutationMementoImpl.java index 5fdf0db26235..0eeaa87737bd 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/named/internal/HqlMutationMementoImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/query/named/internal/HqlMutationMementoImpl.java @@ -8,6 +8,7 @@ import org.hibernate.query.IllegalSelectQueryException; import org.hibernate.query.internal.MutationQueryImpl; import org.hibernate.query.internal.QueryHelper; +import org.hibernate.query.named.spi.NamedMutationMemento; import org.hibernate.query.named.spi.NamedSqmQueryMemento; import org.hibernate.query.spi.HqlInterpretation; import org.hibernate.query.spi.MutationQueryImplementor; @@ -24,7 +25,7 @@ */ public class HqlMutationMementoImpl extends AbstractQueryMemento - implements SqmMutationMemento, Serializable { + implements NamedSqmQueryMemento, NamedMutationMemento, Serializable { private final String hqlString; private final @Nullable Map parameterTypes; diff --git a/hibernate-core/src/main/java/org/hibernate/query/named/internal/SqmMutationMemento.java b/hibernate-core/src/main/java/org/hibernate/query/named/internal/SqmMutationMemento.java deleted file mode 100644 index e2b1e03e125a..000000000000 --- a/hibernate-core/src/main/java/org/hibernate/query/named/internal/SqmMutationMemento.java +++ /dev/null @@ -1,10 +0,0 @@ -package org.hibernate.query.named.internal; - -import org.hibernate.query.named.spi.NamedMutationMemento; -import org.hibernate.query.named.spi.NamedSqmQueryMemento; - -/// Union of `NamedSqmQueryMemento` and `NamedMutationMemento`. -/// -/// @author Steve Ebersole -public interface SqmMutationMemento extends NamedSqmQueryMemento, NamedMutationMemento { -} diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/internal/Builders.java b/hibernate-core/src/main/java/org/hibernate/query/results/internal/Builders.java index 4d192c1ba2af..c2778c1c0ad5 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/results/internal/Builders.java +++ b/hibernate-core/src/main/java/org/hibernate/query/results/internal/Builders.java @@ -123,11 +123,6 @@ public static ResultBuilder converted( return new DynamicResultBuilderBasicConverted<>( columnAlias, domainJavaType, jdbcJavaType, converterJavaType, sessionFactory ); } - public static ResultBuilderBasicValued scalar(int position) { - // will be needed for interpreting legacy HBM mappings - return new DynamicResultBuilderBasicStandard( position ); - } - public static ResultBuilderBasicValued scalar(int position, BasicType type) { // will be needed for interpreting legacy HBM mappings return new DynamicResultBuilderBasicStandard( position, type ); diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/internal/DomainResultCreationStateImpl.java b/hibernate-core/src/main/java/org/hibernate/query/results/internal/DomainResultCreationStateImpl.java index 325fb72bbdfa..7dcb2c317dfc 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/results/internal/DomainResultCreationStateImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/query/results/internal/DomainResultCreationStateImpl.java @@ -120,10 +120,6 @@ public void disallowPositionalSelections() { this.allowPositionalSelections = false; } - public JdbcValuesMetadata getJdbcResultsMetadata() { - return jdbcResultsMetadata; - } - public void pushExplicitFetchMementoResolver(Function resolver) { fetchBuilderResolverStack.push( resolver ); } diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/internal/ResultsHelper.java b/hibernate-core/src/main/java/org/hibernate/query/results/internal/ResultsHelper.java index 4cd1674d5b3a..9ed575d8e997 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/results/internal/ResultsHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/query/results/internal/ResultsHelper.java @@ -18,10 +18,6 @@ public static int jdbcPositionToValuesArrayPosition(int jdbcPosition) { return jdbcPosition - 1; } - public static int valuesArrayPositionToJdbcPosition(int valuesArrayPosition) { - return valuesArrayPosition + 1; - } - public static DomainResultCreationStateImpl impl(DomainResultCreationState creationState) { return unwrap( creationState ); } diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteFetchBuilder.java b/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteFetchBuilder.java index 08200af51896..c2632e992c25 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteFetchBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteFetchBuilder.java @@ -8,8 +8,7 @@ /** * @author Steve Ebersole */ -public interface CompleteFetchBuilder extends FetchBuilder, ModelPartReference { - @Override +public interface CompleteFetchBuilder extends FetchBuilder { Fetchable getReferencedPart(); List getColumnAliases(); diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteFetchBuilderBasicPart.java b/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteFetchBuilderBasicPart.java index 7289af1fcaaf..ebb5f5979772 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteFetchBuilderBasicPart.java +++ b/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteFetchBuilderBasicPart.java @@ -25,7 +25,7 @@ /** * @author Steve Ebersole */ -public class CompleteFetchBuilderBasicPart implements CompleteFetchBuilder, FetchBuilderBasicValued, ModelPartReferenceBasic { +public class CompleteFetchBuilderBasicPart implements CompleteFetchBuilder, FetchBuilderBasicValued { private final NavigablePath navigablePath; private final BasicValuedModelPart referencedModelPart; private final String selectionAlias; @@ -44,7 +44,6 @@ public FetchBuilder cacheKeyInstance() { return this; } - @Override public NavigablePath getNavigablePath() { return navigablePath; } diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteFetchBuilderEmbeddableValuedModelPart.java b/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteFetchBuilderEmbeddableValuedModelPart.java index 8672c8ef45ae..829ba7b04a82 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteFetchBuilderEmbeddableValuedModelPart.java +++ b/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteFetchBuilderEmbeddableValuedModelPart.java @@ -23,7 +23,7 @@ * @author Christian Beikov */ public class CompleteFetchBuilderEmbeddableValuedModelPart - implements CompleteFetchBuilder, ModelPartReferenceEmbeddable { + implements CompleteFetchBuilder { private final NavigablePath navigablePath; private final EmbeddableValuedModelPart modelPart; private final List columnAliases; @@ -46,7 +46,6 @@ public FetchBuilder cacheKeyInstance() { ); } - @Override public NavigablePath getNavigablePath() { return navigablePath; } diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteFetchBuilderEntityValuedModelPart.java b/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteFetchBuilderEntityValuedModelPart.java index 07d94c9d172d..3738cec4898d 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteFetchBuilderEntityValuedModelPart.java +++ b/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteFetchBuilderEntityValuedModelPart.java @@ -24,7 +24,7 @@ * @author Christian Beikov */ public class CompleteFetchBuilderEntityValuedModelPart - implements CompleteFetchBuilder, ModelPartReferenceEntity { + implements CompleteFetchBuilder { private final NavigablePath navigablePath; private final EntityValuedFetchable modelPart; private final List columnAliases; @@ -47,7 +47,6 @@ public FetchBuilder cacheKeyInstance() { ); } - @Override public NavigablePath getNavigablePath() { return navigablePath; } diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteResultBuilder.java b/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteResultBuilder.java deleted file mode 100644 index 11f0a19b4d3f..000000000000 --- a/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteResultBuilder.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.hibernate.query.results.internal.complete; - -import org.hibernate.query.results.spi.ResultBuilder; - -/** - * @author Steve Ebersole - */ -public interface CompleteResultBuilder extends ResultBuilder { -} diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteResultBuilderBasicModelPart.java b/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteResultBuilderBasicModelPart.java index 4b608df53f6e..60d980230d2e 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteResultBuilderBasicModelPart.java +++ b/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteResultBuilderBasicModelPart.java @@ -3,6 +3,7 @@ import org.hibernate.metamodel.mapping.BasicValuedModelPart; import org.hibernate.query.results.spi.ResultBuilder; import org.hibernate.query.results.internal.DomainResultCreationStateImpl; +import org.hibernate.query.results.spi.ResultBuilderBasicValued; import org.hibernate.spi.NavigablePath; import org.hibernate.sql.ast.spi.query.select.SqlSelection; import org.hibernate.sql.ast.spi.query.from.TableReference; @@ -19,7 +20,7 @@ * @author Steve Ebersole */ public class CompleteResultBuilderBasicModelPart - implements CompleteResultBuilderBasicValued, ModelPartReferenceBasic { + implements ResultBuilderBasicValued { private final NavigablePath navigablePath; private final BasicValuedModelPart modelPart; private final String columnAlias; @@ -38,12 +39,10 @@ public Class getJavaType() { return modelPart.getExpressibleJavaType().getJavaTypeClass(); } - @Override public NavigablePath getNavigablePath() { return navigablePath; } - @Override public BasicValuedModelPart getReferencedPart() { return modelPart; } diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteResultBuilderBasicValued.java b/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteResultBuilderBasicValued.java deleted file mode 100644 index df051d5e5b06..000000000000 --- a/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteResultBuilderBasicValued.java +++ /dev/null @@ -1,11 +0,0 @@ -package org.hibernate.query.results.internal.complete; - -import org.hibernate.query.results.spi.ResultBuilderBasicValued; - -/** - * Nominal extension to ResultBuilder for cases involving scalar results - * - * @author Steve Ebersole - */ -public interface CompleteResultBuilderBasicValued extends CompleteResultBuilder, ResultBuilderBasicValued { -} diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteResultBuilderBasicValuedConverted.java b/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteResultBuilderBasicValuedConverted.java index 6f27160eb97c..4b6f9d2df023 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteResultBuilderBasicValuedConverted.java +++ b/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteResultBuilderBasicValuedConverted.java @@ -5,6 +5,7 @@ import org.hibernate.query.results.spi.ResultBuilder; import org.hibernate.query.results.internal.DomainResultCreationStateImpl; import org.hibernate.query.results.internal.ResultSetMappingSqlSelection; +import org.hibernate.query.results.spi.ResultBuilderBasicValued; import org.hibernate.resource.beans.spi.ManagedBean; import org.hibernate.sql.ast.spi.query.select.SqlSelection; import org.hibernate.sql.results.graph.DomainResultCreationState; @@ -28,7 +29,7 @@ * * @author Steve Ebersole */ -public class CompleteResultBuilderBasicValuedConverted implements CompleteResultBuilderBasicValued { +public class CompleteResultBuilderBasicValuedConverted implements ResultBuilderBasicValued { private final String explicitColumnName; private final BasicValuedMapping underlyingMapping; private final AttributeConverterBean valueConverter; diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteResultBuilderBasicValuedStandard.java b/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteResultBuilderBasicValuedStandard.java index 258bf837b7f5..ed822efec96c 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteResultBuilderBasicValuedStandard.java +++ b/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteResultBuilderBasicValuedStandard.java @@ -4,6 +4,7 @@ import org.hibernate.query.results.spi.ResultBuilder; import org.hibernate.query.results.internal.DomainResultCreationStateImpl; import org.hibernate.query.results.internal.ResultSetMappingSqlSelection; +import org.hibernate.query.results.spi.ResultBuilderBasicValued; import org.hibernate.sql.ast.spi.query.select.SqlSelection; import org.hibernate.sql.results.graph.DomainResultCreationState; import org.hibernate.sql.results.graph.basic.BasicResult; @@ -25,7 +26,7 @@ * * @author Steve Ebersole */ -public class CompleteResultBuilderBasicValuedStandard implements CompleteResultBuilderBasicValued { +public class CompleteResultBuilderBasicValuedStandard implements ResultBuilderBasicValued { private final String explicitColumnName; diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteResultBuilderCollection.java b/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteResultBuilderCollection.java deleted file mode 100644 index 3aa4c7ef7904..000000000000 --- a/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteResultBuilderCollection.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.hibernate.query.results.internal.complete; - -/** - * @author Steve Ebersole - */ -public interface CompleteResultBuilderCollection extends CompleteResultBuilder { -} diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteResultBuilderCollectionStandard.java b/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteResultBuilderCollectionStandard.java index 98c790db6aec..824f0dda53b9 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteResultBuilderCollectionStandard.java +++ b/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteResultBuilderCollectionStandard.java @@ -6,7 +6,7 @@ import org.hibernate.metamodel.mapping.ModelPart; import org.hibernate.metamodel.mapping.PluralAttributeMapping; import org.hibernate.metamodel.mapping.SelectableConsumer; -import org.hibernate.query.NativeQuery; +import org.hibernate.query.NativeQuery.CollectionReturn; import org.hibernate.query.results.spi.ResultBuilder; import org.hibernate.query.results.internal.DomainResultCreationStateImpl; import org.hibernate.spi.NavigablePath; @@ -24,7 +24,7 @@ /** * @author Steve Ebersole */ -public class CompleteResultBuilderCollectionStandard implements CompleteResultBuilderCollection, NativeQuery.CollectionReturn { +public class CompleteResultBuilderCollectionStandard implements ResultBuilder, CollectionReturn { private final String tableAlias; private final NavigablePath navigablePath; diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteResultBuilderEntityJpa.java b/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteResultBuilderEntityJpa.java index c82ed81a1c43..2427196a593a 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteResultBuilderEntityJpa.java +++ b/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteResultBuilderEntityJpa.java @@ -62,7 +62,6 @@ public Class getJavaType() { return entityDescriptor.getJavaType().getJavaTypeClass(); } - @Override public NavigablePath getNavigablePath() { return navigablePath; } diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteResultBuilderEntityValued.java b/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteResultBuilderEntityValued.java index b931889849b8..af09fc5d9f02 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteResultBuilderEntityValued.java +++ b/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteResultBuilderEntityValued.java @@ -7,7 +7,6 @@ * @author Steve Ebersole */ public interface CompleteResultBuilderEntityValued - extends CompleteResultBuilder, ModelPartReferenceEntity, ResultBuilderEntityValued { - @Override + extends ResultBuilderEntityValued { EntityMappingType getReferencedPart(); } diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteResultBuilderInstantiation.java b/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteResultBuilderInstantiation.java index 6df6ff1f4588..d8db5e7dfd73 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteResultBuilderInstantiation.java +++ b/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteResultBuilderInstantiation.java @@ -19,7 +19,7 @@ * @author Steve Ebersole */ public class CompleteResultBuilderInstantiation - implements CompleteResultBuilder, ResultBuilderInstantiationValued { + implements ResultBuilderInstantiationValued { private final JavaType javaType; private final List argumentResultBuilders; diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/DelayedFetchBuilderBasicPart.java b/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/DelayedFetchBuilderBasicPart.java index 2fa74e0b0b07..f5ac8675068d 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/DelayedFetchBuilderBasicPart.java +++ b/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/DelayedFetchBuilderBasicPart.java @@ -17,7 +17,7 @@ * @author Christian Beikov */ public class DelayedFetchBuilderBasicPart - implements CompleteFetchBuilder, FetchBuilderBasicValued, ModelPartReferenceBasic { + implements CompleteFetchBuilder, FetchBuilderBasicValued { private final NavigablePath navigablePath; private final BasicValuedModelPart referencedModelPart; private final boolean isEnhancedForLazyLoading; @@ -36,7 +36,6 @@ public FetchBuilder cacheKeyInstance() { return this; } - @Override public NavigablePath getNavigablePath() { return navigablePath; } diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/ModelPartReference.java b/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/ModelPartReference.java deleted file mode 100644 index ee004f131d6a..000000000000 --- a/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/ModelPartReference.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.hibernate.query.results.internal.complete; - -import org.hibernate.metamodel.mapping.ModelPart; -import org.hibernate.spi.NavigablePath; -import org.hibernate.query.results.spi.FetchBuilder; -import org.hibernate.query.results.spi.ResultBuilder; - -/** - * A {@link ResultBuilder} or {@link FetchBuilder} that refers to some part - * of the user's domain model - * - * @author Steve Ebersole - */ -public interface ModelPartReference { - NavigablePath getNavigablePath(); - - /** - * The part of the domain model that is referenced - */ - ModelPart getReferencedPart(); -} diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/ModelPartReferenceBasic.java b/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/ModelPartReferenceBasic.java deleted file mode 100644 index ec3020e71ab6..000000000000 --- a/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/ModelPartReferenceBasic.java +++ /dev/null @@ -1,11 +0,0 @@ -package org.hibernate.query.results.internal.complete; - -import org.hibernate.metamodel.mapping.BasicValuedModelPart; - -/** - * @author Steve Ebersole - */ -public interface ModelPartReferenceBasic extends ModelPartReference { - @Override - BasicValuedModelPart getReferencedPart(); -} diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/ModelPartReferenceEmbeddable.java b/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/ModelPartReferenceEmbeddable.java deleted file mode 100644 index 3541609f103a..000000000000 --- a/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/ModelPartReferenceEmbeddable.java +++ /dev/null @@ -1,11 +0,0 @@ -package org.hibernate.query.results.internal.complete; - -import org.hibernate.metamodel.mapping.EmbeddableValuedModelPart; - -/** - * @author Steve Ebersole - */ -public interface ModelPartReferenceEmbeddable extends ModelPartReference { - @Override - EmbeddableValuedModelPart getReferencedPart(); -} diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/ModelPartReferenceEntity.java b/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/ModelPartReferenceEntity.java deleted file mode 100644 index 911627f9ca09..000000000000 --- a/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/ModelPartReferenceEntity.java +++ /dev/null @@ -1,11 +0,0 @@ -package org.hibernate.query.results.internal.complete; - -import org.hibernate.metamodel.mapping.EntityValuedModelPart; - -/** - * @author Steve Ebersole - */ -public interface ModelPartReferenceEntity extends ModelPartReference { - @Override - EntityValuedModelPart getReferencedPart(); -} diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/internal/dynamic/DynamicResultBuilderBasicStandard.java b/hibernate-core/src/main/java/org/hibernate/query/results/internal/dynamic/DynamicResultBuilderBasicStandard.java index 870ee7c84196..8ef214691db5 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/results/internal/dynamic/DynamicResultBuilderBasicStandard.java +++ b/hibernate-core/src/main/java/org/hibernate/query/results/internal/dynamic/DynamicResultBuilderBasicStandard.java @@ -43,16 +43,6 @@ public DynamicResultBuilderBasicStandard(String columnName, String resultAlias) this.explicitJavaType = null; } - public DynamicResultBuilderBasicStandard(int columnPosition) { - assert columnPosition > 0; - this.columnName = "c" + columnPosition; - this.columnPosition = columnPosition; - this.resultAlias = columnName; - - this.explicitType = null; - this.explicitJavaType = null; - } - public DynamicResultBuilderBasicStandard(String columnName, String resultAlias, JavaType explicitJavaType) { assert columnName != null; this.columnName = columnName; @@ -100,10 +90,6 @@ public Class getJavaType() { return null; } - public String getColumnName() { - return columnName; - } - @Override @Nonnull public DynamicResultBuilderBasicStandard cacheKeyInstance() { diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/internal/implicit/ImplicitModelPartResultBuilder.java b/hibernate-core/src/main/java/org/hibernate/query/results/internal/implicit/ImplicitModelPartResultBuilder.java deleted file mode 100644 index c8f7157a6353..000000000000 --- a/hibernate-core/src/main/java/org/hibernate/query/results/internal/implicit/ImplicitModelPartResultBuilder.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.hibernate.query.results.internal.implicit; - -import org.hibernate.query.results.spi.ResultBuilder; - -/** - * @author Steve Ebersole - */ -public interface ImplicitModelPartResultBuilder extends ResultBuilder { -} diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/internal/implicit/ImplicitModelPartResultBuilderEntity.java b/hibernate-core/src/main/java/org/hibernate/query/results/internal/implicit/ImplicitModelPartResultBuilderEntity.java index e83071b3c9f6..436dcccc2d7f 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/results/internal/implicit/ImplicitModelPartResultBuilderEntity.java +++ b/hibernate-core/src/main/java/org/hibernate/query/results/internal/implicit/ImplicitModelPartResultBuilderEntity.java @@ -16,7 +16,7 @@ * @author Steve Ebersole */ public class ImplicitModelPartResultBuilderEntity - implements ImplicitModelPartResultBuilder, ResultBuilderEntityValued { + implements ResultBuilderEntityValued { private final NavigablePath navigablePath; private final EntityValuedModelPart modelPart; diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/internal/jpa/AbstractMappingElementBuilder.java b/hibernate-core/src/main/java/org/hibernate/query/results/internal/jpa/AbstractMappingElementBuilder.java index 36d870e24628..4f9aed9c655f 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/results/internal/jpa/AbstractMappingElementBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/query/results/internal/jpa/AbstractMappingElementBuilder.java @@ -7,26 +7,19 @@ * @author Steve Ebersole */ public abstract class AbstractMappingElementBuilder implements MappingElementBuilder { - protected final String alias; protected final JavaType javaType; protected final SessionFactoryImplementor sessionFactory; public AbstractMappingElementBuilder(String alias, Class javaType, SessionFactoryImplementor sessionFactory) { - this( alias, sessionFactory.getTypeConfiguration().getJavaTypeRegistry().resolveDescriptor( javaType ), sessionFactory ); + this( sessionFactory.getTypeConfiguration().getJavaTypeRegistry().resolveDescriptor( javaType ), sessionFactory ); } - public AbstractMappingElementBuilder(String alias, JavaType javaType, SessionFactoryImplementor sessionFactory) { - this.alias = alias; + public AbstractMappingElementBuilder(JavaType javaType, SessionFactoryImplementor sessionFactory) { this.javaType = javaType; this.sessionFactory = sessionFactory; } - @Override - public String getAlias() { - return alias; - } - @Override public Class getJavaType() { return javaType.getJavaTypeClass(); diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/internal/jpa/MappingElementBuilder.java b/hibernate-core/src/main/java/org/hibernate/query/results/internal/jpa/MappingElementBuilder.java index a67cd87a66bc..fafa8c9b31fb 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/results/internal/jpa/MappingElementBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/query/results/internal/jpa/MappingElementBuilder.java @@ -7,9 +7,6 @@ /// /// @author Steve Ebersole public interface MappingElementBuilder extends ResultBuilder { - /// @see jakarta.persistence.sql.MappingElement#getAlias() - String getAlias(); - /// @see jakarta.persistence.sql.MappingElement#getJavaType() Class getJavaType(); } diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/internal/jpa/TupleBuilder.java b/hibernate-core/src/main/java/org/hibernate/query/results/internal/jpa/TupleBuilder.java index 692a20b4c35d..5539eeca328a 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/results/internal/jpa/TupleBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/query/results/internal/jpa/TupleBuilder.java @@ -19,7 +19,7 @@ public class TupleBuilder extends AbstractMappingElementBuilder implement private final ResultBuilder[] elementBuilders; public TupleBuilder(TupleMapping tupleMapping, SessionFactoryImplementor sessionFactory) { - super( null, sessionFactory.getTypeConfiguration().getJavaTypeRegistry().resolveDescriptor( Tuple.class ), sessionFactory ); + super( sessionFactory.getTypeConfiguration().getJavaTypeRegistry().resolveDescriptor( Tuple.class ), sessionFactory ); this.elementBuilders = new ResultBuilder[ tupleMapping.elements().length ]; final TupleMetadataBuilder metadataBuilder = new TupleMetadataBuilder( tupleMapping.elements().length ); diff --git a/hibernate-core/src/main/java/org/hibernate/query/sql/internal/ResultSetMappingProcessor.java b/hibernate-core/src/main/java/org/hibernate/query/sql/internal/ResultSetMappingProcessor.java index 3f1094c0772b..bd67377378fe 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sql/internal/ResultSetMappingProcessor.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sql/internal/ResultSetMappingProcessor.java @@ -598,10 +598,6 @@ public String getCollectionSuffix(String alias) { return alias2CollectionSuffix.get( alias ); } - public String getOwnerAlias(String alias) { - return alias2OwnerAlias.get( alias ); - } - @Override public Map getPropertyResultsMap(String alias) { final var collectionMap = collectionPropertyResultMaps.get( alias ); diff --git a/hibernate-core/src/main/java/org/hibernate/query/sql/internal/SQLQueryParser.java b/hibernate-core/src/main/java/org/hibernate/query/sql/internal/SQLQueryParser.java index 2f40d61b9c90..b0ad65f79ce1 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sql/internal/SQLQueryParser.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sql/internal/SQLQueryParser.java @@ -55,10 +55,6 @@ public boolean queryHasAliases() { return aliasesFound>0; } - protected String getOriginalQueryString() { - return originalQueryString; - } - public String process() { return substituteBrackets( originalQueryString ); } diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/DomainParameterXref.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/DomainParameterXref.java index f04043ae3e93..1b5d344ac6ec 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/DomainParameterXref.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/DomainParameterXref.java @@ -146,10 +146,6 @@ public SqmStatement.ParameterResolutions getParameterResolutions() { return parameterResolutions; } - public List> getSqmParameters(QueryParameterImplementor queryParameter) { - return sqmParamsByQueryParam.get( queryParameter ); - } - public QueryParameterImplementor getQueryParameter(SqmParameter sqmParameter) { return sqmParameter instanceof QueryParameterImplementor parameterImplementor ? parameterImplementor diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmTreePrinter.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmTreePrinter.java index 1c5df0d59bc1..6521c1c83182 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmTreePrinter.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmTreePrinter.java @@ -1,7 +1,6 @@ package org.hibernate.query.sqm.internal; import java.util.List; -import java.util.Locale; import jakarta.annotation.Nullable; import org.hibernate.query.sqm.spi.DiscriminatorSqmPath; @@ -245,38 +244,12 @@ private void logWithIndentation(String pattern, Object arg1) { logWithIndentation( String.format( pattern, arg1 ) ); } - private void logWithIndentation(String pattern, Object arg1, Object arg2) { - logWithIndentation( String.format( pattern, arg1, arg2 ) ); - } - - private void logWithIndentation(String pattern, Object... args) { - logWithIndentation( String.format( pattern, args ) ); - } - private void logIndented(String line) { depth++; logWithIndentation( line ); depth--; } - private void logIndented(String pattern, Object arg) { - depth++; - logWithIndentation( String.format( Locale.ROOT, pattern, arg ) ); - depth--; - } - - private void logIndented(String pattern, Object arg1, Object arg2) { - depth++; - logWithIndentation( String.format( Locale.ROOT, pattern, arg1, arg2 ) ); - depth--; - } - - private void logIndented(String pattern, Object... args) { - depth++; - logWithIndentation( String.format( Locale.ROOT, pattern, args ) ); - depth--; - } - // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // statements diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmUtil.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmUtil.java index 793ef526e84c..fe1d6ca46eef 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmUtil.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmUtil.java @@ -33,10 +33,8 @@ import org.hibernate.metamodel.mapping.ValuedModelPart; import org.hibernate.metamodel.mapping.internal.ToOneAttributeMapping; import org.hibernate.metamodel.model.domain.BasicDomainType; -import org.hibernate.metamodel.model.domain.EntityDomainType; import org.hibernate.metamodel.model.domain.IdentifiableDomainType; import org.hibernate.metamodel.model.domain.internal.EntitySqmPathSource; -import org.hibernate.query.IllegalMutationQueryException; import org.hibernate.query.IllegalQueryOperationException; import org.hibernate.query.IllegalSelectQueryException; import org.hibernate.query.Order; @@ -59,7 +57,6 @@ import org.hibernate.query.sqm.tree.spi.SqmStatement; import org.hibernate.query.sqm.tree.spi.delete.SqmDeleteStatement; import org.hibernate.query.sqm.tree.spi.domain.SqmPath; -import org.hibernate.query.sqm.tree.spi.domain.SqmSingularJoin; import org.hibernate.query.sqm.tree.spi.expression.JpaCriteriaParameter; import org.hibernate.query.sqm.tree.spi.expression.SqmAliasedNodeRef; import org.hibernate.query.sqm.tree.spi.expression.SqmExpression; @@ -101,7 +98,6 @@ import org.hibernate.type.internal.ConvertedBasicTypeImpl; import jakarta.persistence.Tuple; -import jakarta.persistence.metamodel.Type; import jakarta.annotation.Nullable; import static java.util.Collections.emptyList; @@ -196,20 +192,6 @@ public static IllegalQueryOperationException expectingNonSelect(SqmStatement ); } - public static void verifyIsRestrictedMutation(SqmStatement sqm, String hqlString) { - if ( ! isRestrictedMutation( sqm ) ) { - throw new IllegalMutationQueryException( - String.format( - Locale.ROOT, - "Expecting a restricted mutation query [%s], but found %s", - SqmDeleteOrUpdateStatement.class.getName(), - sqm.getClass().getName() - ), - hqlString - ); - } - } - public static @Nullable String determineAffectedTableName(TableGroup tableGroup, ValuedModelPart mapping) { return tableGroup.getModelPart() instanceof EntityAssociationMapping associationMapping && !associationMapping.containsTableReference( mapping.getContainingTableExpression() ) @@ -318,33 +300,6 @@ private static CollectionPart getCollectionPart(PluralAttributeMapping attribute }; } - /** - * Utility that returns {@code false} when the provided {@link SqmPath sqmPath} is - * a join that cannot be dereferenced through the foreign key on the associated table, - * i.e. a join that's neither {@linkplain SqmJoinType#INNER} nor {@linkplain SqmJoinType#LEFT} - * or one that has an explicit on clause predicate. - * - * @deprecated Use {@link #isFkOptimizationAllowed(SqmPath, EntityAssociationMapping)} instead - */ - @Deprecated(forRemoval = true, since = "6.6.1") - public static boolean isFkOptimizationAllowed(SqmPath sqmPath) { - if ( sqmPath instanceof SqmJoin sqmJoin ) { - switch ( sqmJoin.getSqmJoinType() ) { - case LEFT: - final var associationMapping = resolveAssociationMapping( sqmJoin ); - if ( associationMapping != null && isFiltered( associationMapping ) ) { - return false; - } - // FallThrough intended - case INNER: - return sqmJoin.getJoinPredicate() == null; - default: - return false; - } - } - return false; - } - /** * Utility that returns {@code false} when the provided {@link SqmPath sqmPath} is * a join that cannot be dereferenced through the foreign key on the associated table, @@ -392,46 +347,6 @@ private static boolean isFiltered(EntityAssociationMapping associationMapping) { || entityMappingType.getIdentifierMappingForJoin() != entityMappingType.getIdentifierMapping(); } - private static @Nullable EntityAssociationMapping resolveAssociationMapping(SqmJoin sqmJoin) { - return sqmJoin instanceof SqmSingularJoin singularJoin - && singularJoin.getAttribute().getPathType() instanceof EntityDomainType - ? resolveAssociationMapping( singularJoin ) - : null; - } - - private static @Nullable EntityAssociationMapping resolveAssociationMapping(SqmSingularJoin sqmJoin) { - final var metamodel = sqmJoin.nodeBuilder().getMappingMetamodel(); - var attribute = sqmJoin.getAttribute(); - var declaringType = attribute.getDeclaringType(); - if ( declaringType.getPersistenceType() != Type.PersistenceType.ENTITY ) { - final var pathBuilder = new StringBuilder(); - do { - if ( !pathBuilder.isEmpty() ) { - pathBuilder.insert(0, '.'); - } - pathBuilder.insert( 0, attribute.getName() ); - if ( sqmJoin.getLhs() instanceof SqmSingularJoin sqmSingularJoin ) { - sqmJoin = sqmSingularJoin; - attribute = sqmJoin.getAttribute(); - declaringType = attribute.getDeclaringType(); - } - else { - return null; - } - } while ( declaringType.getPersistenceType() != Type.PersistenceType.ENTITY ); - pathBuilder.insert(0, '.'); - pathBuilder.insert( 0, attribute.getName() ); - return (EntityAssociationMapping) - metamodel.getEntityDescriptor( ( (EntityDomainType) declaringType ).getHibernateEntityName() ) - .findByPath( pathBuilder.toString() ); - } - else { - return (EntityAssociationMapping) - metamodel.getEntityDescriptor( ( (EntityDomainType) declaringType ).getHibernateEntityName() ) - .findAttributeMapping( attribute.getName() ); - } - } - public static List getWhereClauseNavigablePaths(SqmQuerySpec querySpec) { final var where = querySpec.getWhereClause(); return where == null || where.getPredicate() == null diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/DeleteHandler.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/DeleteHandler.java deleted file mode 100644 index 94d96f46112c..000000000000 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/DeleteHandler.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.hibernate.query.sqm.mutation.internal; - -import org.hibernate.query.sqm.mutation.spi.MultiTableHandler; - -/** - * Handler for dealing with multi-table SQM DELETE queries. - */ -public interface DeleteHandler extends MultiTableHandler { -} diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/MultiTableSqmMutationConverter.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/MultiTableSqmMutationConverter.java index 6464962613db..0f62574e5a23 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/MultiTableSqmMutationConverter.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/MultiTableSqmMutationConverter.java @@ -80,8 +80,7 @@ public MultiTableSqmMutationConverter( final SqlAstProcessingStateImpl rootProcessingState = new SqlAstProcessingStateImpl( null, - this, - getCurrentClauseStack()::getCurrent + this ); pushProcessingState( rootProcessingState ); diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/UpdateHandler.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/UpdateHandler.java deleted file mode 100644 index c507c88ff09c..000000000000 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/UpdateHandler.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.hibernate.query.sqm.mutation.internal; - -import org.hibernate.query.sqm.mutation.spi.MultiTableHandler; - -/** - * Handler for dealing with multi-table SQM UPDATE queries. - */ -public interface UpdateHandler extends MultiTableHandler { -} diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteDeleteHandler.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteDeleteHandler.java index 6de2b4954355..d439c7924f7b 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteDeleteHandler.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteDeleteHandler.java @@ -13,7 +13,6 @@ import org.hibernate.metamodel.mapping.PluralAttributeMapping; import org.hibernate.query.spi.DomainQueryExecutionContext; import org.hibernate.query.sqm.internal.DomainParameterXref; -import org.hibernate.query.sqm.mutation.internal.DeleteHandler; import org.hibernate.query.sqm.mutation.internal.MultiTableSqmMutationConverter; import org.hibernate.query.sqm.mutation.internal.SqmMutationStrategyHelper; import org.hibernate.query.sqm.sql.internal.SqlAstQueryPartProcessingStateImpl; @@ -38,7 +37,7 @@ * * @author Christian Beikov */ -public class CteDeleteHandler extends AbstractCteMutationHandler implements DeleteHandler { +public class CteDeleteHandler extends AbstractCteMutationHandler { private static final String DELETE_RESULT_TABLE_NAME_PREFIX = "delete_cte_"; protected CteDeleteHandler( diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteInsertStrategy.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteInsertStrategy.java index 1588dadffa59..aab2647379bb 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteInsertStrategy.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteInsertStrategy.java @@ -88,8 +88,6 @@ /// @author Christian Beikov public class CteInsertStrategy implements SqmMultiTableInsertStrategy { public static final String SHORT_NAME = "cte"; - - private final EntityPersister rootDescriptor; private final SessionFactoryImplementor sessionFactory; private final CteTable entityCteTable; @@ -102,7 +100,6 @@ public CteInsertStrategy( public CteInsertStrategy( EntityPersister rootDescriptor, RuntimeModelCreationContext runtimeModelCreationContext) { - this.rootDescriptor = rootDescriptor; this.sessionFactory = runtimeModelCreationContext.getSessionFactory(); final Dialect dialect = runtimeModelCreationContext.getDialect(); @@ -149,14 +146,6 @@ public MultiTableHandlerBuildResult buildHandler(SqmInsertStatement sqmInsert return new MultiTableHandlerBuildResult( multiTableHandler, firstJdbcParameterBindings.get() ); } - protected EntityPersister getRootDescriptor() { - return rootDescriptor; - } - - protected SessionFactoryImplementor getSessionFactory() { - return sessionFactory; - } - protected CteTable getEntityCteTable() { return entityCteTable; } diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteUpdateHandler.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteUpdateHandler.java index e93bf82a1f4e..c6575a7e007b 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteUpdateHandler.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteUpdateHandler.java @@ -19,7 +19,6 @@ import org.hibernate.query.sqm.ComparisonOperator; import org.hibernate.query.sqm.internal.DomainParameterXref; import org.hibernate.query.sqm.mutation.internal.MultiTableSqmMutationConverter; -import org.hibernate.query.sqm.mutation.internal.UpdateHandler; import org.hibernate.query.sqm.tree.spi.expression.SqmParameter; import org.hibernate.query.sqm.tree.spi.update.SqmSetClause; import org.hibernate.query.sqm.tree.spi.update.SqmUpdateStatement; @@ -51,7 +50,7 @@ * * @author Christian Beikov */ -public class CteUpdateHandler extends AbstractCteMutationHandler implements UpdateHandler { +public class CteUpdateHandler extends AbstractCteMutationHandler { private static final String UPDATE_RESULT_TABLE_NAME_PREFIX = "update_cte_"; private static final String INSERT_RESULT_TABLE_NAME_PREFIX = "insert_cte_"; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/inline/InlineDeleteHandler.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/inline/InlineDeleteHandler.java index 135800b05441..a09905c22269 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/inline/InlineDeleteHandler.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/inline/InlineDeleteHandler.java @@ -15,7 +15,6 @@ import org.hibernate.query.spi.DomainQueryExecutionContext; import org.hibernate.query.sqm.internal.DomainParameterXref; import org.hibernate.query.sqm.internal.SqmJdbcExecutionContextAdapter; -import org.hibernate.query.sqm.mutation.internal.DeleteHandler; import org.hibernate.query.sqm.mutation.internal.MatchingIdSelectionHelper; import static org.hibernate.query.sqm.mutation.internal.SqmMutationStrategyHelper.softDeleteTargets; import org.hibernate.query.sqm.mutation.internal.SqmMutationStrategyHelper; @@ -46,7 +45,7 @@ * @author Vlad Mihalcea * @author Steve Ebersole */ -public class InlineDeleteHandler extends AbstractInlineHandler implements DeleteHandler { +public class InlineDeleteHandler extends AbstractInlineHandler { private final List tableDeleters; @@ -239,9 +238,4 @@ protected JdbcOperationQueryMutation createMutation(TableDeleter tableDeleter, L return sqlAstTranslatorFactory.buildTranslator( new SqlAstTranslationRequest.QueryMutation( sessionFactory, statement ) ) .translate( JdbcParameterBindings.NO_BINDINGS, executionContext.getQueryOptions() ); } - - // For Hibernate Reactive - protected List getTableDeleters() { - return tableDeleters; - } } diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/inline/InlineUpdateHandler.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/inline/InlineUpdateHandler.java index 306fdd959e8d..92c493cdafbf 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/inline/InlineUpdateHandler.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/inline/InlineUpdateHandler.java @@ -21,7 +21,6 @@ import org.hibernate.query.sqm.internal.SqmJdbcExecutionContextAdapter; import org.hibernate.query.sqm.internal.SqmUtil; import org.hibernate.query.sqm.mutation.internal.MatchingIdSelectionHelper; -import org.hibernate.query.sqm.mutation.internal.UpdateHandler; import org.hibernate.query.sqm.spi.SqmParameterMappingModelResolutionAccess; import org.hibernate.query.sqm.sql.spi.SqmTranslation; import org.hibernate.query.sqm.sql.spi.SqmTranslator; @@ -74,7 +73,7 @@ /** * @author Steve Ebersole */ -public class InlineUpdateHandler extends AbstractInlineHandler implements UpdateHandler { +public class InlineUpdateHandler extends AbstractInlineHandler { private final Map, Map, List>> jdbcParamsXref; private final Map, MappingModelExpressible> resolvedParameterMappingModelTypes; @@ -243,11 +242,6 @@ protected record TableUpdater( Supplier> tableKeyColumnVisitationSupplier ) {} - // For Hibernate Reactive - protected List getTableUpdaters() { - return tableUpdaters; - } - private TableUpdater createTableUpdater( String tableExpression, Supplier> tableKeyColumnVisitationSupplier, diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/LocalTemporaryTableStrategy.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/LocalTemporaryTableStrategy.java index 8d7b313937b1..74df6d9e1cea 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/LocalTemporaryTableStrategy.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/LocalTemporaryTableStrategy.java @@ -61,8 +61,4 @@ public TemporaryTable getTemporaryTable() { public boolean isDropIdTables() { return dropIdTables; } - - public SessionFactoryImplementor getSessionFactory() { - return sessionFactory; - } } diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/PersistentTableStrategy.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/PersistentTableStrategy.java index 2e87c8647da3..b59074b1b3a3 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/PersistentTableStrategy.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/PersistentTableStrategy.java @@ -164,8 +164,4 @@ public void release( public TemporaryTable getTemporaryTable() { return temporaryTable; } - - public SessionFactoryImplementor getSessionFactory() { - return sessionFactory; - } } diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/TableBasedDeleteHandler.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/TableBasedDeleteHandler.java index b6830cbab786..a9c45081ac5e 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/TableBasedDeleteHandler.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/TableBasedDeleteHandler.java @@ -17,7 +17,6 @@ import org.hibernate.query.sqm.internal.DomainParameterXref; import org.hibernate.query.sqm.internal.SqmUtil; import org.hibernate.query.sqm.mutation.internal.AbstractMutationHandler; -import org.hibernate.query.sqm.mutation.internal.DeleteHandler; import org.hibernate.query.sqm.mutation.internal.MultiTableSqmMutationConverter; import org.hibernate.query.sqm.mutation.internal.TableKeyExpressionCollector; import org.hibernate.query.sqm.mutation.spi.AfterUseAction; @@ -69,8 +68,7 @@ * @author Steve Ebersole */ public class TableBasedDeleteHandler - extends AbstractMutationHandler - implements DeleteHandler { + extends AbstractMutationHandler { private static final Logger LOG = Logger.getLogger( TableBasedDeleteHandler.class ); private final TemporaryTable idTable; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/TableBasedInsertHandler.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/TableBasedInsertHandler.java index 2788be3f7d04..9b3c2c1e2553 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/TableBasedInsertHandler.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/TableBasedInsertHandler.java @@ -1022,10 +1022,6 @@ private NamedTableReference resolveUnionTableReference(TableReference tableRefer } } - public SqmInsertStatement getSqmInsertStatement() { - return (SqmInsertStatement) getSqmStatement(); - } - @Override public int execute(JdbcParameterBindings jdbcParameterBindings, DomainQueryExecutionContext context) { if ( LOG.isTraceEnabled() ) { diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/TableBasedSoftDeleteHandler.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/TableBasedSoftDeleteHandler.java index 91a1a7bf990d..7464a809854b 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/TableBasedSoftDeleteHandler.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/TableBasedSoftDeleteHandler.java @@ -18,7 +18,6 @@ import org.hibernate.query.sqm.internal.SqmJdbcExecutionContextAdapter; import org.hibernate.query.sqm.internal.SqmUtil; import org.hibernate.query.sqm.mutation.internal.AbstractMutationHandler; -import org.hibernate.query.sqm.mutation.internal.DeleteHandler; import org.hibernate.query.sqm.mutation.internal.MultiTableSqmMutationConverter; import static org.hibernate.dialect.sql.ast.spi.SubquerySupport.Feature.MUTATION_TARGET_REFERENCE; import static org.hibernate.query.sqm.mutation.internal.SqmMutationStrategyHelper.softDeleteTargets; @@ -65,8 +64,7 @@ * @author Steve Ebersole */ public class TableBasedSoftDeleteHandler - extends AbstractMutationHandler - implements DeleteHandler { + extends AbstractMutationHandler { private static final Logger LOG = Logger.getLogger( TableBasedSoftDeleteHandler.class ); private final TemporaryTable idTable; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/TableBasedUpdateHandler.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/TableBasedUpdateHandler.java index e085a19b9b10..6603e7fb9342 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/TableBasedUpdateHandler.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/TableBasedUpdateHandler.java @@ -24,7 +24,6 @@ import org.hibernate.query.sqm.mutation.internal.AbstractMutationHandler; import org.hibernate.query.sqm.mutation.internal.MultiTableSqmMutationConverter; import org.hibernate.query.sqm.mutation.internal.TableKeyExpressionCollector; -import org.hibernate.query.sqm.mutation.internal.UpdateHandler; import org.hibernate.query.sqm.mutation.spi.AfterUseAction; import org.hibernate.query.sqm.spi.SqmParameterMappingModelResolutionAccess; import org.hibernate.query.sqm.tree.spi.expression.SqmParameter; @@ -83,8 +82,7 @@ * @author Steve Ebersole */ public class TableBasedUpdateHandler - extends AbstractMutationHandler - implements UpdateHandler { + extends AbstractMutationHandler { private static final Logger LOG = Logger.getLogger( TableBasedUpdateHandler.class ); private final TemporaryTable idTable; @@ -716,9 +714,4 @@ protected CacheableSqmInterpretation getSessionUidAccess() { return sessionUidAccess; } - - // For Hibernate reactive - protected @Nullable JdbcParameter getSessionUidParameter() { - return sessionUidParameter; - } } diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/spi/SqmCreationHelper.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/spi/SqmCreationHelper.java index 6ccba255f1c1..33cc4c47c275 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/spi/SqmCreationHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/spi/SqmCreationHelper.java @@ -1,12 +1,9 @@ package org.hibernate.query.sqm.spi; -import java.util.List; - import jakarta.annotation.Nullable; import org.hibernate.Internal; import org.hibernate.metamodel.mapping.CollectionPart; import org.hibernate.metamodel.model.domain.PluralPersistentAttribute; -import org.hibernate.query.criteria.JpaPredicate; import org.hibernate.query.sqm.tree.spi.domain.SqmPath; import org.hibernate.query.sqm.tree.spi.predicate.SqmJunctionPredicate; import org.hibernate.query.sqm.tree.spi.predicate.SqmPredicate; @@ -17,8 +14,6 @@ import java.util.concurrent.atomic.AtomicLong; -import static org.hibernate.internal.util.collections.CollectionHelper.isEmpty; - /** * @author Steve Ebersole */ @@ -105,45 +100,6 @@ public static NavigablePath buildSubNavigablePath(SqmPath lhs, String subNavi return buildSubNavigablePath( buildParentNavigablePath( lhs, subNavigable ), subNavigable, alias ); } - @Nullable - public static SqmPredicate combinePredicates(@Nullable SqmPredicate baseRestriction, @Nullable List incomingRestrictions) { - if ( incomingRestrictions == null || incomingRestrictions.isEmpty() ) { - return baseRestriction; - } - - SqmPredicate combined = combinePredicates( null, baseRestriction ); - for ( int i = 0; i < incomingRestrictions.size(); i++ ) { - combined = combinePredicates( combined, (SqmPredicate) incomingRestrictions.get(i) ); - } - return combined; - } - - @Nullable - public static SqmPredicate combinePredicates(@Nullable SqmPredicate baseRestriction, @Nullable JpaPredicate... incomingRestrictions) { - if ( isEmpty( incomingRestrictions ) ) { - return baseRestriction; - } - - SqmPredicate combined = combinePredicates( null, baseRestriction ); - for ( int i = 0; i < incomingRestrictions.length; i++ ) { - combined = combinePredicates( combined, incomingRestrictions[i] ); - } - return combined; - } - - @Nullable - public static SqmPredicate combinePredicates(@Nullable SqmPredicate baseRestriction, @Nullable Predicate... incomingRestrictions) { - if ( isEmpty( incomingRestrictions ) ) { - return baseRestriction; - } - - SqmPredicate combined = combinePredicates( null, baseRestriction ); - for ( int i = 0; i < incomingRestrictions.length; i++ ) { - combined = combinePredicates( combined, incomingRestrictions[i] ); - } - return combined; - } - @Nullable public static SqmPredicate combinePredicates(@Nullable SqmPredicate baseRestriction, @Nullable SqmPredicate incomingRestriction) { diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/AbstractSqlAstQueryNodeProcessingStateImpl.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/AbstractSqlAstQueryNodeProcessingStateImpl.java index baa8d5f3b564..959663687941 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/AbstractSqlAstQueryNodeProcessingStateImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/AbstractSqlAstQueryNodeProcessingStateImpl.java @@ -24,7 +24,7 @@ public AbstractSqlAstQueryNodeProcessingStateImpl( SqlAstProcessingState parent, SqlAstCreationState creationState, Supplier currentClauseAccess) { - super( parent, creationState, currentClauseAccess ); + super( parent, creationState); } public AbstractSqlAstQueryNodeProcessingStateImpl( @@ -32,7 +32,7 @@ public AbstractSqlAstQueryNodeProcessingStateImpl( SqlAstCreationState creationState, Function expressionResolverDecorator, Supplier currentClauseAccess) { - super( parent, creationState, expressionResolverDecorator, currentClauseAccess ); + super( parent, creationState, expressionResolverDecorator); } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/EntityValuedPathInterpretation.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/EntityValuedPathInterpretation.java index 53481627f9c9..b76c5a04cac5 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/EntityValuedPathInterpretation.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/EntityValuedPathInterpretation.java @@ -430,26 +430,6 @@ private static boolean supportsFunctionalDependency(Dialect dialect, EntityMappi return false; } - public EntityValuedPathInterpretation( - Expression sqlExpression, - NavigablePath navigablePath, - TableGroup tableGroup, - EntityValuedModelPart mapping) { - this( sqlExpression, navigablePath, tableGroup, mapping, - mapping instanceof ValuedModelPart valuedModelPart - ? determineAffectedTableName( tableGroup, valuedModelPart ) - : null ); - } - - public EntityValuedPathInterpretation( - Expression sqlExpression, - NavigablePath navigablePath, - TableGroup tableGroup, - EntityValuedModelPart mapping, - @Nullable String affectedTableName) { - this( sqlExpression, navigablePath, tableGroup, mapping, affectedTableName, mapping ); - } - private EntityValuedPathInterpretation( Expression sqlExpression, NavigablePath navigablePath, diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/SqlAstProcessingStateImpl.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/SqlAstProcessingStateImpl.java index 8dcd7203e8b4..f853e89d5211 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/SqlAstProcessingStateImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/SqlAstProcessingStateImpl.java @@ -6,10 +6,8 @@ import java.util.List; import java.util.Map; import java.util.function.Function; -import java.util.function.Supplier; import org.hibernate.query.sqm.sql.spi.ConversionException; -import org.hibernate.sql.ast.spi.translation.Clause; import org.hibernate.sql.ast.spi.creation.SqlAstCreationState; import org.hibernate.sql.ast.spi.creation.SqlAstProcessingState; import org.hibernate.sql.ast.spi.creation.SqlExpressionResolver; @@ -30,29 +28,24 @@ public class SqlAstProcessingStateImpl private final SqlAstProcessingState parentState; private final SqlAstCreationState creationState; private final SqlExpressionResolver expressionResolver; - private final Supplier currentClauseAccess; private final Map expressionMap = new HashMap<>(); public SqlAstProcessingStateImpl( SqlAstProcessingState parentState, - SqlAstCreationState creationState, - Supplier currentClauseAccess) { + SqlAstCreationState creationState) { this.parentState = parentState; this.creationState = creationState; this.expressionResolver = this; - this.currentClauseAccess = currentClauseAccess; } public SqlAstProcessingStateImpl( SqlAstProcessingState parentState, SqlAstCreationState creationState, - Function expressionResolverDecorator, - Supplier currentClauseAccess) { + Function expressionResolverDecorator) { this.parentState = parentState; this.creationState = creationState; this.expressionResolver = expressionResolverDecorator.apply( this ); - this.currentClauseAccess = currentClauseAccess; } diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/SqlAstQueryNodeProcessingStateImpl.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/SqlAstQueryNodeProcessingStateImpl.java index de6a10638023..2bb004e7f595 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/SqlAstQueryNodeProcessingStateImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/SqlAstQueryNodeProcessingStateImpl.java @@ -1,12 +1,10 @@ package org.hibernate.query.sqm.sql.internal; -import java.util.function.Function; import java.util.function.Supplier; import org.hibernate.sql.ast.spi.translation.Clause; import org.hibernate.sql.ast.spi.creation.SqlAstCreationState; import org.hibernate.sql.ast.spi.creation.SqlAstProcessingState; -import org.hibernate.sql.ast.spi.creation.SqlExpressionResolver; import org.hibernate.sql.ast.spi.query.from.FromClause; import org.hibernate.sql.ast.spi.query.predicate.Predicate; @@ -25,16 +23,6 @@ public SqlAstQueryNodeProcessingStateImpl( this.fromClause = fromClause; } - public SqlAstQueryNodeProcessingStateImpl( - FromClause fromClause, - SqlAstProcessingState parent, - SqlAstCreationState creationState, - Function expressionResolverDecorator, - Supplier currentClauseAccess) { - super( parent, creationState, expressionResolverDecorator, currentClauseAccess ); - this.fromClause = fromClause; - } - @Override public FromClause getFromClause() { return fromClause; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/spi/BaseSqmToSqlAstConverter.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/spi/BaseSqmToSqlAstConverter.java index 7b54657b23c0..5bdf40a99724 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/spi/BaseSqmToSqlAstConverter.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/spi/BaseSqmToSqlAstConverter.java @@ -1205,8 +1205,7 @@ public InsertStatement visitInsertSelectStatement(SqmInsertSelectStatement sq r -> new SqmAliasedNodePositionTracker( r, selectQueryPart.getFirstQuerySpec() - ), - getCurrentClauseStack()::getCurrent + ) ) ); currentClauseStack.push( Clause.INSERT ); @@ -1309,8 +1308,7 @@ public InsertStatement visitInsertValuesStatement(SqmInsertValuesStatement sq pushProcessingState( new SqlAstProcessingStateImpl( null, - this, - getCurrentClauseStack()::getCurrent + this ) ); diff --git a/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/NoSuchBeanException.java b/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/NoSuchBeanException.java index 140653a9afba..c3f2ce7908a7 100644 --- a/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/NoSuchBeanException.java +++ b/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/NoSuchBeanException.java @@ -9,10 +9,6 @@ * @author Steve Ebersole */ public class NoSuchBeanException extends HibernateException { - public NoSuchBeanException(Throwable cause) { - super( cause ); - } - public NoSuchBeanException(String message, Throwable cause) { super( message, cause ); } diff --git a/hibernate-core/src/main/java/org/hibernate/resource/beans/internal/Helper.java b/hibernate-core/src/main/java/org/hibernate/resource/beans/internal/Helper.java index e288fcfeb838..030e0cb5ffc4 100644 --- a/hibernate-core/src/main/java/org/hibernate/resource/beans/internal/Helper.java +++ b/hibernate-core/src/main/java/org/hibernate/resource/beans/internal/Helper.java @@ -21,14 +21,6 @@ public final class Helper { private Helper() { } - public static String determineBeanCacheKey(Class beanType) { - return beanType.getName(); - } - - public static String determineBeanCacheKey(String name, Class beanType) { - return beanType.getName() + ':' + name; - } - public static boolean allowExtensionsInCdi(ServiceRegistry serviceRegistry) { return serviceRegistry.requireService( ConfigurationService.class ) .getSetting( ALLOW_EXTENSIONS_IN_CDI, BOOLEAN, false ); diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/JtaPlatformInaccessibleException.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/JtaPlatformInaccessibleException.java index aa4a1fbdc754..99c28dfde88b 100644 --- a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/JtaPlatformInaccessibleException.java +++ b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/JtaPlatformInaccessibleException.java @@ -11,8 +11,4 @@ public class JtaPlatformInaccessibleException extends HibernateException { public JtaPlatformInaccessibleException(String message) { super( message ); } - - public JtaPlatformInaccessibleException(String message, Throwable cause) { - super( message, cause ); - } } diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/synchronization/SynchronizationCallbackCoordinatorNonTrackingImpl.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/synchronization/SynchronizationCallbackCoordinatorNonTrackingImpl.java index d27e3434f5e1..a5ef84ae9f6b 100644 --- a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/synchronization/SynchronizationCallbackCoordinatorNonTrackingImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/synchronization/SynchronizationCallbackCoordinatorNonTrackingImpl.java @@ -1,7 +1,5 @@ package org.hibernate.resource.transaction.backend.jta.internal.synchronization; -import jakarta.transaction.Status; - import static org.hibernate.engine.transaction.internal.jta.JtaStatusHelper.isCommitted; import static org.hibernate.resource.transaction.backend.jta.internal.JtaLogging.JTA_LOGGER; @@ -44,10 +42,6 @@ public void afterCompletion(int status) { doAfterCompletion( status, false ); } - protected void doAfterCompletion(boolean successful, boolean delayed) { - doAfterCompletion( successful ? Status.STATUS_COMMITTED : Status.STATUS_UNKNOWN, delayed ); - } - protected void doAfterCompletion(int status, boolean delayed) { JTA_LOGGER.synchronizationCoordinatorDoAfterCompletion( isCommitted( status ), delayed ); try { diff --git a/hibernate-core/src/main/java/org/hibernate/service/internal/AbstractServiceRegistryImpl.java b/hibernate-core/src/main/java/org/hibernate/service/internal/AbstractServiceRegistryImpl.java index 4890fcc679d2..0ccc29efe136 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/internal/AbstractServiceRegistryImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/service/internal/AbstractServiceRegistryImpl.java @@ -79,10 +79,6 @@ protected AbstractServiceRegistryImpl( this.autoCloseRegistry = autoCloseRegistry; } - public AbstractServiceRegistryImpl(BootstrapServiceRegistry bootstrapServiceRegistry) { - this( bootstrapServiceRegistry, true ); - } - public AbstractServiceRegistryImpl( BootstrapServiceRegistry bootstrapServiceRegistry, boolean autoCloseRegistry) { diff --git a/hibernate-core/src/main/java/org/hibernate/sql/Delete.java b/hibernate-core/src/main/java/org/hibernate/sql/Delete.java deleted file mode 100644 index 85a6269e465b..000000000000 --- a/hibernate-core/src/main/java/org/hibernate/sql/Delete.java +++ /dev/null @@ -1,113 +0,0 @@ -package org.hibernate.sql; - -import java.util.ArrayList; -import java.util.List; - -import org.hibernate.Internal; -import org.hibernate.engine.spi.SessionFactoryImplementor; -import org.hibernate.sql.spi.ParameterMarkerStrategy; - -/** - * A SQL {@code DELETE} statement. - * - * @author Gavin King - */ -@Internal -public class Delete implements RestrictionRenderingContext { - protected String tableName; - protected String comment; - protected final List restrictions = new ArrayList<>(); - - private final ParameterMarkerStrategy parameterMarkerStrategy; - private int parameterCount; - - public Delete(SessionFactoryImplementor factory) { - this( factory.getParameterMarkerStrategy() ); - } - - public Delete(ParameterMarkerStrategy parameterMarkerStrategy) { - this.parameterMarkerStrategy = parameterMarkerStrategy; - } - - public Delete setTableName(String tableName) { - this.tableName = tableName; - return this; - } - - public Delete setComment(String comment) { - this.comment = comment; - return this; - } - - @SuppressWarnings("UnusedReturnValue") - public Delete addColumnRestriction(String columnName) { - restrictions.add( new ComparisonRestriction( columnName ) ); - return this; - } - - @SuppressWarnings("UnusedReturnValue") - public Delete addColumnRestriction(String... columnNames) { - for ( int i = 0; i < columnNames.length; i++ ) { - if ( columnNames[i] == null ) { - continue; - } - addColumnRestriction( columnNames[i] ); - } - return this; - } - - @SuppressWarnings("UnusedReturnValue") - public Delete addColumnIsNullRestriction(String columnName) { - restrictions.add( new NullnessRestriction( columnName ) ); - return this; - } - - @SuppressWarnings("UnusedReturnValue") - public Delete addColumnIsNotNullRestriction(String columnName) { - restrictions.add( new NullnessRestriction( columnName, false ) ); - return this; - } - - public Delete setVersionColumnName(String versionColumnName) { - if ( versionColumnName != null ) { - addColumnRestriction( versionColumnName ); - } - return this; - } - - public String toStatementString() { - final StringBuilder buf = new StringBuilder( tableName.length() + 10 ); - - applyComment( buf ); - buf.append( "delete from " ).append( tableName ); - applyRestrictions( buf ); - - return buf.toString(); - } - - private void applyComment(StringBuilder buf) { - if ( comment != null ) { - buf.append( "/* " ).append( org.hibernate.sql.spi.SqlComments.escape( comment ) ).append( " */ " ); - } - } - - private void applyRestrictions(StringBuilder buf) { - if ( restrictions.isEmpty() ) { - return; - } - - buf.append( " where " ); - - for ( int i = 0; i < restrictions.size(); i++ ) { - if ( i > 0 ) { - buf.append( " and " ); - } - restrictions.get( i ).render( buf, this ); - } - } - - @Override - public String makeParameterMarker() { - return parameterMarkerStrategy.createMarker( ++parameterCount, null ); - } -} diff --git a/hibernate-core/src/main/java/org/hibernate/sql/InFragment.java b/hibernate-core/src/main/java/org/hibernate/sql/InFragment.java index e9d991b8d77f..4d94ddb1b127 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/InFragment.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/InFragment.java @@ -1,7 +1,6 @@ package org.hibernate.sql; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import org.hibernate.Internal; @@ -31,11 +30,6 @@ public InFragment addValue(Object value) { return this; } - public InFragment addValues(Object[] values) { - Collections.addAll( this.values, values ); - return this; - } - public InFragment setColumn(String columnName) { this.columnName = columnName; return this; diff --git a/hibernate-core/src/main/java/org/hibernate/sql/Update.java b/hibernate-core/src/main/java/org/hibernate/sql/Update.java index ad124affcaec..b0998f4bf364 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/Update.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/Update.java @@ -1,6 +1,5 @@ package org.hibernate.sql; import java.util.ArrayList; -import java.util.Collection; import java.util.Iterator; import java.util.LinkedHashMap; import java.util.List; @@ -33,10 +32,6 @@ public Update(ParameterMarkerStrategy parameterMarkerStrategy) { this.parameterMarkerStrategy = parameterMarkerStrategy; } - public String getTableName() { - return tableName; - } - public Update setTableName(String tableName) { this.tableName = tableName; return this; @@ -47,13 +42,6 @@ public Update setComment(String comment) { return this; } - public Update addAssignments(String... columnNames) { - for ( String columnName : columnNames ) { - addAssignment( columnName ); - } - return this; - } - public Update addAssignment(String columnName) { return addAssignment( columnName, "?" ); } @@ -63,10 +51,6 @@ public Update addAssignment(String columnName, String valueExpression) { return this; } - public void addAssignments(Collection columns) { - columns.forEach( this::addAssignment ); - } - public Update addRestriction(String column) { restrictions.add( new ComparisonRestriction( column ) ); return this; @@ -82,11 +66,6 @@ public Update addRestriction(String... columns) { return this; } - public Update addRestriction(String column, String value) { - restrictions.add( new ComparisonRestriction( column, value ) ); - return this; - } - public Update addRestriction(String column, ComparisonRestriction.Operator op, String value) { restrictions.add( new ComparisonRestriction( column, op, value ) ); return this; @@ -104,12 +83,6 @@ public Update addColumnIsNullRestriction(String columnName) { return this; } - @SuppressWarnings("UnusedReturnValue") - public Update addColumnIsNotNullRestriction(String columnName) { - restrictions.add( new NullnessRestriction( columnName, false ) ); - return this; - } - public String toStatementString() { final StringBuilder buf = new StringBuilder( ( assignments.size() * 15) + tableName.length() + 10 ); diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/internal/SqlTreePrinter.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/internal/SqlTreePrinter.java index 3374ce89bf4d..fac3203492cc 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/ast/internal/SqlTreePrinter.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/internal/SqlTreePrinter.java @@ -203,10 +203,6 @@ private void visitTableGroupJoin(TableGroupJoin tableGroupJoin) { ); } - private void logNode(String text) { - logWithIndentation( "%s", text ); - } - private void logNode(String text, Runnable subTreeHandler) { logNode( text, subTreeHandler, false ); } diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/query/cte/CteTable.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/query/cte/CteTable.java index 9a0b325953f6..2ff1dc02c6e3 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/query/cte/CteTable.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/query/cte/CteTable.java @@ -111,12 +111,6 @@ private static void forEachCteColumn(String prefix, Value value, Consumer consumer) { - SqmMutationStrategyHelper.forEachSelectableMapping( prefix, modelPart, (s, selectableMapping) -> { - consumer.accept( new CteColumn( s, selectableMapping.getJdbcMapping() ) ); - } ); - } - public List findCteColumns(ModelPart modelPart) { final String prefix; if ( modelPart instanceof AttributeMapping attributeMapping ) { diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/AbstractJdbcOperationQuery.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/AbstractJdbcOperationQuery.java index 933308476144..c0d952a99251 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/AbstractJdbcOperationQuery.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/AbstractJdbcOperationQuery.java @@ -12,8 +12,6 @@ import org.hibernate.sql.exec.spi.JdbcParameterBindings; import org.hibernate.type.descriptor.java.JavaType; -import static java.util.Collections.emptyMap; - /** * Executable JDBC command * @@ -25,13 +23,6 @@ public class AbstractJdbcOperationQuery implements JdbcOperationQuery { protected final Set affectedTableNames; protected final Map appliedParameters; - public AbstractJdbcOperationQuery( - String sql, - List parameterBinders, - Set affectedTableNames) { - this( sql, parameterBinders, affectedTableNames, emptyMap() ); - } - public AbstractJdbcOperationQuery( String sql, List parameterBinders, diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/AbstractJdbcOperationQueryInsert.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/AbstractJdbcOperationQueryInsert.java index ba5e709476dd..b25f1f9fb1aa 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/AbstractJdbcOperationQueryInsert.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/AbstractJdbcOperationQueryInsert.java @@ -18,15 +18,6 @@ public class AbstractJdbcOperationQueryInsert extends AbstractJdbcOperationQuery private final String uniqueConstraintNameThatMayFail; - public AbstractJdbcOperationQueryInsert( - String sql, - List parameterBinders, - Set affectedTableNames, - String uniqueConstraintNameThatMayFail) { - super( sql, parameterBinders, affectedTableNames ); - this.uniqueConstraintNameThatMayFail = uniqueConstraintNameThatMayFail; - } - public AbstractJdbcOperationQueryInsert( String sql, List parameterBinders, diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcCallParameterExtractorImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcCallParameterExtractorImpl.java index d5a799e8d608..e2b3418ea6b9 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcCallParameterExtractorImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcCallParameterExtractorImpl.java @@ -13,7 +13,6 @@ * @author Steve Ebersole */ public class JdbcCallParameterExtractorImpl implements JdbcCallParameterExtractor { - private final String callableName; private final String parameterName; private final int parameterPosition; private final OutputableType ormType; @@ -23,7 +22,6 @@ public JdbcCallParameterExtractorImpl( String parameterName, int parameterPosition, OutputableType ormType) { - this.callableName = callableName; this.parameterName = parameterName; this.parameterPosition = parameterPosition; this.ormType = ormType; diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcOperationQueryInsertImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcOperationQueryInsertImpl.java index f4eb85ebfda8..6a6497547b61 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcOperationQueryInsertImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcOperationQueryInsertImpl.java @@ -18,22 +18,6 @@ public class JdbcOperationQueryInsertImpl extends AbstractJdbcOperationQueryInsert implements JdbcOperationQueryMutation { - - public JdbcOperationQueryInsertImpl( - String sql, - List parameterBinders, - Set affectedTableNames) { - super( sql, parameterBinders, affectedTableNames, null ); - } - - public JdbcOperationQueryInsertImpl( - String sql, - List parameterBinders, - Set affectedTableNames, - String uniqueConstraintNameThatMayFail) { - super( sql, parameterBinders, affectedTableNames, uniqueConstraintNameThatMayFail ); - } - public JdbcOperationQueryInsertImpl( String sql, List parameterBinders, diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcOperationQuerySelect.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcOperationQuerySelect.java index 2b3d6a2220fb..74a363753b5b 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcOperationQuerySelect.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcOperationQuerySelect.java @@ -86,34 +86,6 @@ public JdbcOperationQuerySelect( this.scrollExecution = scrollExecution; } - public JdbcOperationQuerySelect( - String sql, - List parameterBinders, - JdbcValuesMappingProducer jdbcValuesMappingProducer, - Set affectedTableNames, - int rowsToSkip, - int maxRows, - Map appliedParameters, - JdbcLockingApplication lockingApplication, - JdbcPaginationApplication paginationApplication, - JdbcParameter offsetParameter, - JdbcParameter limitParameter) { - this( - sql, - parameterBinders, - jdbcValuesMappingProducer, - affectedTableNames, - rowsToSkip, - maxRows, - appliedParameters, - lockingApplication, - paginationApplication, - offsetParameter, - limitParameter, - false - ); - } - @Override public JdbcValuesMappingProducer getJdbcValuesMappingProducer() { return jdbcValuesMappingProducer; @@ -162,10 +134,6 @@ public JdbcParameter getLimitParameter() { return limitParameter; } - public JdbcParameter getOffsetParameter() { - return offsetParameter; - } - @Override public JdbcLockingApplication getLockingApplication() { return lockingApplication; diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcSelectWithActions.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcSelectWithActions.java index 8658f5f75baf..24dba815740a 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcSelectWithActions.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcSelectWithActions.java @@ -67,12 +67,6 @@ public JdbcSelectWithActions( this.postActions = postActions; } - public JdbcSelectWithActions( - JdbcOperationQuerySelect primaryAction, - LoadedValuesCollectorFactory loadedValuesCollectorFactory) { - this( primaryAction, loadedValuesCollectorFactory, null, null ); - } - @Override public JdbcValuesMappingProducer getJdbcValuesMappingProducer() { return primaryOperation.getJdbcValuesMappingProducer(); diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/StatementAccessImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/StatementAccessImpl.java index 9ebd48adda05..46652aef0b7c 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/StatementAccessImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/StatementAccessImpl.java @@ -41,18 +41,4 @@ public StatementAccessImpl(Connection jdbcConnection, LogicalConnection logicalC } return jdbcStatement; } - - public void release() { - if ( jdbcStatement != null ) { - try { - jdbcStatement.close(); - logicalConnection.getResourceRegistry().release( jdbcStatement ); - } - catch (SQLException e) { - throw factory.getJdbcServices() - .getSqlExceptionHelper() - .convert( e, "Unable to release JDBC Statement" ); - } - } - } } diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/lock/LoadedValuesCollectorImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/lock/LoadedValuesCollectorImpl.java index 761aadaac891..1bcf30483ff9 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/lock/LoadedValuesCollectorImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/lock/LoadedValuesCollectorImpl.java @@ -20,10 +20,6 @@ public class LoadedValuesCollectorImpl implements LoadedValuesCollector { private List entitiesToLock; private List collectionsToLock; - public LoadedValuesCollectorImpl(Collection pathsToLock) { - this( pathsToLock, false ); - } - public LoadedValuesCollectorImpl(Collection pathsToLock, boolean deferForceIncrement) { this.pathsToLock = pathsToLock; directLockingCompletion = deferForceIncrement ? new DirectLockingCompletion() : null; diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/lock/LockingHelper.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/lock/LockingHelper.java index d8a97e483b94..d36e2c762bf6 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/lock/LockingHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/lock/LockingHelper.java @@ -8,9 +8,7 @@ import org.hibernate.LockMode; import org.hibernate.LockOptions; import org.hibernate.ScrollMode; -import org.hibernate.Session; import org.hibernate.StaleObjectStateException; -import org.hibernate.collection.spi.PersistentCollection; import org.hibernate.engine.spi.CollectionKey; import org.hibernate.engine.spi.EntityKey; import org.hibernate.engine.spi.SharedSessionContractImplementor; @@ -207,25 +205,6 @@ private static void reportMissingRows( ); } - /** - * Lock a collection-table for a single entity. - * - * @param attributeMapping The plural attribute whose table needs locked. - * @param lockMode The lock mode to apply - * @param lockTimeout A lock timeout to apply, if one. - * @param collectionToLock The collection to lock. - * - * @see Session#lock - */ - public static void lockCollectionTable( - PluralAttributeMapping attributeMapping, - LockMode lockMode, - Timeout lockTimeout, - PersistentCollection collectionToLock, - ExecutionContext executionContext) { - lockCollectionTableByKey( attributeMapping, lockMode, lockTimeout, collectionToLock.getKey(), executionContext ); - } - /// Locks existing collection-table rows using the database collection key, /// without reading or initializing the owner's current collection field. /// The key may be the owner's identifier or a referenced unique property. diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ModelMutationLogging.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ModelMutationLogging.java index 44dac2212fb9..28dff7753c5b 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/model/ModelMutationLogging.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ModelMutationLogging.java @@ -53,10 +53,6 @@ public interface ModelMutationLogging extends BasicLogger { @Message(id = 90005105, value = " Update (%s): %s") void updateOperationSql(int index, String sql); - @LogMessage(level = TRACE) - @Message(id = 90005106, value = " Delete (%s): %s") - void deleteOperationSql(int index, String sql); - @LogMessage(level = TRACE) @Message(id = 90005107, value = "Static SQL for collection: %s") void staticSqlForCollection(String role); diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/basic/BasicResultAssembler.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/basic/BasicResultAssembler.java index 3079c4c07b22..d845cc1b987e 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/basic/BasicResultAssembler.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/basic/BasicResultAssembler.java @@ -3,7 +3,6 @@ import java.util.Locale; import org.hibernate.HibernateException; -import org.hibernate.Internal; import org.hibernate.type.descriptor.converter.spi.BasicValueConverter; import org.hibernate.sql.ast.spi.query.select.SqlSelection; import org.hibernate.sql.results.graph.DomainResultAssembler; @@ -89,12 +88,4 @@ public JavaType getAssembledJavaType() { ? valueConverter.getDomainJavaType() : assembledJavaType; } - - /** - * Exposed for testing purposes - */ - @Internal - public BasicValueConverter getValueConverter() { - return valueConverter; - } } diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/CollectionDomainResult.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/CollectionDomainResult.java index 665baa9862ec..b5eac3d3b593 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/CollectionDomainResult.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/CollectionDomainResult.java @@ -32,7 +32,6 @@ public class CollectionDomainResult implements DomainResult, CollectionResultGra private final PluralAttributeMapping loadingAttribute; private final String resultVariable; - private final TableGroup tableGroup; private final DomainResult fkResult; @@ -47,7 +46,6 @@ public CollectionDomainResult( this.loadingPath = loadingPath; this.loadingAttribute = loadingAttribute; this.resultVariable = resultVariable; - this.tableGroup = tableGroup; // The collection is always the target side this.fkResult = loadingAttribute.getKeyDescriptor().createKeyDomainResult( loadingPath, diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/EagerCollectionFetch.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/EagerCollectionFetch.java index a5e00a4fdc1e..41249fe16164 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/EagerCollectionFetch.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/EagerCollectionFetch.java @@ -11,7 +11,6 @@ import org.hibernate.metamodel.mapping.PluralAttributeMapping; import org.hibernate.spi.NavigablePath; import org.hibernate.sql.ast.spi.creation.FromClauseAccess; -import org.hibernate.sql.ast.spi.query.from.PluralTableGroup; import org.hibernate.sql.ast.spi.query.from.TableGroup; import org.hibernate.sql.results.graph.AssemblerCreationState; import org.hibernate.sql.results.graph.DomainResult; @@ -29,7 +28,6 @@ * @author Steve Ebersole */ public class EagerCollectionFetch extends CollectionFetch { - private final PluralTableGroup collectionTableGroup; private final @Nullable DomainResult collectionKeyResult; private final DomainResult collectionValueKeyResult; @@ -53,7 +51,6 @@ public EagerCollectionFetch( fetchParent, creationState.getFetchOptions( fetchedPath ) ); - this.collectionTableGroup = (PluralTableGroup) collectionTableGroup; final FromClauseAccess fromClauseAccess = creationState.getSqlAstCreationState().getFromClauseAccess(); final NavigablePath parentPath = fetchedPath.getParent(); diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/NonAggregatedIdentifierMappingFetch.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/NonAggregatedIdentifierMappingFetch.java index a0e74a62d448..930d9ef9210c 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/NonAggregatedIdentifierMappingFetch.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/NonAggregatedIdentifierMappingFetch.java @@ -20,10 +20,6 @@ public NonAggregatedIdentifierMappingFetch( super( navigablePath, embeddedPartDescriptor, fetchParent, fetchTiming, hasTableGroup, creationState ); } - public NonAggregatedIdentifierMappingFetch(EmbeddableFetchImpl original) { - super( original ); - } - @Override public EmbeddableInitializer createInitializer(InitializerParent parent, AssemblerCreationState creationState) { return new NonAggregatedIdentifierMappingInitializer( this, parent, creationState, false ); diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityInitializerImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityInitializerImpl.java index 9f850291768a..88e8180ada3b 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityInitializerImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityInitializerImpl.java @@ -2349,25 +2349,6 @@ public String toString() { + toLoggableString( getNavigablePath() ) + ")"; } - //######################### - // For Hibernate Reactive - //######################### - protected EntityPersister getRootEntityDescriptor() { - return rootEntityDescriptor; - } - - protected @Nullable Initializer[][] getEagerSubInitializers() { - return eagerSubInitializers; - } - - protected @Nullable Initializer[][] getCollectionContainingSubInitializers() { - return collectionContainingSubInitializers; - } - - protected ImmutableBitSet[] getLazySets() { - return lazySets; - } - public boolean isHasLazyInitializingSubAssemblers() { return hasLazyInitializingSubAssemblers; } diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntitySelectFetchInitializer.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntitySelectFetchInitializer.java index 0e912bd00ea8..363f158d5975 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntitySelectFetchInitializer.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntitySelectFetchInitializer.java @@ -57,14 +57,6 @@ public EntitySelectFetchInitializerData( RowProcessingState rowProcessingState) { super( rowProcessingState ); } - - /* - * Used by Hibernate Reactive - */ - public EntitySelectFetchInitializerData(EntitySelectFetchInitializerData original) { - super( original ); - this.entityIdentifier = original.entityIdentifier; - } } public EntitySelectFetchInitializer( diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/JoinedDiscriminatedEntityFetch.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/JoinedDiscriminatedEntityFetch.java index 8b08a556508b..184b78d7a5a3 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/JoinedDiscriminatedEntityFetch.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/JoinedDiscriminatedEntityFetch.java @@ -71,14 +71,6 @@ private static boolean isAffectedByEnabledFilters(EntityMappingType entityMappin return entityMappingType.isAffectedByEnabledFilters( loadQueryInfluencers, true ); } - protected List> getConcreteEntityResults() { - return concreteEntityResults; - } - - protected BitSet getAffectedByFilters() { - return affectedByFilters; - } - @Override public FetchParent getFetchParent() { return fetchParent; diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/JoinedDiscriminatedEntityResult.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/JoinedDiscriminatedEntityResult.java index 4164be19fa98..2763b94f9cf1 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/JoinedDiscriminatedEntityResult.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/JoinedDiscriminatedEntityResult.java @@ -60,14 +60,6 @@ private static boolean isAffectedByEnabledFilters(EntityMappingType entityMappin return entityMappingType.isAffectedByEnabledFilters( loadQueryInfluencers, true ); } - protected List> getConcreteEntityResults() { - return concreteEntityResults; - } - - protected BitSet getAffectedByFilters() { - return affectedByFilters; - } - @Override public String getResultVariable() { return resultVariable; diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/DynamicInstantiationArgument.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/DynamicInstantiationArgument.java index 635b94d6ded9..41c47607dccd 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/DynamicInstantiationArgument.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/DynamicInstantiationArgument.java @@ -16,10 +16,6 @@ public DynamicInstantiationArgument(DomainResultProducer argumentResultProduc this.alias = alias; } - public String getAlias() { - return alias; - } - public ArgumentDomainResult buildArgumentDomainResult(DomainResultCreationState creationState) { final var sqlExpressionResolver = creationState.getSqlAstCreationState().getCurrentProcessingState() diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/DynamicInstantiationAssemblerInjectionImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/DynamicInstantiationAssemblerInjectionImpl.java index c7474ef50447..d7991adafbc4 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/DynamicInstantiationAssemblerInjectionImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/DynamicInstantiationAssemblerInjectionImpl.java @@ -44,11 +44,6 @@ public DynamicInstantiationAssemblerInjectionImpl( this.beanInjections = beanInjections; } - private DynamicInstantiationAssemblerInjectionImpl(List beanInjections, JavaType target) { - this.target = target; - this.beanInjections = beanInjections; - } - private static BeanInjection injection(BeanInfo beanInfo, ArgumentReader argument, Class targetJavaType) { final var argType = argument.getAssembledJavaType().getJavaTypeClass(); final String alias = argument.getAlias(); diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/DynamicInstantiationAssemblerMapImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/DynamicInstantiationAssemblerMapImpl.java index 3237aa65beac..952eb1637549 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/DynamicInstantiationAssemblerMapImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/DynamicInstantiationAssemblerMapImpl.java @@ -40,13 +40,6 @@ public DynamicInstantiationAssemblerMapImpl( } } - private DynamicInstantiationAssemblerMapImpl( - List> argumentReaders, - JavaType> mapJavaType) { - this.mapJavaType = mapJavaType; - this.argumentReaders = argumentReaders; - } - @Override public JavaType> getAssembledJavaType() { return mapJavaType; diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/tuple/TupleResult.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/tuple/TupleResult.java index 8f7c263ae6b8..b8463554ceb0 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/tuple/TupleResult.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/tuple/TupleResult.java @@ -2,7 +2,6 @@ import java.util.BitSet; -import org.hibernate.Internal; import org.hibernate.spi.NavigablePath; import org.hibernate.sql.results.graph.AssemblerCreationState; import org.hibernate.sql.results.graph.DomainResult; @@ -57,14 +56,6 @@ public NavigablePath getNavigablePath() { return navigablePath; } - /** - * For testing purposes only - */ - @Internal - public DomainResultAssembler getAssembler() { - return assembler; - } - @Override public DomainResultAssembler createResultAssembler( InitializerParent parent, diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/InitializersList.java b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/InitializersList.java index c4f9f686a9f2..95cb1f775db8 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/InitializersList.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/InitializersList.java @@ -1,8 +1,6 @@ package org.hibernate.sql.results.internal; import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; import org.hibernate.sql.results.graph.Initializer; import org.hibernate.sql.results.graph.entity.internal.EntityInitializerImpl; @@ -21,15 +19,12 @@ public final class InitializersList { private final Initializer[] initializers; private final Initializer[] sortedForResolveInstance; - private final boolean hasCollectionInitializers; private InitializersList( Initializer[] initializers, - Initializer[] sortedForResolveInstance, - boolean hasCollectionInitializers) { + Initializer[] sortedForResolveInstance) { this.initializers = initializers; this.sortedForResolveInstance = sortedForResolveInstance; - this.hasCollectionInitializers = hasCollectionInitializers; } public Initializer[] getInitializers() { @@ -40,15 +35,6 @@ public Initializer[] getSortedForResolveInstance() { return sortedForResolveInstance; } - @Deprecated //for simpler migration to the new SPI - public List> asList() { - return Arrays.asList( initializers ); - } - - public int size() { - return initializers.length; - } - public static class Builder { private final ArrayList> initializers; int nonCollectionInitializersNum = 0; @@ -58,10 +44,6 @@ public Builder() { initializers = new ArrayList<>(); } - public Builder(int size) { - initializers = new ArrayList<>( size ); - } - public void addInitializer(final Initializer initializer) { initializers.add( initializer ); //in this method we perform these checks merely to learn the sizing hints, @@ -98,8 +80,7 @@ public InitializersList build() { final boolean hasCollectionInitializers = ( nonCollectionInitializersNum != initializers.size() ); return new InitializersList( originalSortInitializers, - sortedForResolveInstance, - hasCollectionInitializers + sortedForResolveInstance ); } diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/LoadingLogger.java b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/LoadingLogger.java index ab04d0460f0d..3d3fe278dca9 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/LoadingLogger.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/LoadingLogger.java @@ -30,14 +30,6 @@ public interface LoadingLogger extends BasicLogger { LoadingLogger LOADING_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), LoadingLogger.class, LOGGER_NAME, Locale.ROOT ); - static String subLoggerName(String subName) { - return LOGGER_NAME + "." + subName; - } - - static Logger subLogger(String subName) { - return Logger.getLogger( subLoggerName( subName ) ); - } - @LogMessage(level = DEBUG) @Message(id = 90005801, value = "Found matching entity in context, but it is scheduled for removal (returning null)") diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/ResultsLogger.java b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/ResultsLogger.java index e6112f8de6ce..81fb58036c56 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/ResultsLogger.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/ResultsLogger.java @@ -30,14 +30,4 @@ public interface ResultsLogger extends BasicLogger { Logger RESULTS_LOGGER = Logger.getLogger( LOGGER_NAME ); ResultsLogger RESULTS_MESSAGE_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), ResultsLogger.class, LOGGER_NAME, Locale.ROOT ); - // todo (6.0) : make sure sql result processing classes use this logger - - static String subLoggerName(String subName) { - return LOGGER_NAME + "." + subName; - } - - static Logger subLogger(String subName) { - return Logger.getLogger( subLoggerName( subName ) ); - } - } diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/RowProcessingStateStandardImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/RowProcessingStateStandardImpl.java index bbce9d9e668c..4543ad63c811 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/RowProcessingStateStandardImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/RowProcessingStateStandardImpl.java @@ -111,10 +111,6 @@ public int getPosition() { return jdbcValues.getPosition(); } - public boolean isBeforeFirst() { - return jdbcValues.isBeforeFirst( this ); - } - public void beforeFirst() { jdbcValues.beforeFirst( this ); } @@ -139,10 +135,6 @@ public void afterLast() { jdbcValues.afterLast( this ); } - public boolean isAfterLast() { - return jdbcValues.isAfterLast( this ); - } - @Override public Object getJdbcValue(int position) { return jdbcValues.getCurrentRowValue( position ); diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/StandardRowReader.java b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/StandardRowReader.java index d13f41d774ea..07bd7aa56bdd 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/StandardRowReader.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/StandardRowReader.java @@ -260,20 +260,17 @@ public void finishUp(RowProcessingState rowProcessingState) { } enum ComponentType { - BOOLEAN(boolean.class), - BYTE(byte.class), - SHORT(short.class), - CHAR(char.class), - INT(int.class), - LONG(long.class), - FLOAT(float.class), - DOUBLE(double.class), - OBJECT(Object.class); + BOOLEAN(), + BYTE(), + SHORT(), + CHAR(), + INT(), + LONG(), + FLOAT(), + DOUBLE(), + OBJECT(); - private final Class componentType; - - ComponentType(Class componentType) { - this.componentType = componentType; + ComponentType() { } public static ComponentType determineComponentType(Class resultType) { @@ -305,10 +302,6 @@ else if ( resultType == double[].class) { return OBJECT; } } - - public Class getComponentType() { - return componentType; - } } } diff --git a/hibernate-core/src/main/java/org/hibernate/stat/internal/EntityStatisticsImpl.java b/hibernate-core/src/main/java/org/hibernate/stat/internal/EntityStatisticsImpl.java index 5dc07cc03864..a3da79f84049 100644 --- a/hibernate-core/src/main/java/org/hibernate/stat/internal/EntityStatisticsImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/stat/internal/EntityStatisticsImpl.java @@ -46,10 +46,6 @@ public long getUpdateCount() { return updateCount.sum(); } - public long getUpsertCount() { - return upsertCount.sum(); - } - public long getFetchCount() { return fetchCount.sum(); } diff --git a/hibernate-core/src/main/java/org/hibernate/stat/internal/StatsNamedContainer.java b/hibernate-core/src/main/java/org/hibernate/stat/internal/StatsNamedContainer.java index ee949fda942d..4fa045b8cb5e 100644 --- a/hibernate-core/src/main/java/org/hibernate/stat/internal/StatsNamedContainer.java +++ b/hibernate-core/src/main/java/org/hibernate/stat/internal/StatsNamedContainer.java @@ -88,14 +88,4 @@ public String[] keysAsArray() { } } - public @Nullable V get(final String key) { - final Object o = map.get( key ); - if ( o == NULL_TOKEN) { - return null; - } - else { - return (V) o; - } - } - } diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/AbstractSchemaMigrator.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/AbstractSchemaMigrator.java index 9caf199e7312..184a0a2539fb 100644 --- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/AbstractSchemaMigrator.java +++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/AbstractSchemaMigrator.java @@ -162,7 +162,7 @@ private void performMigration( final Set exportIdentifiers = setOfSize( 50 ); final var database = metadata.getDatabase(); - final var auxiliaryExporter = new StandardAuxiliaryDatabaseObjectExporter( dialect ); + final var auxiliaryExporter = new StandardAuxiliaryDatabaseObjectExporter( ); // Drop all AuxiliaryDatabaseObjects for ( var auxiliaryDatabaseObject : database.getAuxiliaryDatabaseObjects() ) { diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/SchemaCreatorImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/SchemaCreatorImpl.java index a1593cb2dfc6..9050140605cd 100644 --- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/SchemaCreatorImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/SchemaCreatorImpl.java @@ -55,10 +55,6 @@ public class SchemaCreatorImpl extends AbstractSchemaPopulator implements Schema private final HibernateSchemaManagementTool tool; private final SchemaFilter schemaFilter; - public SchemaCreatorImpl(HibernateSchemaManagementTool tool) { - this( tool, DefaultSchemaFilter.INSTANCE ); - } - public SchemaCreatorImpl(HibernateSchemaManagementTool tool, SchemaFilter schemaFilter) { this.tool = tool; this.schemaFilter = schemaFilter; @@ -242,7 +238,7 @@ private static void createAuxiliaryObjectsAfterTables( SqlStringGenerationContext context, Set exportIdentifiers, GenerationTarget[] targets) { - final var exporter = new StandardAuxiliaryDatabaseObjectExporter( dialect ); + final var exporter = new StandardAuxiliaryDatabaseObjectExporter( ); for ( var auxiliaryDatabaseObject : metadata.getDatabase().getAuxiliaryDatabaseObjects() ) { if ( auxiliaryDatabaseObject.appliesToDialect( dialect ) && !auxiliaryDatabaseObject.beforeTablesOnCreation() ) { @@ -455,7 +451,7 @@ private static void createAuxiliaryObjectsBeforeTables( SqlStringGenerationContext context, Set exportIdentifiers, GenerationTarget[] targets) { - final var exporter = new StandardAuxiliaryDatabaseObjectExporter( dialect ); + final var exporter = new StandardAuxiliaryDatabaseObjectExporter( ); for ( var auxiliaryDatabaseObject : metadata.getDatabase().getAuxiliaryDatabaseObjects() ) { if ( auxiliaryDatabaseObject.beforeTablesOnCreation() && auxiliaryDatabaseObject.appliesToDialect( dialect ) ) { diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/SchemaDropperImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/SchemaDropperImpl.java index d460bbbe7ced..85520fd74a5f 100644 --- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/SchemaDropperImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/SchemaDropperImpl.java @@ -273,7 +273,7 @@ private static void dropAuxiliaryObjectsBeforeTables( Formatter formatter, SqlStringGenerationContext context, GenerationTarget[] targets) { - final var exporter = new StandardAuxiliaryDatabaseObjectExporter( dialect ); + final var exporter = new StandardAuxiliaryDatabaseObjectExporter( ); for ( var auxiliaryDatabaseObject : reverse( metadata.getDatabase().getAuxiliaryDatabaseObjects() ) ) { if ( !auxiliaryDatabaseObject.beforeTablesOnCreation() diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/SchemaPopulatorImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/SchemaPopulatorImpl.java index 740f554bef5d..29b3e72e53b5 100644 --- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/SchemaPopulatorImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/SchemaPopulatorImpl.java @@ -3,11 +3,8 @@ import org.hibernate.Internal; import org.hibernate.boot.registry.classloading.spi.ClassLoaderService; import org.hibernate.dialect.Dialect; -import org.hibernate.service.ServiceRegistry; -import org.hibernate.service.spi.ServiceRegistryImplementor; import org.hibernate.tool.schema.spi.ExecutionOptions; import org.hibernate.tool.schema.spi.GenerationTarget; -import org.hibernate.tool.schema.spi.SchemaManagementTool; import org.hibernate.tool.schema.spi.SchemaPopulator; import org.hibernate.tool.schema.spi.SqlScriptCommandExtractor; import org.hibernate.tool.schema.spi.TargetDescriptor; @@ -28,17 +25,6 @@ public SchemaPopulatorImpl(HibernateSchemaManagementTool tool) { this.tool = tool; } - public SchemaPopulatorImpl(ServiceRegistry serviceRegistry) { - if ( serviceRegistry.getService( SchemaManagementTool.class ) - instanceof HibernateSchemaManagementTool schemaManagementTool ) { - tool = schemaManagementTool; - } - else { - tool = new HibernateSchemaManagementTool(); - tool.injectServices( (ServiceRegistryImplementor) serviceRegistry ); - } - } - @Override public void doPopulation(ExecutionOptions options, TargetDescriptor targetDescriptor) { if ( !targetDescriptor.getTargetTypes().isEmpty() ) { diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardAuxiliaryDatabaseObjectExporter.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardAuxiliaryDatabaseObjectExporter.java index 6ad73a98b941..ec7aab3d7cb8 100644 --- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardAuxiliaryDatabaseObjectExporter.java +++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardAuxiliaryDatabaseObjectExporter.java @@ -3,17 +3,13 @@ import org.hibernate.boot.Metadata; import org.hibernate.boot.model.relational.AuxiliaryDatabaseObject; import org.hibernate.boot.model.relational.SqlStringGenerationContext; -import org.hibernate.dialect.Dialect; import org.hibernate.tool.schema.spi.Exporter; /** * @author Steve Ebersole */ public class StandardAuxiliaryDatabaseObjectExporter implements Exporter { - private final Dialect dialect; - - public StandardAuxiliaryDatabaseObjectExporter(Dialect dialect) { - this.dialect = dialect; + public StandardAuxiliaryDatabaseObjectExporter() { } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ScriptTargetOutputToUrl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ScriptTargetOutputToUrl.java index 046e3040a7a1..67b5e8a21fd7 100644 --- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ScriptTargetOutputToUrl.java +++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ScriptTargetOutputToUrl.java @@ -38,17 +38,6 @@ public ScriptTargetOutputToUrl(URL url, String charsetName, boolean append) { this.append = append; } - /** - * Constructs a ScriptTargetOutputToUrl instance - * the bytes will be written to the end of the file rather than the beginning - * - * @param url The url to read from - * @param charsetName The charset name - */ - public ScriptTargetOutputToUrl(URL url, String charsetName) { - this( url, charsetName, true ); - } - @Override protected Writer writer() { if ( writer == null ) { diff --git a/hibernate-core/src/main/java/org/hibernate/type/AnyType.java b/hibernate-core/src/main/java/org/hibernate/type/AnyType.java index 3a80eea9fcc1..f1afd4962422 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/AnyType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/AnyType.java @@ -39,14 +39,12 @@ */ @SPI public class AnyType extends AbstractType implements CompositeType, AssociationType { - private final TypeConfiguration typeConfiguration; private final Type identifierType; private final MetaType discriminatorType; private final boolean eager; @Internal public AnyType(TypeConfiguration typeConfiguration, MetaType discriminatorType, Type identifierType, boolean lazy) { - this.typeConfiguration = typeConfiguration; this.discriminatorType = discriminatorType; this.identifierType = identifierType; this.eager = !lazy; diff --git a/hibernate-core/src/main/java/org/hibernate/type/ComponentType.java b/hibernate-core/src/main/java/org/hibernate/type/ComponentType.java index 365ecd284a7e..263c57ef1718 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/ComponentType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/ComponentType.java @@ -121,10 +121,6 @@ private boolean isAggregate() { return isAggregate; } - public boolean isKey() { - return isKey; - } - @Override public int getColumnSpan(MappingContext mapping) throws MappingException { int span = 0; diff --git a/hibernate-core/src/main/java/org/hibernate/type/ManyToOneType.java b/hibernate-core/src/main/java/org/hibernate/type/ManyToOneType.java index 6805719f2475..d078ecddcb1d 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/ManyToOneType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/ManyToOneType.java @@ -111,24 +111,6 @@ public ForeignKeyDirection getForeignKeyDirection() { return ForeignKeyDirection.FROM_PARENT; } - /** - * Register the entity as batch loadable, if enabled - */ - private void scheduleBatchLoadIfNeeded(Object id, SharedSessionContractImplementor session) - throws MappingException { - //cannot batch fetch by unique key (property-ref associations) - if ( uniqueKeyPropertyName == null && id != null ) { - final var persister = getAssociatedEntityPersister( session.getFactory() ); - if ( session.getLoadQueryInfluencers().effectivelyBatchLoadable( persister ) ) { - final var entityKey = session.generateEntityKey( id, persister ); - final var persistenceContext = session.getPersistenceContextInternal(); - if ( !persistenceContext.containsEntity( entityKey ) ) { - persistenceContext.getBatchFetchQueue().addBatchLoadableEntityKey( entityKey ); - } - } - } - } - @Override public boolean useLHSPrimaryKey() { return false; diff --git a/hibernate-core/src/main/java/org/hibernate/type/MetaType.java b/hibernate-core/src/main/java/org/hibernate/type/MetaType.java index 0dc9341aa317..0f44593ab2cd 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/MetaType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/MetaType.java @@ -5,7 +5,6 @@ import org.hibernate.MappingException; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.spi.SharedSessionContractImplementor; -import org.hibernate.internal.util.collections.ArrayHelper; import org.hibernate.metamodel.mapping.DiscriminatorValue; import org.hibernate.metamodel.spi.ImplicitDiscriminatorStrategy; @@ -19,8 +18,6 @@ */ @Internal public class MetaType extends AbstractType { - public static final String[] REGISTRATION_KEYS = ArrayHelper.EMPTY_STRING_ARRAY; - private final Type valueType; private final ImplicitDiscriminatorStrategy implicitValueStrategy; private final Map discriminatorValuesToEntityNameMap; @@ -54,18 +51,10 @@ public ImplicitDiscriminatorStrategy getImplicitValueStrategy() { return implicitValueStrategy; } - public String[] getRegistrationKeys() { - return REGISTRATION_KEYS; - } - public Map getDiscriminatorValuesToEntityNameMap() { return discriminatorValuesToEntityNameMap; } - public Map getEntityNameToDiscriminatorValueMap(){ - return entityNameToDiscriminatorValueMap; - } - public int[] getSqlTypeCodes(MappingContext mappingContext) throws MappingException { return valueType.getSqlTypeCodes( mappingContext ); } @@ -116,10 +105,6 @@ public String toXMLString(Object value, SessionFactoryImplementor factory) throw return (String) value; //value is the entity name } - public Object fromXMLString(String xml, MappingContext mappingContext) throws HibernateException { - return xml; //xml is the entity name - } - @Override public String getName() { return valueType.getName(); //TODO! diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/DateTimeUtils.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/DateTimeUtils.java index 3b3c827bc37c..b8c1034d1b6f 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/DateTimeUtils.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/DateTimeUtils.java @@ -147,24 +147,6 @@ public static void appendAsTimestampWithNanos( ); } - public static void appendAsTimestampWithNanos( - SqlAppender appender, - TemporalAccessor temporalAccessor, - boolean supportsOffset, - TimeZone jdbcTimeZone, - boolean allowZforZeroOffset) { - appendAsTimestamp( - appender, - temporalAccessor, - supportsOffset, - jdbcTimeZone, - DATE_TIME_FORMATTER_TIMESTAMP_WITH_MICROS, - allowZforZeroOffset - ? DATE_TIME_FORMATTER_TIMESTAMP_WITH_NANOS_AND_OFFSET - : DATE_TIME_FORMATTER_TIMESTAMP_WITH_NANOS_AND_OFFSET_NOZ - ); - } - public static void appendAsTimestampWithMicros( SqlAppender appender, TemporalAccessor temporalAccessor, @@ -180,24 +162,6 @@ public static void appendAsTimestampWithMicros( ); } - public static void appendAsTimestampWithMicros( - SqlAppender appender, - TemporalAccessor temporalAccessor, - boolean supportsOffset, - TimeZone jdbcTimeZone, - boolean allowZforZeroOffset) { - appendAsTimestamp( - appender, - temporalAccessor, - supportsOffset, - jdbcTimeZone, - DATE_TIME_FORMATTER_TIMESTAMP_WITH_MICROS, - allowZforZeroOffset - ? DATE_TIME_FORMATTER_TIMESTAMP_WITH_MICROS_AND_OFFSET - : DATE_TIME_FORMATTER_TIMESTAMP_WITH_MICROS_AND_OFFSET_NOZ - ); - } - public static void appendAsTimestampWithMillis( SqlAppender appender, TemporalAccessor temporalAccessor, @@ -347,14 +311,6 @@ public static void appendAsDate(SqlAppender appender, Date date) { appender.appendSql( LOCAL_DATE_FORMAT.get().format( date ) ); } - /** - * @deprecated Use {@link #appendAsLocalTime(SqlAppender, Date)} instead - */ - @Deprecated - public static void appendAsTime(SqlAppender appender, java.util.Date date) { - appendAsLocalTime( appender, date ); - } - public static void appendAsTime(SqlAppender appender, java.util.Date date, TimeZone jdbcTimeZone) { final SimpleDateFormat simpleDateFormat = TIME_WITH_OFFSET_FORMAT.get(); final TimeZone originalTimeZone = simpleDateFormat.getTimeZone(); @@ -398,14 +354,6 @@ public static void appendAsDate(SqlAppender appender, java.util.Calendar calenda } } - /** - * @deprecated Use {@link #appendAsLocalTime(SqlAppender, Calendar)} instead - */ - @Deprecated - public static void appendAsTime(SqlAppender appender, java.util.Calendar calendar) { - appendAsLocalTime( appender, calendar ); - } - public static void appendAsTime(SqlAppender appender, java.util.Calendar calendar, TimeZone jdbcTimeZone) { final SimpleDateFormat simpleDateFormat = TIME_WITH_OFFSET_FORMAT.get(); final TimeZone originalTimeZone = simpleDateFormat.getTimeZone(); @@ -461,29 +409,6 @@ public static T truncateToPrecision(T temporal, int precisi ); } - /** - * Do the same conversion that databases do when they encounter a timestamp with a higher precision - * than what is supported by a column, which is to round the excess fractions. - * - * @deprecated Use {@link #adjustToDefaultPrecision(Temporal, Dialect)} instead - */ - @Deprecated(forRemoval = true, since = "6.6.1") - public static T roundToDefaultPrecision(T temporal, Dialect d) { - final int defaultTimestampPrecision = d.getTypeSizingProfile().defaultTimestampPrecision(); - if ( defaultTimestampPrecision >= 9 || !temporal.isSupported( ChronoField.NANO_OF_SECOND ) ) { - return temporal; - } - //noinspection unchecked - return (T) temporal.with( - ChronoField.NANO_OF_SECOND, - roundToPrecision( temporal.get( ChronoField.NANO_OF_SECOND ), defaultTimestampPrecision ) - ); - } - - public static T doubleRoundToSecondPrecision(T temporal, int maxPrecision, int precision) { - return roundToSecondPrecision( roundToSecondPrecision( temporal, maxPrecision ), precision ); - } - public static T roundToSecondPrecision(T temporal, int precision) { if ( precision >= 9 || !temporal.isSupported( ChronoField.NANO_OF_SECOND ) ) { return temporal; diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JdbcTypeFamilyInformation.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JdbcTypeFamilyInformation.java index 591f1c82b2d4..a02d5b600629 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JdbcTypeFamilyInformation.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JdbcTypeFamilyInformation.java @@ -33,13 +33,6 @@ public int[] getTypeCodes() { } private final ConcurrentHashMap typeCodeToFamilyMap = new ConcurrentHashMap<>(); - { - for ( Family family : Family.values() ) { - for ( int typeCode : family.getTypeCodes() ) { - typeCodeToFamilyMap.put( typeCode, family ); - } - } - } /** * Will return {@code null} if no match is found. diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JsonHelper.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JsonHelper.java index 3d5e2aaa6a01..f3ff6066b7c3 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JsonHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JsonHelper.java @@ -312,10 +312,6 @@ public void ensureCapacity(int minCapacity) { } } - public Object[] getUnderlyingArray() { - return array; - } - @Override public int size() { return size; diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/CapacityDependentDdlType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/CapacityDependentDdlType.java index bcc966fdb642..8715feace32a 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/CapacityDependentDdlType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/CapacityDependentDdlType.java @@ -9,7 +9,6 @@ import org.hibernate.engine.jdbc.Size; import org.hibernate.metamodel.mapping.SqlExpressible; import org.hibernate.type.Type; -import org.hibernate.type.descriptor.jdbc.JdbcType; import org.hibernate.type.descriptor.sql.spi.DdlTypeRegistry; /** @@ -85,59 +84,6 @@ public boolean isLob(Size size) { return lobKind == LobKind.BIGGEST_LOB; } - public static Builder builder(int sqlTypeCode, String typeNamePattern, Dialect dialect) { - return builder( - sqlTypeCode, - JdbcType.isLob( sqlTypeCode ) ? LobKind.ALL_LOB : LobKind.NONE, - typeNamePattern, - typeNamePattern, - dialect - ); - } - - public static Builder builder(int sqlTypeCode, LobKind lobKind, String typeNamePattern, Dialect dialect) { - return builder( sqlTypeCode, lobKind, typeNamePattern, typeNamePattern, dialect ); - } - - public static Builder builder( - int sqlTypeCode, - String typeNamePattern, - String castTypeName, - Dialect dialect) { - return builder( - sqlTypeCode, - JdbcType.isLob( sqlTypeCode ) ? LobKind.ALL_LOB : LobKind.NONE, - typeNamePattern, - castTypeName, - dialect - ); - } - - public static Builder builder( - int sqlTypeCode, - LobKind lobKind, - String typeNamePattern, - String castTypeName, - Dialect dialect) { - return builder( sqlTypeCode, lobKind, typeNamePattern, (String) null, castTypeName, dialect ); - } - - public static Builder builder( - int sqlTypeCode, - String typeNamePattern, - String castTypeNamePattern, - String castTypeName, - Dialect dialect) { - return builder( - sqlTypeCode, - JdbcType.isLob( sqlTypeCode ) ? LobKind.ALL_LOB : LobKind.NONE, - typeNamePattern, - castTypeNamePattern, - castTypeName, - dialect - ); - } - public static Builder builder( int sqlTypeCode, LobKind lobKind, @@ -148,16 +94,6 @@ public static Builder builder( return new Builder( sqlTypeCode, lobKind, typeNamePattern, castTypeNamePattern, castTypeName, dialect ); } - public static Builder builder( - int sqlTypeCode, - LobKind lobKind, - String typeNamePattern, - Function parameterizedCastTypeName, - String castTypeName, - Dialect dialect) { - return new Builder( sqlTypeCode, lobKind, typeNamePattern, parameterizedCastTypeName, castTypeName, dialect ); - } - public static class Builder { private final int sqlTypeCode; private final LobKind lobKind; diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/DdlTypeImpl.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/DdlTypeImpl.java index 49d478e0834d..c8c4fc5eac36 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/DdlTypeImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/DdlTypeImpl.java @@ -41,34 +41,6 @@ public DdlTypeImpl( this( sqlTypeCode, typeNamePattern, null, castTypeName, castTypeName, dialect ); } - public DdlTypeImpl( - int sqlTypeCode, - boolean isLob, - String typeNamePattern, - String castTypeName, - Dialect dialect) { - this( sqlTypeCode, isLob, typeNamePattern, null, castTypeName, castTypeName, dialect ); - } - - public DdlTypeImpl( - int sqlTypeCode, - String typeNamePattern, - String castTypeNamePattern, //optional, usually null - String castTypeName, - Dialect dialect) { - this( sqlTypeCode, typeNamePattern, castTypeNamePattern, castTypeName, castTypeName, dialect ); - } - - public DdlTypeImpl( - int sqlTypeCode, - boolean isLob, - String typeNamePattern, - String castTypeNamePattern, //optional, usually null - String castTypeName, - Dialect dialect) { - this( sqlTypeCode, isLob, typeNamePattern, castTypeNamePattern, castTypeName, castTypeName, dialect ); - } - public DdlTypeImpl( int sqlTypeCode, String typeNamePattern, diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/NativeEnumDdlTypeImpl.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/NativeEnumDdlTypeImpl.java index 6faaed4f11ac..127bf9d64dc2 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/NativeEnumDdlTypeImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/NativeEnumDdlTypeImpl.java @@ -32,10 +32,6 @@ public NativeEnumDdlTypeImpl(Dialect dialect) { this( dialect, "varchar", null ); } - public NativeEnumDdlTypeImpl(Dialect dialect, IntFunction parameterizedCastTypeName) { - this( dialect, "varchar", parameterizedCastTypeName ); - } - public NativeEnumDdlTypeImpl( Dialect dialect, String castTypeName, diff --git a/hibernate-core/src/main/java/org/hibernate/type/format/StringJsonDocumentWriter.java b/hibernate-core/src/main/java/org/hibernate/type/format/StringJsonDocumentWriter.java index ff0121d8563d..3beb86434efe 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/format/StringJsonDocumentWriter.java +++ b/hibernate-core/src/main/java/org/hibernate/type/format/StringJsonDocumentWriter.java @@ -237,12 +237,6 @@ public JsonDocumentWriter serializeJsonValue(Object value, JavaType javaT return this; } - private void convertedCastBasicValueToString(Object value, WrapperOptions options, JsonAppender appender, JavaType javaType, JdbcType jdbcType) { - assert javaType.isInstance( value ); - //noinspection unchecked - convertedBasicValueToString( (T) value, options, appender, javaType, jdbcType ); - } - /** * Converts a value to String according to its mapping type. * This method serializes the value and writes it into the underlying appender diff --git a/hibernate-core/src/main/java/org/hibernate/type/format/jackson/JacksonIntegration.java b/hibernate-core/src/main/java/org/hibernate/type/format/jackson/JacksonIntegration.java index 8b72c6a3d0f9..4f3c05b998d1 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/format/jackson/JacksonIntegration.java +++ b/hibernate-core/src/main/java/org/hibernate/type/format/jackson/JacksonIntegration.java @@ -83,22 +83,6 @@ private static boolean ableToLoadJacksonOSONFactory() { : null; } - public static @Nullable FormatMapper getJsonJacksonFormatMapperOrNull() { - return JACKSON_JSON_AVAILABLE - ? new JacksonJsonFormatMapper() - : null; - } - public static @Nullable FormatMapper getJsonJackson3FormatMapperOrNull() { - return JACKSON3_JSON_AVAILABLE - ? new Jackson3JsonFormatMapper() - : null; - } - public static @Nullable FormatMapper getOsonJacksonFormatMapperOrNull() { - return JACKSON_OSON_AVAILABLE - ? new JacksonOsonFormatMapper() - : null; - } - /** * Checks that Oracle OSON extension available * diff --git a/hibernate-core/src/main/java/org/hibernate/type/spi/TypeConfiguration.java b/hibernate-core/src/main/java/org/hibernate/type/spi/TypeConfiguration.java index aabaa7aaa1a8..ad68203db32d 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/spi/TypeConfiguration.java +++ b/hibernate-core/src/main/java/org/hibernate/type/spi/TypeConfiguration.java @@ -46,7 +46,6 @@ import org.hibernate.dialect.type.spi.DirectJavaTimeJdbcSupports; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.internal.SessionFactoryRegistry; -import org.hibernate.jpa.spi.JpaCompliance; import org.hibernate.metamodel.mapping.BasicValuedMapping; import org.hibernate.metamodel.mapping.EmbeddableValuedModelPart; import org.hibernate.metamodel.mapping.JdbcMapping; @@ -614,16 +613,6 @@ else if ( sessionFactory != null ) { } } - private JpaCompliance getJpaCompliance() { - if ( metadataBuildingContext != null ) { - return metadataBuildingContext.getBootstrapContext().getJpaCompliance(); - } - else if ( sessionFactory != null ) { - return sessionFactory.getSessionFactoryOptions().getJpaCompliance(); - } - return null; - } - private void setMetadataBuildingContext(MetadataBuildingContext context) { metadataBuildingContext = context; if ( context != null ) { @@ -842,15 +831,6 @@ private static BasicType checkExisting(Class javaClass, BasicType e return basicType; } - private static BasicType checkExistingExact(Class javaClass, BasicType existing) { - if ( existing.getJavaType() != javaClass ) { - throw new IllegalStateException( "Type registration was corrupted for: " + javaClass.getName() ); - } - @SuppressWarnings("unchecked") // safe, we just checked - final var basicType = (BasicType) existing; - return basicType; - } - @Deprecated(since = "7.2", forRemoval = true) // no longer used public @Nullable BasicType getBasicTypeForGenericJavaType(Class javaType, Type... typeArguments) { //noinspection unchecked diff --git a/hibernate-core/src/test/java/org/hibernate/action/queue/graph/GraphTestUtils.java b/hibernate-core/src/test/java/org/hibernate/action/queue/graph/GraphTestUtils.java index 7aa071774e25..f62f93cb4252 100644 --- a/hibernate-core/src/test/java/org/hibernate/action/queue/graph/GraphTestUtils.java +++ b/hibernate-core/src/test/java/org/hibernate/action/queue/graph/GraphTestUtils.java @@ -142,11 +142,10 @@ public static GraphEdge createEdge( Constraint constraint, long stableId) { if ( !breakable ) { - return GraphEdge.requiredOrder( targetNode, keyNode, from, to, columnsToNull, constraint, stableId ); + return GraphEdge.requiredOrder( keyNode, from, to, columnsToNull, constraint, stableId ); } if ( constraint instanceof ForeignKey foreignKey ) { return GraphEdge.nullPatchableFk( - targetNode, keyNode, from, to, @@ -158,7 +157,6 @@ public static GraphEdge createEdge( } if ( constraint instanceof UniqueConstraint uniqueConstraint ) { return GraphEdge.nullPatchableUnique( - targetNode, keyNode, from, to, @@ -168,7 +166,7 @@ public static GraphEdge createEdge( stableId ); } - return GraphEdge.preferredOrder( targetNode, keyNode, from, to, columnsToNull, constraint, breakCost, stableId ); + return GraphEdge.preferredOrder( keyNode, from, to, columnsToNull, constraint, breakCost, stableId ); } /// Create a simple breakable edge with default parameters @@ -197,7 +195,6 @@ public static GraphEdge createUnbreakableEdge(GroupNode from, GroupNode to) { public static GraphEdge createPreferredOrderEdge(GroupNode from, GroupNode to) { return GraphEdge.preferredOrder( - from, to, from, to, @@ -221,7 +218,7 @@ public static GraphEdge createNullPatchableFkEdge(GroupNode from, GroupNode to, selectable( to.group().tableExpression(), "id" ), true ); - return GraphEdge.nullPatchableFk( to, from, from, to, columns, fk, breakCost, stableId ); + return GraphEdge.nullPatchableFk( from, from, to, columns, fk, breakCost, stableId ); } public static GraphEdge createNullPatchableUniqueEdge(GroupNode from, GroupNode to, int breakCost) { @@ -231,7 +228,7 @@ public static GraphEdge createNullPatchableUniqueEdge(GroupNode from, GroupNode public static GraphEdge createNullPatchableUniqueEdge(GroupNode from, GroupNode to, int breakCost, long stableId) { final SelectableMappings columns = selectable( from.group().tableExpression(), "unique_col" ); final UniqueConstraint uniqueConstraint = uniqueConstraint( from, columns ); - return GraphEdge.nullPatchableUnique( to, from, from, to, columns, uniqueConstraint, breakCost, stableId ); + return GraphEdge.nullPatchableUnique( from, from, to, columns, uniqueConstraint, breakCost, stableId ); } public static GraphEdge createLegacyRequiredUniqueEdge(GroupNode from, GroupNode to) { @@ -241,7 +238,7 @@ public static GraphEdge createLegacyRequiredUniqueEdge(GroupNode from, GroupNode public static GraphEdge createLegacyRequiredUniqueEdge(GroupNode from, GroupNode to, long stableId) { final SelectableMappings columns = selectable( from.group().tableExpression(), "unique_col" ); final UniqueConstraint uniqueConstraint = uniqueConstraint( from, columns ); - return GraphEdge.requiredOrder( to, from, from, to, columns, uniqueConstraint, stableId ); + return GraphEdge.requiredOrder( from, from, to, columns, uniqueConstraint, stableId ); } public static GraphEdge createLegacyRequiredFkEdge(GroupNode from, GroupNode to) { @@ -253,7 +250,7 @@ public static GraphEdge createLegacyRequiredFkEdge(GroupNode from, GroupNode to) selectable( to.group().tableExpression(), "id" ), false ); - return GraphEdge.requiredOrder( to, from, from, to, columns, fk, System.nanoTime() ); + return GraphEdge.requiredOrder( from, from, to, columns, fk, System.nanoTime() ); } private static ForeignKey foreignKey( diff --git a/hibernate-core/src/test/java/org/hibernate/action/queue/internal/decompose/collection/CollectionMutationCompletionTest.java b/hibernate-core/src/test/java/org/hibernate/action/queue/internal/decompose/collection/CollectionMutationCompletionTest.java index 4e244e2e0884..c8901f9806eb 100644 --- a/hibernate-core/src/test/java/org/hibernate/action/queue/internal/decompose/collection/CollectionMutationCompletionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/action/queue/internal/decompose/collection/CollectionMutationCompletionTest.java @@ -179,6 +179,6 @@ void statementGroupingDoesNotMergeMutationIdentity() { } private static CollectionMutationCompletion completion(long id) { - return new CollectionMutationCompletion( new CollectionMutationId( id ), null ); + return new CollectionMutationCompletion( new CollectionMutationId( id )); } } diff --git a/hibernate-core/src/test/java/org/hibernate/action/queue/internal/exec/BatchingExecutionMonitorTest.java b/hibernate-core/src/test/java/org/hibernate/action/queue/internal/exec/BatchingExecutionMonitorTest.java index 124580c39f9b..61c4f43e9f71 100644 --- a/hibernate-core/src/test/java/org/hibernate/action/queue/internal/exec/BatchingExecutionMonitorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/action/queue/internal/exec/BatchingExecutionMonitorTest.java @@ -73,8 +73,7 @@ void monitoringSurroundsBatchExecutionRatherThanBatchPopulation() { operation.setExecutionMonitor( executionMonitor ); final var completionHandler = mock( PostExecutionCallback.class ); final var mutationCompletion = new CollectionMutationCompletion( - new CollectionMutationId( 1 ), - null + new CollectionMutationId( 1 ) ); mutationCompletion.registerOperation( operation ); mutationCompletion.registerCompletionHandler( completionHandler ); @@ -126,8 +125,7 @@ void failedBatchSuppressesSemanticCompletion() { ); final var completionHandler = mock( PostExecutionCallback.class ); final var mutationCompletion = new CollectionMutationCompletion( - new CollectionMutationId( 1 ), - null + new CollectionMutationId( 1 ) ); mutationCompletion.registerOperation( operation ); mutationCompletion.registerCompletionHandler( completionHandler ); @@ -180,7 +178,7 @@ void groupedRowsRetainPerRowBindingAndResultChecksWithOneCompletion() throws SQL shapeKey ); final var completionHandler = mock( PostExecutionCallback.class ); - final var completion = new CollectionMutationCompletion( new CollectionMutationId( 2 ), null ); + final var completion = new CollectionMutationCompletion( new CollectionMutationId( 2 )); completion.registerOperation( operation ); completion.registerCompletionHandler( completionHandler ); completion.seal( session ); diff --git a/hibernate-core/src/test/java/org/hibernate/action/queue/internal/exec/CollectionMutationExecutorCompletionTest.java b/hibernate-core/src/test/java/org/hibernate/action/queue/internal/exec/CollectionMutationExecutorCompletionTest.java index d5e6b69b6d24..7250882441f7 100644 --- a/hibernate-core/src/test/java/org/hibernate/action/queue/internal/exec/CollectionMutationExecutorCompletionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/action/queue/internal/exec/CollectionMutationExecutorCompletionTest.java @@ -64,7 +64,7 @@ void directExecutionVisitsEveryGroupedBindingAndCompletesOnce() { final var handler = mock( PostExecutionCallback.class ); final var bindPlan = new TestingGroupedBindPlan( 4 ); final var operation = operation( bindPlan ); - final var completion = new CollectionMutationCompletion( new CollectionMutationId( 2 ), null ); + final var completion = new CollectionMutationCompletion( new CollectionMutationId( 2 )); completion.registerOperation( operation ); completion.registerCompletionHandler( handler ); completion.seal( session ); @@ -103,8 +103,7 @@ private static class Fixture { private final SessionImplementor session = mock( SessionImplementor.class ); private final PostExecutionCallback handler = mock( PostExecutionCallback.class ); private final CollectionMutationCompletion completion = new CollectionMutationCompletion( - new CollectionMutationId( 1 ), - null + new CollectionMutationId( 1 ) ); private final FlushOperation operation; diff --git a/hibernate-core/src/test/java/org/hibernate/bytecode/internal/bytebuddy/SuperTypesEnhancementTest.java b/hibernate-core/src/test/java/org/hibernate/bytecode/internal/bytebuddy/SuperTypesEnhancementTest.java index 26ad9fdfcb85..097bd483e141 100644 --- a/hibernate-core/src/test/java/org/hibernate/bytecode/internal/bytebuddy/SuperTypesEnhancementTest.java +++ b/hibernate-core/src/test/java/org/hibernate/bytecode/internal/bytebuddy/SuperTypesEnhancementTest.java @@ -45,14 +45,6 @@ private static Stream superTypeMethods() { .map( Arguments::of ); } - private static Stream interfaces() { - return Arrays.stream( PrimeAmongSecondarySupertypes.class.getDeclaredMethods() ) - // need to filter out methods added by jacoco - .filter( method -> !method.isSynthetic() ) - .map( m -> m.getReturnType() ) - .map( e -> Arguments.of( e ) ); - } - @ParameterizedTest @MethodSource("superTypeMethods") public void testNamingConventions(Method m) { diff --git a/hibernate-core/src/test/java/org/hibernate/event/service/internal/EventListenerDuplicationStrategyTest.java b/hibernate-core/src/test/java/org/hibernate/event/service/internal/EventListenerDuplicationStrategyTest.java index a17ccbec238d..32660f6de6c6 100644 --- a/hibernate-core/src/test/java/org/hibernate/event/service/internal/EventListenerDuplicationStrategyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/event/service/internal/EventListenerDuplicationStrategyTest.java @@ -28,7 +28,7 @@ public class EventListenerDuplicationStrategyTest { Tracker tracker = new Tracker(); ClearEvent event = new ClearEvent( null ); - EventListenerGroup listenerGroup = new EventListenerGroupImpl( EventType.CLEAR, false ); + EventListenerGroup listenerGroup = new EventListenerGroupImpl( EventType.CLEAR); @Test public void testListenersIterator() { diff --git a/hibernate-core/src/test/java/org/hibernate/internal/util/GenericsHelperTest.java b/hibernate-core/src/test/java/org/hibernate/internal/util/GenericsHelperTest.java index c57f1b562f00..8b51ef88a894 100644 --- a/hibernate-core/src/test/java/org/hibernate/internal/util/GenericsHelperTest.java +++ b/hibernate-core/src/test/java/org/hibernate/internal/util/GenericsHelperTest.java @@ -5,6 +5,7 @@ import java.lang.reflect.Type; import jakarta.persistence.*; +import jakarta.persistence.AttributeConverter; import static org.assertj.core.api.Assertions.assertThat; @@ -52,9 +53,6 @@ public void testUnboundConverterTypeVariable() { assertThat( types[1] ).isEqualTo( String.class ); } - abstract static class AbstractBaseConverter implements AttributeConverter { - } - - abstract static class AbstractMiddleConverter extends AbstractBaseConverter { + abstract static class AbstractMiddleConverter implements AttributeConverter { } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/action/queue/decomposer/InsertDecomposerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/action/queue/decomposer/InsertDecomposerTest.java index 3f0adc29e576..7272b19b8717 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/action/queue/decomposer/InsertDecomposerTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/action/queue/decomposer/InsertDecomposerTest.java @@ -542,30 +542,4 @@ public static class EntityWithGeneratedValue { String name; } - - /** - * Composite key for grouping operations by shape and ordinalBase. - */ - private static class OperationGroupKey { - private final StatementShapeKey shapeKey; - private final int ordinalBase; - - OperationGroupKey(StatementShapeKey shapeKey, int ordinalBase) { - this.shapeKey = shapeKey; - this.ordinalBase = ordinalBase; - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (!(o instanceof OperationGroupKey)) return false; - OperationGroupKey that = (OperationGroupKey) o; - return ordinalBase == that.ordinalBase && shapeKey.equals(that.shapeKey); - } - - @Override - public int hashCode() { - return 31 * shapeKey.hashCode() + ordinalBase; - } - } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/action/queue/integration/DecomposerGraphPlannerIntegrationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/action/queue/integration/DecomposerGraphPlannerIntegrationTest.java index c0f5c5494dd8..6c1503f6ea0e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/action/queue/integration/DecomposerGraphPlannerIntegrationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/action/queue/integration/DecomposerGraphPlannerIntegrationTest.java @@ -1543,30 +1543,4 @@ public void setCatalogCode(String catalogCode) { this.catalogCode = catalogCode; } } - - /** - * Composite key for grouping operations by shape and ordinalBase. - */ - private static class OperationGroupKey { - private final StatementShapeKey shapeKey; - private final int ordinalBase; - - OperationGroupKey(StatementShapeKey shapeKey, int ordinalBase) { - this.shapeKey = shapeKey; - this.ordinalBase = ordinalBase; - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (!(o instanceof OperationGroupKey)) return false; - OperationGroupKey that = (OperationGroupKey) o; - return ordinalBase == that.ordinalBase && shapeKey.equals(that.shapeKey); - } - - @Override - public int hashCode() { - return 31 * shapeKey.hashCode() + ordinalBase; - } - } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/action/queue/planner/StandardFlushPlannerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/action/queue/planner/StandardFlushPlannerTest.java index 8ddc2ca8ced9..ea2ef9391aac 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/action/queue/planner/StandardFlushPlannerTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/action/queue/planner/StandardFlushPlannerTest.java @@ -707,14 +707,6 @@ private FlushOperation createOperation( ); } - private GraphEdge createEdge(GroupNode from, GroupNode to, boolean breakable, long stableId) { - if (breakable) { - return GraphTestUtils.createBreakableEdge(from, to, 10); - } else { - return GraphTestUtils.createUnbreakableEdge(from, to); - } - } - private GraphEdge createEdge(GroupNode from, GroupNode to, boolean breakable, int breakCost) { if (breakable) { return GraphTestUtils.createBreakableEdge(from, to, breakCost); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/MutableClock.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/MutableClock.java index d795c200fa47..6b0558ec30b3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/MutableClock.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/MutableClock.java @@ -18,14 +18,6 @@ public MutableClock() { this( ZoneId.systemDefault(), START_INSTANT ); } - public MutableClock(ZoneId zoneId) { - this( zoneId, START_INSTANT ); - } - - public MutableClock(Instant instant) { - this( ZoneId.systemDefault(), instant ); - } - public MutableClock(ZoneId zoneId, Instant instant) { this.zoneId = zoneId; this.instant = instant; @@ -46,10 +38,6 @@ public Instant instant() { return instant; } - public void setInstant(Instant instant) { - this.instant = instant; - } - public void reset() { instant = START_INSTANT; } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/DependentId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/DependentId.java deleted file mode 100644 index 2016ebab5bbb..000000000000 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/DependentId.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.hibernate.orm.test.annotations.derivedidentities.bidirectional; - - -/** - * @author Hardy Ferentschik - */ -public class DependentId { - long emp; // matches name of @Id attribute and type of Employee PK -} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/OrderLinePK.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/OrderLinePK.java deleted file mode 100644 index 7204675307b6..000000000000 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/OrderLinePK.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.hibernate.orm.test.annotations.derivedidentities.bidirectional; - - -public class OrderLinePK -{ - public Order order; - public Product product; -} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/PhoneNumber.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/PhoneNumber.java index 96cc188a2f70..8cf4aaa72ae4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/PhoneNumber.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/PhoneNumber.java @@ -14,8 +14,4 @@ public String getNumber() { return number; } - public void setNumber(String number) { - this.number = number; - } - } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/EnumeratedAndGenerics2Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/EnumeratedAndGenerics2Test.java index bf8793ad0f91..47910467938e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/EnumeratedAndGenerics2Test.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/EnumeratedAndGenerics2Test.java @@ -51,15 +51,11 @@ public void setUp(SessionFactoryScope scope) { ); } - public interface EnumBase { - String name(); - } - - public enum TestEnum implements EnumBase { + public enum TestEnum { FOO, BAR } - public enum AnotherTestEnum implements EnumBase { + public enum AnotherTestEnum { ONE, TWO } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/EnumeratedAndGenerics3Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/EnumeratedAndGenerics3Test.java index ae99eb75e688..751b114d7ac4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/EnumeratedAndGenerics3Test.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/EnumeratedAndGenerics3Test.java @@ -44,11 +44,7 @@ public void setUp(SessionFactoryScope scope) { ); } - public interface EnumBase { - String name(); - } - - public enum TestEnum implements EnumBase { + public enum TestEnum { FOO, BAR } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/EnumeratedAndGenericsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/EnumeratedAndGenericsTest.java index dabde08a62bf..53188c486209 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/EnumeratedAndGenericsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/EnumeratedAndGenericsTest.java @@ -51,20 +51,16 @@ public void setUp(SessionFactoryScope scope) { ); } - public interface EnumBase { - String name(); - } - - public enum TestEnum implements EnumBase { + public enum TestEnum { FOO, BAR } - public enum AnotherTestEnum implements EnumBase { + public enum AnotherTestEnum { ONE, TWO } @MappedSuperclass - public static abstract class GenericBaseEntity { + public static abstract class GenericBaseEntity { @Enumerated(EnumType.STRING) protected T state; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/GenericManyToOneParameterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/GenericManyToOneParameterTest.java index f50fa7f14ed1..ab0070b5b55f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/GenericManyToOneParameterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/GenericManyToOneParameterTest.java @@ -85,15 +85,12 @@ public interface EntityWithId { Long getId(); } - public interface Site extends EntityWithId { - } - - public interface UserSite extends Site { + public interface UserSite extends EntityWithId { String getName(); } @Entity( name = "SiteImpl" ) - public static abstract class SiteImpl implements Site { + public static abstract class SiteImpl implements EntityWithId { @Id protected Long id; @@ -123,12 +120,12 @@ public static class UserSiteImpl extends SiteImpl implements UserSite { public interface Bar extends EntityWithId { } - public interface SitedBar extends Bar { + public interface SitedBar extends Bar { S getSite(); } @MappedSuperclass - public static abstract class BarBarImpl implements SitedBar { + public static abstract class BarBarImpl implements SitedBar { @ManyToOne( fetch = FetchType.LAZY, targetEntity = SiteImpl.class ) @JoinColumn( name = "BAR_ID" ) private T site; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/GenericMappedSuperclassPropertyUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/GenericMappedSuperclassPropertyUpdateTest.java index 8b37cd3a8047..d634912c7881 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/GenericMappedSuperclassPropertyUpdateTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/GenericMappedSuperclassPropertyUpdateTest.java @@ -72,13 +72,11 @@ void testGenericHierarchy(Consumer updater) { static class UpdateContext { final CriteriaUpdate query; final Root root; - final Long id; final SpecificEntity relative; UpdateContext(CriteriaUpdate query, Root root, Long id, SpecificEntity relative) { this.query = query; this.root = root; - this.id = id; this.relative = relative; } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/JoinedSubclassAndSecondaryTable.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/JoinedSubclassAndSecondaryTable.java index 4fe7ebbc621e..073bc368bcda 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/JoinedSubclassAndSecondaryTable.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/JoinedSubclassAndSecondaryTable.java @@ -14,7 +14,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertTrue; /** @@ -155,13 +154,4 @@ private void assertNumberOfRows(Session s, String tableName, int expectedNumberO } ); } - - private long getTableRowCount(Session s, String tableName) { - // the type returned for count(*) in a native query depends on the dialect - // Oracle returns Types.NUMERIC, which is mapped to BigDecimal; - // H2 returns Types.BIGINT, which is mapped to BigInteger; - Object retVal = s.createNativeQuery( "select count(*) from " + tableName, Object.class ).uniqueResult(); - assertTrue( Number.class.isInstance( retVal ) ); - return ( (Number) retVal ).longValue(); - } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/CharacterArrayTextType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/CharacterArrayTextType.java deleted file mode 100644 index 6614f15fe9b3..000000000000 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/CharacterArrayTextType.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.hibernate.orm.test.annotations.lob; -import org.hibernate.type.AbstractSingleColumnStandardBasicType; -import org.hibernate.type.descriptor.java.CharacterArrayJavaType; -import org.hibernate.type.descriptor.jdbc.LongVarcharJdbcType; - -/** - * A type that maps JDBC {@link java.sql.Types#LONGVARCHAR LONGVARCHAR} and {@code Character[]}. - * - * @author Strong Liu - */ -public class CharacterArrayTextType extends AbstractSingleColumnStandardBasicType { - public static final CharacterArrayTextType INSTANCE = new CharacterArrayTextType(); - - public CharacterArrayTextType() { - super( LongVarcharJdbcType.INSTANCE, CharacterArrayJavaType.INSTANCE ); - } - - public String getName() { - // todo name these annotation types for addition to the registry - return null; - } -} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/PrimitiveCharacterArrayTextType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/PrimitiveCharacterArrayTextType.java deleted file mode 100644 index e649a67679a1..000000000000 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/PrimitiveCharacterArrayTextType.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.hibernate.orm.test.annotations.lob; - -import org.hibernate.type.AbstractSingleColumnStandardBasicType; -import org.hibernate.type.descriptor.java.PrimitiveCharacterArrayJavaType; -import org.hibernate.type.descriptor.jdbc.LongVarcharJdbcType; - -/** - * A type that maps JDBC {@link java.sql.Types#LONGVARCHAR LONGVARCHAR} and {@code char[]}. - * - * @author Strong Liu - */ -public class PrimitiveCharacterArrayTextType extends AbstractSingleColumnStandardBasicType { - public static final PrimitiveCharacterArrayTextType INSTANCE = new PrimitiveCharacterArrayTextType(); - - public PrimitiveCharacterArrayTextType() { - super( LongVarcharJdbcType.INSTANCE, PrimitiveCharacterArrayJavaType.INSTANCE ); - } - - public String getName() { - // todo name these annotation types for addition to the registry - return null; - } -} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/SerializableToImageType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/SerializableToImageType.java deleted file mode 100644 index 38e481888dd2..000000000000 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/SerializableToImageType.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.hibernate.orm.test.annotations.lob; - -import java.io.Serializable; - -import org.hibernate.type.AbstractSingleColumnStandardBasicType; -import org.hibernate.type.descriptor.java.SerializableJavaType; -import org.hibernate.type.descriptor.jdbc.LongVarbinaryJdbcType; - -/** - * A type that maps JDBC {@link java.sql.Types#LONGVARBINARY LONGVARBINARY} and {@link Serializable}. - *

    - * TODO : this should really have access to the actual Serializable class so we have access to the proper classloader - * - * @author Strong Liu - */ -public class SerializableToImageType extends AbstractSingleColumnStandardBasicType { - public static final PrimitiveCharacterArrayTextType INSTANCE = new PrimitiveCharacterArrayTextType(); - - public SerializableToImageType() { - super( LongVarbinaryJdbcType.INSTANCE, new SerializableJavaType( Serializable.class ) ); - } - - public String getName() { - // todo name these annotation types for addition to the registry - return null; - } -} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/WrappedImageType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/WrappedImageType.java deleted file mode 100644 index 84895bfbf004..000000000000 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/WrappedImageType.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.hibernate.orm.test.annotations.lob; - -import org.hibernate.type.AbstractSingleColumnStandardBasicType; -import org.hibernate.type.descriptor.java.ByteArrayJavaType; -import org.hibernate.type.descriptor.jdbc.LongVarbinaryJdbcType; - -/** - * A type that maps JDBC {@link java.sql.Types#LONGVARBINARY LONGVARBINARY} and {@code Byte[]} - * - * @author Strong Liu - */ -public class WrappedImageType extends AbstractSingleColumnStandardBasicType { - public static final WrappedImageType INSTANCE = new WrappedImageType(); - - public WrappedImageType() { - super( LongVarbinaryJdbcType.INSTANCE, ByteArrayJavaType.INSTANCE ); - } - - public String getName() { - // todo name these annotation types for addition to the registry - return null; - } -} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/any/xml/AnyContainer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/any/xml/AnyContainer.java index ecc13bffb71f..d2d686180270 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/any/xml/AnyContainer.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/any/xml/AnyContainer.java @@ -1,53 +1,10 @@ package org.hibernate.orm.test.any.xml; -import java.util.Map; - /** * @author Steve Ebersole */ public class AnyContainer { - private Integer id; - private String name; - private PropertyValue someSpecificProperty; - private Map generalProperties; public AnyContainer() { } - - public AnyContainer(Integer id, String name) { - this.id = id; - this.name = name; - } - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public PropertyValue getSomeSpecificProperty() { - return someSpecificProperty; - } - - public void setSomeSpecificProperty(PropertyValue someSpecificProperty) { - this.someSpecificProperty = someSpecificProperty; - } - - public Map getGeneralProperties() { - return generalProperties; - } - - public void setGeneralProperties(Map generalProperties) { - this.generalProperties = generalProperties; - } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/any/xml/Mapper.java b/hibernate-core/src/test/java/org/hibernate/orm/test/any/xml/Mapper.java deleted file mode 100644 index 91d7811047da..000000000000 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/any/xml/Mapper.java +++ /dev/null @@ -1,12 +0,0 @@ -package org.hibernate.orm.test.any.xml; - -import java.util.Map; - -/** - * @author Steve Ebersole - */ -public class Mapper { - private Integer id; - private String name; - private Map stuff; -} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchTests.java index db2ec2d90f5b..daee2a1365d1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchTests.java @@ -148,19 +148,6 @@ public void testBulk(EntityManagerFactoryScope scope) { } ); } - private void withoutBatch(EntityManagerFactoryScope scope) { - //tag::batch-session-batch-example[] - scope.inTransaction( - entityManager -> { - for ( int i = 0; i < 100_000; i++ ) { - Person Person = new Person( String.format( "Person %d", i ) ); - entityManager.persist( Person ); - } - } - ); - //end::batch-session-batch-example[] - } - private void withBatch(EntityManagerFactoryScope scope) { int entityCount = 100; int batchSize = 25; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/LeakingStatementCachingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/LeakingStatementCachingTest.java index d9fc8ac43ca8..23daa95a5fd3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/LeakingStatementCachingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/LeakingStatementCachingTest.java @@ -581,7 +581,7 @@ public boolean equals(Object other) { @Override public ResultSet executeQuery(String sql) throws SQLException { - return new ResultSetWrapper( delegate.executeQuery( sql ), this ); + return new ResultSetWrapper( delegate.executeQuery( sql )); } @Override @@ -726,7 +726,7 @@ public boolean getMoreResults(int current) throws SQLException { @Override public ResultSet getGeneratedKeys() throws SQLException { - return new ResultSetWrapper( delegate.getGeneratedKeys(), this ); + return new ResultSetWrapper( delegate.getGeneratedKeys()); } @Override @@ -1239,7 +1239,7 @@ public boolean execute(String sql) throws SQLException { @Override public ResultSet getResultSet() throws SQLException { - return new ResultSetWrapper( delegate.getResultSet(), this ); + return new ResultSetWrapper( delegate.getResultSet()); } @Override @@ -1309,7 +1309,7 @@ public boolean getMoreResults(int current) throws SQLException { @Override public ResultSet getGeneratedKeys() throws SQLException { - return new ResultSetWrapper( delegate.getGeneratedKeys(), this ); + return new ResultSetWrapper( delegate.getGeneratedKeys()); } @Override @@ -1446,11 +1446,9 @@ public boolean isWrapperFor(Class iface) throws SQLException { private static class ResultSetWrapper implements ResultSet { private final ResultSet delegate; - private final StatementWrapper owner; - private ResultSetWrapper(ResultSet delegate, StatementWrapper owner) { + private ResultSetWrapper(ResultSet delegate) { this.delegate = delegate; - this.owner = owner; } @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/cfgXml/CfgXmlResourceNameClosingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/cfgXml/CfgXmlResourceNameClosingTest.java index 4ba258b7dfe5..bd6197475723 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/cfgXml/CfgXmlResourceNameClosingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/cfgXml/CfgXmlResourceNameClosingTest.java @@ -102,10 +102,6 @@ public void close() throws IOException { wasClosed = true; super.close(); } - - public boolean wasClosed() { - return wasClosed; - } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/JaxbHelper.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/JaxbHelper.java index a149029462fa..9812ff112166 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/JaxbHelper.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/JaxbHelper.java @@ -2,7 +2,6 @@ import java.io.InputStream; import java.util.function.Consumer; -import java.util.function.Function; import javax.xml.stream.XMLEventReader; import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamException; @@ -34,17 +33,6 @@ public boolean isValidationEnabled() { return validationEnabled; } - public static T withStaxEventReader(InputStream inputStream, ClassLoaderService cls, Function action) { - final XMLEventReader reader = createReader( inputStream, cls ); - final T applied = action.apply( reader ); - try { - reader.close(); - } - catch (XMLStreamException ignore) { - } - return applied; - } - public static void withStaxEventReader(InputStream inputStream, ClassLoaderService cls, Consumer action) { final XMLEventReader reader = createReader( inputStream, cls ); action.accept( reader ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/mapping/Money.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/mapping/Money.java index 488e0dad7030..d55a5113155c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/mapping/Money.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/mapping/Money.java @@ -10,8 +10,4 @@ public Money(long cents) { public long getCents() { return cents; } - - public void setCents(long cents) { - this.cents = cents; - } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/mapping/parent/NestedAddress.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/mapping/parent/NestedAddress.java index b04d00100fb3..688cfcd27618 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/mapping/parent/NestedAddress.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/mapping/parent/NestedAddress.java @@ -1,31 +1,4 @@ package org.hibernate.orm.test.boot.jaxb.mapping.parent; public class NestedAddress { - private CompositeChild owner; - private String street; - private String city; - - public CompositeChild getOwner() { - return owner; - } - - public void setOwner(CompositeChild owner) { - this.owner = owner; - } - - public String getStreet() { - return street; - } - - public void setStreet(String street) { - this.street = street; - } - - public String getCity() { - return city; - } - - public void setCity(String city) { - this.city = city; - } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/hbm/cacheable/SimpleEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/hbm/cacheable/SimpleEntity.java deleted file mode 100644 index 919dce440b72..000000000000 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/hbm/cacheable/SimpleEntity.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.hibernate.orm.test.bootstrap.binding.hbm.cacheable; - -/** - * @author Steve Ebersole - */ -public class SimpleEntity { - private Long id; - private String name; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } -} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/ScannerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/ScannerTest.java index 225346f9e97b..bf740d96c8cd 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/ScannerTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/ScannerTest.java @@ -11,9 +11,7 @@ import java.io.File; import java.net.URL; -import java.util.Set; -import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -36,10 +34,6 @@ public void testNativeScanner() throws Exception { } - private void assertClassesContained(Set discoveredClasses, Class classToCheckFor) { - assertThat( discoveredClasses ).contains( classToCheckFor.getName() ); - } - @Test public void testCustomScanner() throws Exception { File defaultPar = buildDefaultPar(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/delegation/TestDelegatingMetadata.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/delegation/TestDelegatingMetadata.java deleted file mode 100644 index bc8df803347c..000000000000 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/delegation/TestDelegatingMetadata.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.hibernate.orm.test.bootstrap.spi.delegation; - - -import org.hibernate.boot.spi.AbstractDelegatingMetadata; -import org.hibernate.boot.spi.MetadataImplementor; - -/** - * If this class does not compile anymore due to unimplemented methods, you should probably add the corresponding - * methods to the parent class. - * - * @author Guillaume Smet - */ -public class TestDelegatingMetadata extends AbstractDelegatingMetadata { - - public TestDelegatingMetadata(MetadataImplementor delegate) { - super( delegate ); - } -} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/delegation/TestDelegatingMetadataBuilderImplementor.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/delegation/TestDelegatingMetadataBuilderImplementor.java deleted file mode 100644 index 49d0cc1e565d..000000000000 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/delegation/TestDelegatingMetadataBuilderImplementor.java +++ /dev/null @@ -1,40 +0,0 @@ -package org.hibernate.orm.test.bootstrap.spi.delegation; - -import jakarta.annotation.Nonnull; -import jakarta.annotation.Nullable; -import org.hibernate.boot.MetadataBuilder; -import org.hibernate.boot.spi.AbstractDelegatingMetadataBuilderImplementor; -import org.hibernate.boot.spi.BootstrapContext; -import org.hibernate.boot.spi.MetadataBuilderImplementor; -import org.hibernate.metamodel.CollectionClassification; - -/** - * If this class does not compile anymore due to unimplemented methods, you should probably add the corresponding - * methods to the parent class. - * - * @author Guillaume Smet - */ -public class TestDelegatingMetadataBuilderImplementor extends AbstractDelegatingMetadataBuilderImplementor { - - public TestDelegatingMetadataBuilderImplementor(MetadataBuilderImplementor delegate) { - super( delegate ); - } - - @Override - @Nonnull - protected TestDelegatingMetadataBuilderImplementor getThis() { - return this; - } - - @Override - public BootstrapContext getBootstrapContext() { - return delegate().getBootstrapContext(); - } - - @Override - @Deprecated(since = "8.0", forRemoval = true) - @Nonnull - public MetadataBuilder applyImplicitListSemantics(@Nullable CollectionClassification classification) { - return delegate().applyImplicitListSemantics( classification ); - } -} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/delegation/TestDelegatingMetadataBuildingOptions.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/delegation/TestDelegatingMetadataBuildingOptions.java deleted file mode 100644 index da863e19f632..000000000000 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/delegation/TestDelegatingMetadataBuildingOptions.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.hibernate.orm.test.bootstrap.spi.delegation; - -import org.hibernate.boot.spi.AbstractDelegatingMetadataBuildingOptions; -import org.hibernate.boot.spi.MetadataBuildingOptions; - -/** - * If this class does not compile anymore due to unimplemented methods, you should probably add the corresponding - * methods to the parent class. - * - * @author Guillaume Smet - */ -public class TestDelegatingMetadataBuildingOptions extends AbstractDelegatingMetadataBuildingOptions { - - public TestDelegatingMetadataBuildingOptions(MetadataBuildingOptions delegate) { - super( delegate ); - } -} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/delegation/TestDelegatingSessionFactoryBuilder.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/delegation/TestDelegatingSessionFactoryBuilder.java deleted file mode 100644 index bae1950c2c1a..000000000000 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/delegation/TestDelegatingSessionFactoryBuilder.java +++ /dev/null @@ -1,24 +0,0 @@ -package org.hibernate.orm.test.bootstrap.spi.delegation; - -import jakarta.annotation.Nonnull; -import org.hibernate.boot.SessionFactoryBuilder; -import org.hibernate.boot.spi.AbstractDelegatingSessionFactoryBuilder; - -/** - * If this class does not compile anymore due to unimplemented methods, you should probably add the corresponding - * methods to the parent class. - * - * @author Guillaume Smet - */ -public class TestDelegatingSessionFactoryBuilder extends AbstractDelegatingSessionFactoryBuilder { - - public TestDelegatingSessionFactoryBuilder(SessionFactoryBuilder delegate) { - super( delegate ); - } - - @Override - @Nonnull - protected TestDelegatingSessionFactoryBuilder getThis() { - return this; - } -} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/delegation/TestDelegatingSessionFactoryBuilderImplementor.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/delegation/TestDelegatingSessionFactoryBuilderImplementor.java deleted file mode 100644 index 1c8c7fa177f9..000000000000 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/delegation/TestDelegatingSessionFactoryBuilderImplementor.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.hibernate.orm.test.bootstrap.spi.delegation; - -import jakarta.annotation.Nonnull; -import org.hibernate.boot.spi.AbstractDelegatingSessionFactoryBuilderImplementor; -import org.hibernate.boot.spi.SessionFactoryBuilderImplementor; - - -/** - * If this class does not compile anymore due to unimplemented methods, you should probably add the corresponding - * methods to the parent class. - * - * @author Guillaume Smet - */ -public class TestDelegatingSessionFactoryBuilderImplementor extends AbstractDelegatingSessionFactoryBuilderImplementor { - - public TestDelegatingSessionFactoryBuilderImplementor(SessionFactoryBuilderImplementor delegate) { - super( delegate ); - } - - @Override - @Nonnull - protected TestDelegatingSessionFactoryBuilderImplementor getThis() { - return this; - } -} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/delegation/TestDelegatingSessionFactoryOptions.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/delegation/TestDelegatingSessionFactoryOptions.java deleted file mode 100644 index f541446e8db3..000000000000 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/delegation/TestDelegatingSessionFactoryOptions.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.hibernate.orm.test.bootstrap.spi.delegation; - -import org.hibernate.boot.spi.AbstractDelegatingSessionFactoryOptions; -import org.hibernate.boot.spi.SessionFactoryOptions; - -/** - * If this class does not compile anymore due to unimplemented methods, you should probably add the corresponding - * methods to the parent class. - * - * @author Guillaume Smet - */ -public class TestDelegatingSessionFactoryOptions extends AbstractDelegatingSessionFactoryOptions { - - public TestDelegatingSessionFactoryOptions(SessionFactoryOptions delegate) { - super( delegate ); - } -} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/AttributeConverterMetadataBuilderContributorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/AttributeConverterMetadataBuilderContributorTest.java index cb0c1086bd5a..4d45860208d9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/AttributeConverterMetadataBuilderContributorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/AttributeConverterMetadataBuilderContributorTest.java @@ -12,7 +12,6 @@ import org.hibernate.testing.orm.junit.EntityManagerFactoryBasedFunctionalTest; import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.RequiresDialect; -import org.hibernate.testing.orm.junit.SettingProvider; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -35,13 +34,6 @@ protected Class[] getAnnotatedClasses() { }; } - public static class MetadataBuilderProvider implements SettingProvider.Provider { - @Override - public Object getSetting() { - return null; - } - } - @Override protected void addConfigOptions(Map options) { options.put( diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/BeanReflectionHelper.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/BeanReflectionHelper.java deleted file mode 100644 index de150cf21f3c..000000000000 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/BeanReflectionHelper.java +++ /dev/null @@ -1,98 +0,0 @@ -package org.hibernate.orm.test.bytecode; -import java.lang.invoke.MethodHandles; -import java.util.Date; - -import org.hibernate.accessor.AccessorFactory; -import org.hibernate.property.access.internal.PropertyAccessStrategyBasicImpl; -import org.hibernate.property.access.spi.Getter; -import org.hibernate.property.access.spi.PropertyAccess; -import org.hibernate.property.access.spi.PropertyAccessorService; -import org.hibernate.property.access.spi.Setter; - -/** - * @author Steve Ebersole - */ -public class BeanReflectionHelper { - - public static final Object[] TEST_VALUES = new Object[] { - "hello", Long.valueOf(1), Integer.valueOf(1), new Date(), Long.valueOf(1), Integer.valueOf(1), new Object() - }; - - private static final String[] getterNames = new String[7]; - private static final String[] setterNames = new String[7]; - private static final Class[] types = new Class[7]; - - static { - final PropertyAccessStrategyBasicImpl propertyAccessStrategy = new PropertyAccessStrategyBasicImpl(); - - PropertyAccess propertyAccess = propertyAccessStrategy.buildPropertyAccess( TestPropertyAccessorService.INSTANCE, Bean.class, "someString", true ); - Getter getter = propertyAccess.getGetter(); - Setter setter = propertyAccess.getSetter(); - getterNames[0] = getter.getMethodName(); - types[0] = getter.getReturnTypeClass(); - setterNames[0] = setter.getMethodName(); - - propertyAccess = propertyAccessStrategy.buildPropertyAccess( TestPropertyAccessorService.INSTANCE, Bean.class, "someLong", true ); - getter = propertyAccess.getGetter(); - setter = propertyAccess.getSetter(); - getterNames[1] = getter.getMethodName(); - types[1] = getter.getReturnTypeClass(); - setterNames[1] = setter.getMethodName(); - - propertyAccess = propertyAccessStrategy.buildPropertyAccess( TestPropertyAccessorService.INSTANCE, Bean.class, "someInteger", true ); - getter = propertyAccess.getGetter(); - setter = propertyAccess.getSetter(); - getterNames[2] = getter.getMethodName(); - types[2] = getter.getReturnTypeClass(); - setterNames[2] = setter.getMethodName(); - - propertyAccess = propertyAccessStrategy.buildPropertyAccess( TestPropertyAccessorService.INSTANCE, Bean.class, "someDate", true ); - getter = propertyAccess.getGetter(); - setter = propertyAccess.getSetter(); - getterNames[3] = getter.getMethodName(); - types[3] = getter.getReturnTypeClass(); - setterNames[3] = setter.getMethodName(); - - propertyAccess = propertyAccessStrategy.buildPropertyAccess( TestPropertyAccessorService.INSTANCE, Bean.class, "somelong", true ); - getter = propertyAccess.getGetter(); - setter = propertyAccess.getSetter(); - getterNames[4] = getter.getMethodName(); - types[4] = getter.getReturnTypeClass(); - setterNames[4] = setter.getMethodName(); - - propertyAccess = propertyAccessStrategy.buildPropertyAccess( TestPropertyAccessorService.INSTANCE, Bean.class, "someint", true ); - getter = propertyAccess.getGetter(); - setter = propertyAccess.getSetter(); - getterNames[5] = getter.getMethodName(); - types[5] = getter.getReturnTypeClass(); - setterNames[5] = setter.getMethodName(); - - propertyAccess = propertyAccessStrategy.buildPropertyAccess( TestPropertyAccessorService.INSTANCE, Bean.class, "someObject", true ); - getter = propertyAccess.getGetter(); - setter = propertyAccess.getSetter(); - getterNames[6] = getter.getMethodName(); - types[6] = getter.getReturnTypeClass(); - setterNames[6] = setter.getMethodName(); - } - - public static String[] getGetterNames() { - return getterNames; - } - - public static String[] getSetterNames() { - return setterNames; - } - - public static Class[] getTypes() { - return types; - } - - private static class TestPropertyAccessorService implements PropertyAccessorService { - static final PropertyAccessorService INSTANCE = new TestPropertyAccessorService(); - - @Override - public AccessorFactory hibernateAccessorFactory() { - return AccessorFactory.reflection( MethodHandles.lookup() ); - } - } -} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/version/EnhancementInfoAnnotation.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/version/EnhancementInfoAnnotation.java index 8099999a77bc..366ea67a650a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/version/EnhancementInfoAnnotation.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/version/EnhancementInfoAnnotation.java @@ -40,25 +40,13 @@ public boolean includesDirtyChecking() { return includesDirtyChecking; } - public void setVersion(String version) { - this.version = version; - } - @Override public boolean includesAssociationManagement() { return includesAssociationManagement; } - public void setIncludesDirtyChecking(boolean includesDirtyChecking) { - this.includesDirtyChecking = includesDirtyChecking; - } - @Override public Class annotationType() { return EnhancementInfo.class; } - - public void setIncludesAssociationManagement(boolean includesAssociationManagement) { - this.includesAssociationManagement = includesAssociationManagement; - } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/ManyToManyAssociationListTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/ManyToManyAssociationListTest.java index c840e7a9b0d9..0da122dffd51 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/ManyToManyAssociationListTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/ManyToManyAssociationListTest.java @@ -51,11 +51,6 @@ private static class Group { List getUsers() { return Collections.unmodifiableList( users ); } - - void resetUsers() { - // this wouldn't trigger association management: users.clear(); - users = new ArrayList<>(); - } } @Entity @@ -69,12 +64,6 @@ private static class User { @ManyToMany List groups; - void addGroup(Group group) { - List groups = this.groups == null ? new ArrayList<>() : this.groups; - groups.add( group ); - this.groups = groups; - } - List getGroups() { return Collections.unmodifiableList( groups ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/GenericReturnValueMappedSuperclassEnhancementTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/GenericReturnValueMappedSuperclassEnhancementTest.java index 26c8c5f7f7af..0da8509c0261 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/GenericReturnValueMappedSuperclassEnhancementTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/GenericReturnValueMappedSuperclassEnhancementTest.java @@ -32,7 +32,7 @@ public void enhanceClassWithGenericReturnValueOnMappedSuperclass() { @MappedSuperclass @Cache(usage = CacheConcurrencyStrategy.NONE) - public static class AbstractMappedSuperclassWithGenericReturnValue { + public static class AbstractMappedSuperclassWithGenericReturnValue { @Id @GeneratedValue @@ -50,14 +50,11 @@ public void setEntity(T entity) { } } - public interface Marker { - } - @Entity @Cache(usage = CacheConcurrencyStrategy.NONE) public static class SimpleEntity extends AbstractMappedSuperclassWithGenericReturnValue { - public enum Type implements Marker { + public enum Type { ONE } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/AbstractMultiPathCircleCascadeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/AbstractMultiPathCircleCascadeTest.java index c24d1a35eb4d..5f16ac6a8575 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/AbstractMultiPathCircleCascadeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/AbstractMultiPathCircleCascadeTest.java @@ -617,9 +617,4 @@ protected void assertUpdateCount(SessionFactoryScope scope, int expected) { int updates = (int) scope.getSessionFactory().getStatistics().getEntityUpdateCount(); Assertions.assertEquals( expected, updates, "unexpected update counts" ); } - - protected void assertDeleteCount(SessionFactoryScope scope, int expected) { - int deletes = (int) scope.getSessionFactory().getStatistics().getEntityDeleteCount(); - Assertions.assertEquals( expected, deletes, "unexpected delete counts" ); - } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/FetchGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/FetchGraphTest.java index 60fc3c4e651c..bcb57b774140 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/FetchGraphTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/FetchGraphTest.java @@ -333,10 +333,6 @@ public void testFetchingScroll2(SessionFactoryScope scope) { ); } - private ScrollableResults getScrollableResults(org.hibernate.query.Query query) { - return query.scroll(); - } - @Test public void testLazyAssociationSameAsNonLazyInPC(SessionFactoryScope scope) { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/ManyToOnePropertyAccessByFieldTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/ManyToOnePropertyAccessByFieldTest.java index eecb0bd558f8..65c2d1ed7af8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/ManyToOnePropertyAccessByFieldTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/ManyToOnePropertyAccessByFieldTest.java @@ -662,9 +662,5 @@ public enum StatusRequest { StatusRequest(final String description) { this.description = description; } - - public String getDescription() { - return description; - } } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/PendingBulkOperationCleanupActionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/PendingBulkOperationCleanupActionTest.java index 2d25f5e09a14..1261ed7c09e6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/PendingBulkOperationCleanupActionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/PendingBulkOperationCleanupActionTest.java @@ -174,8 +174,6 @@ public void setName(String name) { public static class TestCachingRegionFactory extends CachingRegionFactory { private static final Logger LOG = Logger.getLogger( org.hibernate.testing.cache.CachingRegionFactory.class.getName() ); - - public static final String DEFAULT_ACCESSTYPE = "DefaultAccessType"; private final CacheKeysFactory cacheKeysFactory; private TestDomainDataRegion testDomainDataRegion; @@ -183,14 +181,6 @@ public TestCachingRegionFactory() { this( DefaultCacheKeysFactory.INSTANCE, null ); } - public TestCachingRegionFactory(CacheKeysFactory cacheKeysFactory) { - this( cacheKeysFactory, null ); - } - - public TestCachingRegionFactory(Properties properties) { - this( DefaultCacheKeysFactory.INSTANCE, properties ); - } - public TestCachingRegionFactory(CacheKeysFactory cacheKeysFactory, Properties properties) { LOG.warn( "org.hibernate.testing.cache.CachingRegionFactory should be only used for testing." ); this.cacheKeysFactory = cacheKeysFactory; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/caching/mocked/ReadWriteCacheTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/caching/mocked/ReadWriteCacheTest.java index 6ca973a4d050..581d39d768da 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/caching/mocked/ReadWriteCacheTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/caching/mocked/ReadWriteCacheTest.java @@ -10,7 +10,6 @@ import org.hibernate.annotations.CacheConcurrencyStrategy; import org.hibernate.boot.SessionFactoryBuilder; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.cfg.Configuration; import org.hibernate.dialect.CockroachDialect; import org.hibernate.testing.orm.junit.DialectFeatureChecks; import org.hibernate.testing.orm.junit.DomainModel; @@ -248,10 +247,6 @@ private void createBook(long bookId, Session session) { session.persist( book ); } - private Consumer getCacheConfig() { - return configuration -> configuration.setInterceptor( new TransactionInterceptor() ); - } - private void loadBook(long bookId, Session session) { Book book = session.get( Book.class, bookId ); assertNotNull( book ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/AbstractMultiPathCircleCascadeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/AbstractMultiPathCircleCascadeTest.java index 0fb98ffd901e..979adadd8f06 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/AbstractMultiPathCircleCascadeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/AbstractMultiPathCircleCascadeTest.java @@ -325,13 +325,6 @@ private void testTransport(SessionFactoryScope scope, EntityOperation operation) ); } - private Node getSimpleUpdatedDetachedEntity() { - - Node deliveryNode = new Node(); - deliveryNode.setName( "deliveryNodeB" ); - return deliveryNode; - } - private Route getUpdatedDetachedEntity(SessionFactoryScope scope) { Route route = new Route(); @@ -564,9 +557,4 @@ protected void assertUpdateCount(SessionFactoryScope scope, int expected) { int updates = (int) scope.getSessionFactory().getStatistics().getEntityUpdateCount(); assertEquals( expected, updates, "unexpected update counts" ); } - - protected void assertDeleteCount(SessionFactoryScope scope, int expected) { - int deletes = (int) scope.getSessionFactory().getStatistics().getEntityDeleteCount(); - assertEquals( expected, deletes, "unexpected delete counts" ); - } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/lifecycle/ExtendedBeanManagerNoCallbackTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/lifecycle/ExtendedBeanManagerNoCallbackTest.java index da3bce0bdbd3..ee93a009845b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/lifecycle/ExtendedBeanManagerNoCallbackTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/lifecycle/ExtendedBeanManagerNoCallbackTest.java @@ -1,6 +1,5 @@ package org.hibernate.orm.test.cdi.lifecycle; -import jakarta.enterprise.inject.spi.BeanManager; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; @@ -53,9 +52,5 @@ public void registerLifecycleListener(LifecycleListener lifecycleListener) { assert this.lifecycleListener == null; this.lifecycleListener = lifecycleListener; } - - public void notify(BeanManager ready) { - lifecycleListener.beanManagerInitialized( ready ); - } } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/lifecycle/ExtendedBeanManagerNotAvailableDuringCustomUserTypeInitTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/lifecycle/ExtendedBeanManagerNotAvailableDuringCustomUserTypeInitTest.java index d9e8047f5de6..185a50561610 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/lifecycle/ExtendedBeanManagerNotAvailableDuringCustomUserTypeInitTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/lifecycle/ExtendedBeanManagerNotAvailableDuringCustomUserTypeInitTest.java @@ -1,6 +1,5 @@ package org.hibernate.orm.test.cdi.lifecycle; -import jakarta.enterprise.inject.spi.BeanManager; import jakarta.persistence.Entity; import jakarta.persistence.Id; import jakarta.persistence.Table; @@ -142,10 +141,5 @@ public void registerLifecycleListener(LifecycleListener lifecycleListener) { assert this.lifecycleListener == null; this.lifecycleListener = lifecycleListener; } - - // not called - public void notify(BeanManager ready) { - lifecycleListener.beanManagerInitialized( ready ); - } } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/lifecycle/ExtendedBeanManagerNotAvailableDuringTypeResolutionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/lifecycle/ExtendedBeanManagerNotAvailableDuringTypeResolutionTest.java index 0208164c4c5c..520a96f572c4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/lifecycle/ExtendedBeanManagerNotAvailableDuringTypeResolutionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/lifecycle/ExtendedBeanManagerNotAvailableDuringTypeResolutionTest.java @@ -16,8 +16,6 @@ import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.jupiter.api.Test; -import jakarta.enterprise.inject.spi.BeanManager; - @JiraKey(value = "HHH-15068") public class ExtendedBeanManagerNotAvailableDuringTypeResolutionTest { @@ -111,9 +109,5 @@ public void registerLifecycleListener(LifecycleListener lifecycleListener) { assert this.lifecycleListener == null; this.lifecycleListener = lifecycleListener; } - - public void notify(BeanManager ready) { - lifecycleListener.beanManagerInitialized( ready ); - } } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/GoofyException.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/GoofyException.java deleted file mode 100644 index 4d6b0da0edf8..000000000000 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/GoofyException.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.hibernate.orm.test.cfg.persister; - -/** - * @author Emmanuel Bernard - */ -public class GoofyException extends RuntimeException { - private Class value; - - public GoofyException(Class value) { - this.value = value; - } - - public Class getValue() { - return value; - } -} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/columndiscriminator/ColumnDiscrimnatorWithSchemaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/columndiscriminator/ColumnDiscrimnatorWithSchemaTest.java index 37ca9f3b2a08..cbb1de258c23 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/columndiscriminator/ColumnDiscrimnatorWithSchemaTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/columndiscriminator/ColumnDiscrimnatorWithSchemaTest.java @@ -23,10 +23,6 @@ class ColumnDiscrimnatorWithSchemaTest { private ColumnDiscrimnatorWithSchemaTest() { } - static ColumnDiscrimnatorWithSchemaTest createColumnDiscrimnatorWithSchemaTest() { - return new ColumnDiscrimnatorWithSchemaTest(); - } - @Test void testIt(SessionFactoryScope scope) { scope.inTransaction( entityManager -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/common/JournalingBatchObserver.java b/hibernate-core/src/test/java/org/hibernate/orm/test/common/JournalingBatchObserver.java index 0ebf1c822f18..d8b387ef6834 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/common/JournalingBatchObserver.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/common/JournalingBatchObserver.java @@ -26,9 +26,4 @@ public int getImplicitExecutionCount() { public int getExplicitExecutionCount() { return explicitExecutionCount; } - - public void reset() { - explicitExecutionCount = 0; - implicitExecutionCount = 0; - } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/common/JournalingTransactionObserver.java b/hibernate-core/src/test/java/org/hibernate/orm/test/common/JournalingTransactionObserver.java deleted file mode 100644 index 08d8cb12792f..000000000000 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/common/JournalingTransactionObserver.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.hibernate.orm.test.common; - -import org.hibernate.resource.transaction.spi.TransactionObserver; - -/** -* @author Steve Ebersole -*/ -public class JournalingTransactionObserver implements TransactionObserver { - private int begins = 0; - private int beforeCompletions = 0; - private int afterCompletions = 0; - - @Override - public void afterBegin() { - begins++; - } - - @Override - public void beforeCompletion() { - beforeCompletions++; - } - - @Override - public void afterCompletion(boolean successful, boolean delayed) { - afterCompletions++; - } - - public int getBegins() { - return begins; - } - - public int getBeforeCompletions() { - return beforeCompletions; - } - - public int getAfterCompletions() { - return afterCompletions; - } -} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/MultiTableMutationStrategyFactoryTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/MultiTableMutationStrategyFactoryTests.java index 435d8abe1a09..216b3c24ec33 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/MultiTableMutationStrategyFactoryTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/MultiTableMutationStrategyFactoryTests.java @@ -9,7 +9,6 @@ import org.hibernate.dialect.sql.ast.spi.CteSupport; import org.hibernate.dialect.temptable.spi.TemporaryTableStrategy; import org.hibernate.metamodel.mapping.EntityMappingType; -import org.hibernate.metamodel.mapping.internal.MappingModelCreationProcess; import org.hibernate.metamodel.spi.RuntimeModelCreationContext; import org.hibernate.query.sqm.mutation.internal.SqmMultiTableMutationStrategyProviderStandard; import org.hibernate.query.sqm.mutation.internal.cte.CteInsertStrategy; @@ -290,10 +289,4 @@ private static RuntimeModelCreationContext creationContext() { when( creationContext.getSessionFactoryOptions() ).thenReturn( mock( SessionFactoryOptions.class ) ); return creationContext; } - - private static MappingModelCreationProcess creationProcess(RuntimeModelCreationContext creationContext) { - final MappingModelCreationProcess creationProcess = mock( MappingModelCreationProcess.class ); - when( creationProcess.getCreationContext() ).thenReturn( creationContext ); - return creationProcess; - } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/CockroachDialectVersionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/CockroachDialectVersionTest.java index 73b3a81790dd..959833a25926 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/CockroachDialectVersionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/CockroachDialectVersionTest.java @@ -62,9 +62,5 @@ private static final class CockroachDBTestDialect extends CockroachDialect { private CockroachDBTestDialect(String versionString) { super (parseVersion( versionString )); } - - private DatabaseVersion getMinimumVersion() { - return getMinimumSupportedVersion(); - } } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/lockhint/AbstractLockHintTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/lockhint/AbstractLockHintTest.java index d21a5e969362..b24630c1aa67 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/lockhint/AbstractLockHintTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/lockhint/AbstractLockHintTest.java @@ -50,10 +50,6 @@ protected class SyntaxChecker { private final String rawSql; private final String expectedProcessedSql; - public SyntaxChecker(String template) { - this( template, "" ); - } - public SyntaxChecker(String template, String aliasToLock) { this.aliasToLock = aliasToLock; rawSql = StringHelper.replace( template, "$HOLDER$", aliasToLock ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dynamicmap/MixedModelTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dynamicmap/MixedModelTests.java deleted file mode 100644 index b0b882ee7317..000000000000 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dynamicmap/MixedModelTests.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.hibernate.orm.test.dynamicmap; - -/** - * Tests for models which mix dynamic and non-dynamic classes. - * - * @author Steve Ebersole - */ -public class MixedModelTests { -} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/xml/Author.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/xml/Author.java deleted file mode 100644 index 761ecc23d433..000000000000 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/xml/Author.java +++ /dev/null @@ -1,52 +0,0 @@ -package org.hibernate.orm.test.entitygraph.xml; - -import java.util.Date; -import java.util.Set; - - -/** - * @author Etienne Miret - */ -public class Author { - - private Long id; - - private String name; - - private Date birth; - - private Set books; - - public Author() { - super(); - } - - public Long getId() { - return id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public Date getBirth() { - return birth; - } - - public void setBirth(Date birth) { - this.birth = birth; - } - - public Set getBooks() { - return books; - } - - public void setBooks(Set books) { - this.books = books; - } - -} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/xml/Book.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/xml/Book.java deleted file mode 100644 index c8a9712c5baf..000000000000 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/xml/Book.java +++ /dev/null @@ -1,51 +0,0 @@ -package org.hibernate.orm.test.entitygraph.xml; - -import java.util.Set; - - -/** - * @author Etienne Miret - */ -public class Book { - - private Long id; - - private String isbn; - - private String title; - - private Set authors; - - public Book() { - super(); - } - - public Long getId() { - return id; - } - - public String getIsbn() { - return isbn; - } - - public void setIsbn(String isbn) { - this.isbn = isbn; - } - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public Set getAuthors() { - return authors; - } - - public void setAuthors(Set authors) { - this.authors = authors; - } - -} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/MergeContextTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/MergeContextTest.java index 38a4a5f81add..5e81e607b887 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/MergeContextTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/MergeContextTest.java @@ -478,21 +478,4 @@ public void clear() { } } - - private class ExceptionThrowingEntityCopyObserver implements EntityCopyObserver { - - @Override - public void entityCopyDetected(Object managedEntity, Object mergeEntity1, Object mergeEntity2, EventSource session) { - throw new IllegalStateException( "Entity copies not allowed." ); - } - - @Override - public void topLevelMergeComplete(EventSource session) { - } - - @Override - public void clear() { - - } - } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/AbstractCollectionEventTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/AbstractCollectionEventTest.java index afc9d7c2f6d8..fd90264474d3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/AbstractCollectionEventTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/AbstractCollectionEventTest.java @@ -41,10 +41,6 @@ @SessionFactory public abstract class AbstractCollectionEventTest { - protected String getBaseForMappings() { - return "org/hibernate/orm/test/"; - } - @AfterEach protected void cleanupTest(SessionFactoryScope scope) { scope.getSessionFactory().getSchemaManager().truncate(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/MergeCollectionEventTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/MergeCollectionEventTest.java index c5323ee38b70..96831a6c6a97 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/MergeCollectionEventTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/MergeCollectionEventTest.java @@ -248,14 +248,6 @@ private void checkGraphPairs( assertEquals( expectedPairCount, analysis.pairs().get( phase ).size() ); } - private void checkListenerGraph(int index, Class expectedEventType) { - final AggregatedCollectionEventListener.EventEntry eventEntry - = collectionListenerIntegrator.getListener().getEventEntryList().get( index ); - final AbstractCollectionEvent event = eventEntry.getEvent(); - - assertTyping( expectedEventType, event ); - } - private boolean usesSharedCollectionLifecyclePreparation() { return true; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/events/EventEngineContributionsTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/events/EventEngineContributionsTests.java index 76e91a766650..18e244831bf7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/events/EventEngineContributionsTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/events/EventEngineContributionsTests.java @@ -68,14 +68,11 @@ public void testCustomEventAccess(SessionFactoryScope scope) { } } - public interface SexyRxyBaseListener { - } - public static class RxySaveEvent { public static final RxySaveEvent INSTANCE = new RxySaveEvent(); } - public static class SexyRxySaveListener implements SexyRxyBaseListener { + public static class SexyRxySaveListener { public static final String EVENT_NAME = "rx-save"; public static final SexyRxySaveListener INSTANCE = new SexyRxySaveListener(); @@ -91,7 +88,7 @@ public static class RxyPersistEvent { public static final RxyPersistEvent INSTANCE = new RxyPersistEvent(); } - public static class SexyRxyPersistListener implements SexyRxyBaseListener { + public static class SexyRxyPersistListener { public static final String EVENT_NAME = "rx-persist"; public static final SexyRxyPersistListener INSTANCE = new SexyRxyPersistListener(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/ExceptionExpectations.java b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/ExceptionExpectations.java index c10e6888acf8..8a4a177b1c43 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/ExceptionExpectations.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/ExceptionExpectations.java @@ -13,7 +13,6 @@ import org.hibernate.TransientObjectException; import org.hibernate.exception.ConstraintViolationException; import org.hibernate.id.IdentifierGenerationException; -import org.hibernate.query.SemanticException; import org.hibernate.query.SyntaxException; import static org.hamcrest.CoreMatchers.instanceOf; @@ -113,83 +112,6 @@ public void onExecuteUpdateWithConstraintViolation(RuntimeException e) { }; } - static ExceptionExpectations nativePre52() { - return new ExceptionExpectations() { - @Override - public void onConstraintViolationOnSaveAndSaveOrUpdate(RuntimeException e) { - assertThat( e, instanceOf( ConstraintViolationException.class ) ); - assertThat( e, instanceOf( SQLException.class ) ); - } - - @Override - public void onConstraintViolationOnPersistAndMergeAndFlush(RuntimeException e) { - assertThat( e, instanceOf( ConstraintViolationException.class ) ); - assertThat( e, instanceOf( SQLException.class ) ); - } - - @Override - public void onTransientObjectOnSaveAndSaveOrUpdate(RuntimeException e) { - assertThat( e, instanceOf( TransientObjectException.class ) ); - } - - @Override - public void onTransientObjectOnPersistAndMergeAndFlush(RuntimeException e) { - assertThat( e, instanceOf( TransientObjectException.class ) ); - } - - @Override - public void onInvalidQueryExecuted(RuntimeException e) { - assertThat( e, instanceOf( SemanticException.class ) ); - } - - @Override - public void onUniqueResultWithMultipleResults(RuntimeException e) { - assertThat( e, instanceOf( org.hibernate.NonUniqueResultException.class ) ); - } - - @Override - public void onGetSingleResultWithMultipleResults(RuntimeException e) { - assertThat( e, instanceOf( org.hibernate.NonUniqueResultException.class ) ); - } - - @Override - public void onGetSingleResultWithNoResults(RuntimeException e) { - assertThat( e, instanceOf( NoResultException.class ) ); - } - - @Override - public void onStaleObjectMergeAndUpdateFlush(RuntimeException e) { - assertThat( e, instanceOf( StaleStateException.class ) ); - } - - @Override - public void onIdentifierGeneratorFailure(RuntimeException e) { - assertThat( e, instanceOf( IdentifierGenerationException.class ) ); - } - - @Override - public void onTransactionExceptionOnSaveAndSaveOrUpdate(RuntimeException e) { - assertThat( e, instanceOf( TransactionException.class ) ); - } - - @Override - public void onTransactionExceptionOnPersistAndMergeAndFlush(RuntimeException e) { - assertThat( e, instanceOf( TransactionException.class ) ); - } - - @Override - public void onTransactionExceptionOnCommit(RuntimeException e) { - assertThat( e, instanceOf( TransactionException.class ) ); - } - - @Override - public void onExecuteUpdateWithConstraintViolation(RuntimeException e) { - assertThat( e, instanceOf( ConstraintViolationException.class ) ); - assertThat( e.getCause(), instanceOf( SQLException.class ) ); - } - }; - } - static ExceptionExpectations nativePost52() { return new ExceptionExpectations() { @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestAutoFlushBeforeQueryExecution.java b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestAutoFlushBeforeQueryExecution.java index ddb80b29542a..e49b2ff89943 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestAutoFlushBeforeQueryExecution.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestAutoFlushBeforeQueryExecution.java @@ -234,13 +234,8 @@ private void integrate(SessionFactoryImplementor sessionFactory) { public static class InitializingPreUpdateEventListener implements PreUpdateEventListener { public static final InitializingPreUpdateEventListener INSTANCE = new InitializingPreUpdateEventListener(); - private boolean executed = false; - private boolean foundAny = false; - @Override public boolean onPreUpdate(@Nonnull PreUpdateEvent event) { - executed = true; - final Object[] oldValues = event.getOldState(); final String[] properties = event.getPersister().getPropertyNames(); @@ -249,7 +244,6 @@ public boolean onPreUpdate(@Nonnull PreUpdateEvent event) { if ( oldValues != null && oldValues[i] != null ) { if ( ! Hibernate.isInitialized( oldValues[i] ) ) { // force any proxies and/or collections to initialize to illustrate HHH-2763 - foundAny = true; Hibernate.initialize( oldValues ); } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/generated/H2Trigger.java b/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/generated/H2Trigger.java deleted file mode 100644 index 261f2e95e45e..000000000000 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/generated/H2Trigger.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.hibernate.orm.test.generatedkeys.generated; - -import org.h2.tools.TriggerAdapter; - -import java.sql.Connection; -import java.sql.ResultSet; -import java.sql.SQLException; - -public class H2Trigger extends TriggerAdapter { - @Override - public void fire(Connection conn, ResultSet oldRow, ResultSet newRow) throws SQLException { - ResultSet resultSet = conn.createStatement().executeQuery("select coalesce(max(id), 0) from my_entity"); - resultSet.next(); - newRow.updateInt( "id", resultSet.getInt(1) + 1 ); - } -} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/index/JournalingSchemaToolingTarget.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/index/JournalingSchemaToolingTarget.java index 0be1958042b0..30255217af67 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/index/JournalingSchemaToolingTarget.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/index/JournalingSchemaToolingTarget.java @@ -29,10 +29,6 @@ public void release() { } - public List getActions() { - return actions; - } - public boolean containedText(String text) { for ( String action : actions ) { if ( action.contains( text ) ) { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/index/PersonComment.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/index/PersonComment.java deleted file mode 100644 index ad4a8dff3aee..000000000000 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/index/PersonComment.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.hibernate.orm.test.hbm.index; - -public class PersonComment { - private String locale; - private String value; - - public String getLocale() { - return locale; - } - - public void setLocale(String locale) { - this.locale = locale; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } -} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Farm.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Farm.java index 9cd6af7cf4e1..7ab0cd004f70 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Farm.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/Farm.java @@ -64,7 +64,6 @@ public void setAccreditations(Set accreditations) { public static enum Accreditation { ORGANIC, - SUSTAINABLE, - FARM_TO_TABLE + SUSTAINABLE } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/enhanced/SourceMock.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/enhanced/SourceMock.java index ee4b7c8b2d35..608f2596eec9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/enhanced/SourceMock.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/enhanced/SourceMock.java @@ -9,10 +9,6 @@ class SourceMock implements AccessCallback { private volatile long currentValue; private volatile int timesCalled; - public SourceMock(long initialValue) { - this( initialValue, 1 ); - } - public SourceMock(long initialValue, int increment) { this( null, initialValue, increment ); } @@ -21,10 +17,6 @@ public SourceMock(String tenantId, long initialValue, int increment) { this( tenantId, initialValue, increment, 0 ); } - public SourceMock(long initialValue, int increment, int timesCalled) { - this( null, initialValue, increment, timesCalled ); - } - public SourceMock(String tenantId, long initialValue, int increment, int timesCalled) { this.tenantId = tenantId; this.increment = increment; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdOutOfNonJpaCompositeIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdOutOfNonJpaCompositeIdTest.java index b308af7a583f..06d6b651182e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdOutOfNonJpaCompositeIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdOutOfNonJpaCompositeIdTest.java @@ -106,19 +106,6 @@ public static class PersonId implements Serializable { public PersonId() { } - public PersonId(String name, int index) { - setName( name ); - setIndex( index ); - } - - public String getName() { - return name; - } - - public int getIndex() { - return index; - } - public void setName(String name) { this.name = name; } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/Owner.java b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/Owner.java index 384c27c5f70e..ab4ae91ddf15 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/Owner.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/Owner.java @@ -3,49 +3,8 @@ public class Owner implements Serializable { - private long id; - private long version; - private Plan plan; - private String name; - public Owner() { super(); } - public Owner(String name) { - this.name = name; - } - - public long getVersion() { - return version; - } - - public void setVersion(long version) { - this.version = version; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public long getId() { - return id; - } - - public void setId(long id) { - this.id = id; - } - - public Plan getPlan() { - return plan; - } - - public void setPlan(Plan plan) { - this.plan = plan; - } - } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/JoinFetchInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/JoinFetchInheritanceTest.java index 6589337c24d7..bb0021b47305 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/JoinFetchInheritanceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/JoinFetchInheritanceTest.java @@ -194,10 +194,6 @@ private static void assertCatInitialized( } } - private static void clearKittens(KittenContainer container) { - container.getKittens().clear(); - } - @Entity( name = "Zoo" ) public static class Zoo { @Id diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingRCATest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingRCATest.java index 46fcbbfa1c99..0ef99f58da0a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingRCATest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingRCATest.java @@ -1308,9 +1308,7 @@ public enum Operator { NOT_EQUALS(" != "), GREATER_THAN(" > "), SMALLER_THAN(" < "), - CONTAINS(" contains "), - BEGINS_WITH(" begins with "), - ENDS_WITH(" ends with "); + CONTAINS(" contains "); private String readable; @@ -1347,8 +1345,7 @@ public String toString() { public enum ManipulationType { MOVE_IT_BY_ABSOLUTE_TIME, - MOVE_IT_RELATIVE_TO_OTHER_TIME, - ABSOLUTE + MOVE_IT_RELATIVE_TO_OTHER_TIME } public enum LogicalOperator { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/internal/util/xml/XMLMappingHelper.java b/hibernate-core/src/test/java/org/hibernate/orm/test/internal/util/xml/XMLMappingHelper.java deleted file mode 100644 index 91b9d43be193..000000000000 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/internal/util/xml/XMLMappingHelper.java +++ /dev/null @@ -1,41 +0,0 @@ -package org.hibernate.orm.test.internal.util.xml; - -import java.io.IOException; -import java.io.InputStream; - -import org.hibernate.boot.jaxb.Origin; -import org.hibernate.boot.jaxb.SourceType; -import org.hibernate.boot.jaxb.internal.MappingBinder; -import org.hibernate.boot.jaxb.mapping.spi.JaxbEntityMappingsImpl; -import org.hibernate.boot.jaxb.spi.Binding; - -import org.hibernate.testing.boot.ClassLoaderServiceTestingImpl; -import org.junit.jupiter.api.Assertions; - -/** - * A small helper class for parsing XML mappings, to be used in unit tests. - */ -public final class XMLMappingHelper { - private final MappingBinder binder; - - public XMLMappingHelper() { - binder = new MappingBinder( ClassLoaderServiceTestingImpl.INSTANCE, MappingBinder.VALIDATING ); - } - - public JaxbEntityMappingsImpl readOrmXmlMappings(String name) throws IOException { - try ( InputStream is = ClassLoaderServiceTestingImpl.INSTANCE.locateResourceStream( name ) ) { - return readOrmXmlMappings( is, name ); - } - } - - public JaxbEntityMappingsImpl readOrmXmlMappings(InputStream is, String name) { - try { - Assertions.assertNotNull( is, "Resource not found: " + name ); - Binding binding = binder.bind( is, new Origin( SourceType.JAR, name ) ); - return (JaxbEntityMappingsImpl) binding.getRoot(); - } - catch (RuntimeException e) { - throw new IllegalStateException( "Could not parse orm.xml mapping '" + name + "': " + e.getMessage(), e ); - } - } -} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/BaseEntityManagerFunctionalTestCase.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/BaseEntityManagerFunctionalTestCase.java index fce4562280c9..b453ae6af394 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/BaseEntityManagerFunctionalTestCase.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/BaseEntityManagerFunctionalTestCase.java @@ -39,8 +39,6 @@ import org.junit.After; import org.junit.Before; -import static java.util.Collections.emptyMap; - /** * A base class for all ejb tests. * @@ -67,14 +65,6 @@ protected Dialect getDialect() { return dialect; } - protected SessionFactoryImplementor entityManagerFactory() { - return entityManagerFactory; - } - - protected StandardServiceRegistryImpl serviceRegistry() { - return serviceRegistry; - } - @Before public void buildEntityManagerFactory() { log.trace( "Building EntityManagerFactory" ); @@ -338,22 +328,6 @@ protected EntityManager getOrCreateEntityManager() { return entityManager; } - protected EntityManager createIsolatedEntityManager() { - final EntityManager isolatedEntityManager = entityManagerFactory.createEntityManager(); - isolatedEntityManagers.add( isolatedEntityManager ); - return isolatedEntityManager; - } - - protected EntityManager createIsolatedEntityManager(Map properties) { - final EntityManager isolatedEntityManager = entityManagerFactory.createEntityManager( properties ); - isolatedEntityManagers.add( isolatedEntityManager ); - return isolatedEntityManager; - } - - protected EntityManager createEntityManager() { - return createEntityManager( emptyMap() ); - } - protected EntityManager createEntityManager(Map properties) { // always reopen a new EM and close the existing one if ( entityManager != null && entityManager.isOpen() ) { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/JpaComplianceStub.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/JpaComplianceStub.java deleted file mode 100644 index 23809dee1614..000000000000 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/JpaComplianceStub.java +++ /dev/null @@ -1,50 +0,0 @@ -package org.hibernate.orm.test.jpa; - -import org.hibernate.jpa.spi.JpaCompliance; - -/** - * Stubbed impl of JpaCompliance - * - * @author Steve Ebersole - */ -public class JpaComplianceStub implements JpaCompliance { - @Override - public boolean isJpaQueryComplianceEnabled() { - return false; - } - - @Override - public boolean isJpaTransactionComplianceEnabled() { - return false; - } - - @Override - public boolean isJpaClosedComplianceEnabled() { - return false; - } - - @Override - public boolean isJpaProxyComplianceEnabled() { - return false; - } - - @Override - public boolean isJpaCacheComplianceEnabled() { - return false; - } - - @Override - public boolean isGlobalGeneratorScopeEnabled() { - return false; - } - - @Override - public boolean isJpaOrderByMappingComplianceEnabled() { - return false; - } - - @Override - public boolean isLoadByIdComplianceEnabled() { - return false; - } -} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/TestingEntityManagerFactoryGenerator.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/TestingEntityManagerFactoryGenerator.java index 23fbc85d9974..60b82653f259 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/TestingEntityManagerFactoryGenerator.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/TestingEntityManagerFactoryGenerator.java @@ -20,10 +20,6 @@ public static EntityManagerFactory generateEntityManagerFactory(Map settings) { return generateEntityManagerFactory( new PersistenceUnitDescriptorAdapter(), settings ); } - public static EntityManagerFactory generateEntityManagerFactory(PersistenceUnitDescriptor descriptor, Object... settings) { - return generateEntityManagerFactory( descriptor, SettingsGenerator.generateSettings( settings ) ); - } - public static EntityManagerFactory generateEntityManagerFactory(PersistenceUnitDescriptor descriptor, Map settings) { return Bootstrap.getEntityManagerFactoryBuilder( descriptor, settings ).build(); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/CountryNameCheckerListener.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/CountryNameCheckerListener.java index 24b238656139..b8188cf2d711 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/CountryNameCheckerListener.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/CountryNameCheckerListener.java @@ -11,11 +11,6 @@ public class CountryNameCheckerListener { private List countries = new ArrayList(); - { - countries.add( "France" ); - countries.add( "Netherland" ); - } - @PrePersist @PreUpdate public void testCountryName(Object object) { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PrivateConstructorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PrivateConstructorTest.java index aaca927c56c2..c3e08b90856b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PrivateConstructorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PrivateConstructorTest.java @@ -8,11 +8,6 @@ import jakarta.persistence.GenerationType; import jakarta.persistence.Id; import jakarta.persistence.ManyToOne; -import org.hibernate.bytecode.internal.BytecodeProviderInitiator; -import org.hibernate.cfg.AvailableSettings; -import org.hibernate.cfg.Environment; -import org.hibernate.proxy.ProxyFactory; -import org.hibernate.proxy.pojo.bytebuddy.ByteBuddyProxyFactory; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.Jpa; @@ -56,16 +51,6 @@ public void test(EntityManagerFactoryScope scope) { ); } - private static Class proxyFactoryClass() { - String byteCodeProvider = Environment.getProperties().getProperty( AvailableSettings.BYTECODE_PROVIDER ); - if ( byteCodeProvider == null || BytecodeProviderInitiator.BYTECODE_PROVIDER_NAME_BYTEBUDDY.equals( byteCodeProvider ) ) { - return ByteBuddyProxyFactory.class; - } - else { - throw new UnsupportedOperationException( "Unknown bytecode provider:" + byteCodeProvider ); - } - } - @Entity(name = "Parent") public static class Parent { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/CacheableEntityGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/CacheableEntityGraphTest.java index f71314497532..8a737dc756dd 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/CacheableEntityGraphTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/CacheableEntityGraphTest.java @@ -110,7 +110,6 @@ public Tag(Set types) { } public enum TagType { - FOO, - BAR + FOO } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Market.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Market.java index 78e16b088a9f..8482faed94ac 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Market.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Market.java @@ -5,5 +5,5 @@ * @author Brett Meyer */ public enum Market { - SERVICES, TECHNOLOGY, INDUSTRIAL; + SERVICES, TECHNOLOGY; } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/joinable/ManyToOneJoinTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/joinable/ManyToOneJoinTableTest.java index 5779dfec612f..2b417d95dcd1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/joinable/ManyToOneJoinTableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/joinable/ManyToOneJoinTableTest.java @@ -66,7 +66,7 @@ public void testRegression(SessionFactoryScope scope) { } ); } - public interface Issuer extends Resource { + public interface Issuer { } @Entity(name = IssuerImpl.ENTITY_NAME) @@ -151,13 +151,9 @@ public int hashCode() { } } - public interface Resource { - - } - @Entity(name = ResourceImpl.ENTITY_NAME) @Inheritance(strategy = InheritanceType.SINGLE_TABLE) - public static class ResourceImpl implements Resource { + public static class ResourceImpl { private static final String ENTITY_NAME = "TestResource"; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/EntityInterfaceExtendsMapTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/EntityInterfaceExtendsMapTest.java index 09ea4042e884..87aab5a57b35 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/EntityInterfaceExtendsMapTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/EntityInterfaceExtendsMapTest.java @@ -93,11 +93,8 @@ public String getAuthor() { } } - interface Library extends Map { - } - @Entity( name = "LibraryEntity" ) - static class LibraryEntity implements Library { + static class LibraryEntity implements Map { @Id @GeneratedValue private Long id; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/war/IncrementListener.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/war/IncrementListener.java index f8db0587749c..a0cad4d8ae82 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/war/IncrementListener.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/war/IncrementListener.java @@ -5,18 +5,8 @@ * @author Emmanuel Bernard */ public class IncrementListener { - private static int increment; - - public static int getIncrement() { - return increment; - } - - public static void reset() { - increment = 0; - } @PrePersist public void increment(Object entity) { - increment++; } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/war/Lighter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/war/Lighter.java index 2a1e3d43f12a..d5ab7d8e3dc6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/war/Lighter.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/war/Lighter.java @@ -5,6 +5,4 @@ * @author Emmanuel Bernard */ public class Lighter { - public String name; - public String power; } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/war/OtherIncrementListener.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/war/OtherIncrementListener.java index dbab92022e82..1afd6b7c027e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/war/OtherIncrementListener.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/war/OtherIncrementListener.java @@ -5,17 +5,4 @@ * @author Emmanuel Bernard */ public class OtherIncrementListener { - private static int increment; - - public static int getIncrement() { - return OtherIncrementListener.increment; - } - - public static void reset() { - increment = 0; - } - - public void increment(Object entity) { - OtherIncrementListener.increment++; - } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CachedQueryDirectReferenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CachedQueryDirectReferenceTest.java index 0acb2e4818d5..12cdb9cf46a1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CachedQueryDirectReferenceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CachedQueryDirectReferenceTest.java @@ -214,16 +214,6 @@ private static List getEmployees(EntityManager em) { return employees; } - private static void save(EntityManagerFactoryScope scope, int cardinality) { - scope.inTransaction( - em -> { - for ( int i = 0; i < cardinality; i++ ) { - em.persist( new ImmutableEmployee( "John" + i, 20d + i ) ); - } - } - ); - } - @Entity(name = "ImmutableEmployee") @Immutable public static class ImmutableEmployee implements Serializable { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NativeQueryResultTypeAutoDiscoveryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NativeQueryResultTypeAutoDiscoveryTest.java index 14ffab9a8ba8..420de16531f4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NativeQueryResultTypeAutoDiscoveryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NativeQueryResultTypeAutoDiscoveryTest.java @@ -39,13 +39,7 @@ import org.hibernate.testing.orm.junit.SkipForDialect; import org.hibernate.type.AbstractSingleColumnStandardBasicType; import org.hibernate.type.descriptor.java.BigDecimalJavaType; -import org.hibernate.type.descriptor.java.FloatJavaType; -import org.hibernate.type.descriptor.java.PrimitiveByteArrayJavaType; -import org.hibernate.type.descriptor.java.StringJavaType; -import org.hibernate.type.descriptor.jdbc.BinaryJdbcType; -import org.hibernate.type.descriptor.jdbc.CharJdbcType; import org.hibernate.type.descriptor.jdbc.NumericJdbcType; -import org.hibernate.type.descriptor.jdbc.RealJdbcType; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; @@ -578,19 +572,6 @@ public Boolean getTestedProperty() { } } - public static class FloatAsRealType extends AbstractSingleColumnStandardBasicType { - public static final String NAME = "float_as_real"; - - public FloatAsRealType() { - super( RealJdbcType.INSTANCE, FloatJavaType.INSTANCE ); - } - - @Override - public String getName() { - return NAME; - } - } - public static class BigDecimalAsDecimalType extends AbstractSingleColumnStandardBasicType { public static final String NAME = "big_decimal_as_decimal"; @@ -604,30 +585,4 @@ public String getName() { } } - public static class StringAsNonVarCharType extends AbstractSingleColumnStandardBasicType { - public static final String NAME = "string_as_nonvar_char_array"; - - public StringAsNonVarCharType() { - super( CharJdbcType.INSTANCE, StringJavaType.INSTANCE ); - } - - @Override - public String getName() { - return NAME; - } - } - - public static class ByteArrayAsNonVarBinaryType extends AbstractSingleColumnStandardBasicType { - public static final String NAME = "byte_array_as_nonvar_binary"; - - public ByteArrayAsNonVarBinaryType() { - super( BinaryJdbcType.INSTANCE, PrimitiveByteArrayJavaType.INSTANCE ); - } - - @Override - public String getName() { - return NAME; - } - } - } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryWithLiteralsInSelectExpressionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryWithLiteralsInSelectExpressionTest.java index dd9324c938dc..ff4c31e90bdc 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryWithLiteralsInSelectExpressionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryWithLiteralsInSelectExpressionTest.java @@ -106,22 +106,9 @@ public MyEntity(String name, boolean surname) { } public static class MyEntityDTO { - private String name; - private String surname; - private boolean active; public MyEntityDTO() { } - - public MyEntityDTO(String name, String surname) { - this.name = name; - this.surname = surname; - } - - public MyEntityDTO(String name, boolean active) { - this.name = name; - this.active = active; - } } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/PersistenceUtilHelperTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/PersistenceUtilHelperTest.java index d179203c50d4..2ffb9dd7aaee 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/PersistenceUtilHelperTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/PersistenceUtilHelperTest.java @@ -18,13 +18,7 @@ public class PersistenceUtilHelperTest { private final PersistenceUtilHelper.MetadataCache cache = new PersistenceUtilHelper.MetadataCache(); - public static class FieldAccessBean extends FieldAccessBeanBase { - protected String protectedAccessProperty; - private String privateAccessProperty; - } - - public static class FieldAccessBeanBase { - public String publicAccessProperty; + public static class FieldAccessBean { } public static class MethodAccessBean extends MethodAccessBeanBase { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Custom.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Custom.java deleted file mode 100644 index 94f789839ed9..000000000000 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Custom.java +++ /dev/null @@ -1,24 +0,0 @@ -package org.hibernate.orm.test.legacy; - -public class Custom implements Cloneable { - String id; - private String name; - - public Object clone() { - try { - return super.clone(); - } - catch (CloneNotSupportedException cnse) { - throw new RuntimeException(); - } - } - - void setName(String name) { - this.name = name; - } - - String getName() { - return name; - } - -} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Multiplicity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Multiplicity.java deleted file mode 100644 index 8a957d63282b..000000000000 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Multiplicity.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.hibernate.orm.test.legacy; -import java.io.Serializable; - -public class Multiplicity implements Serializable { - public int count; - public GlarchProxy glarch; -} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/S.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/S.java deleted file mode 100644 index 7012596524f4..000000000000 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/S.java +++ /dev/null @@ -1,41 +0,0 @@ -package org.hibernate.orm.test.legacy; - - -public class S { - private String address; - private int count; - - public S(int countArg, String addressArg) { - count = countArg; - address = addressArg; - } - - /** - * Gets the address - * @return Returns a String - */ - public String getAddress() { - return address; - } - /** - * Sets the address - * @param address The address to set - */ - public void setAddress(String address) { - this.address = address; - } - /** - * Gets the count - * @return Returns a int - */ - public int getCount() { - return count; - } - /** - * Sets the count - * @param count The count to set - */ - public void setCount(int count) { - this.count = count; - } -} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/SerializableData.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/SerializableData.java index 95296849f697..a10ef35606d8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/SerializableData.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/SerializableData.java @@ -19,9 +19,4 @@ public String getPayload() { return payload; } - -public void setPayload(String payload) -{ - this.payload = payload; -} } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/options/Helper.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/options/Helper.java index c442e85967f5..2478705856a7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/options/Helper.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/options/Helper.java @@ -99,14 +99,6 @@ public interface TableInformation { String getTableName(); String getTableAlias(); String getKeyColumnName(); - - default String getKeyColumnReference() { - return getKeyColumnReference( getTableAlias() ); - } - - default String getKeyColumnReference(String tableAlias) { - return tableAlias + "." + getKeyColumnName(); - } } public enum Table implements TableInformation { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/EnumSingleCharTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/EnumSingleCharTest.java index f0512b1c2ee4..4731debd7dce 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/EnumSingleCharTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/EnumSingleCharTest.java @@ -58,10 +58,6 @@ public enum SinglecharEnum { SinglecharEnum(String item) { this.item = item; } - - public String getItem() { - return item; - } } @Entity(name = "Person") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetHelper.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetHelper.java index 3e7d32a473e2..8068a9a54823 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetHelper.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetHelper.java @@ -32,14 +32,4 @@ public static BitSet stringToBitSet(String string) { } return BitSet.valueOf(values); } - - public static byte[] bitSetToBytes(BitSet bitSet) { - return bitSet == null ? null : bitSet.toByteArray(); - } - - public static BitSet bytesToBitSet(byte[] bytes) { - return bytes == null || bytes.length == 0 - ? null - : BitSet.valueOf(bytes); - } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AttributeConverterDefinitionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AttributeConverterDefinitionTest.java index bc38ca7cc6bf..989c9b1a0d8f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AttributeConverterDefinitionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AttributeConverterDefinitionTest.java @@ -57,10 +57,7 @@ public static class AttrConverterPlainExtendedImplements extends AttrConverterPl implements AttributeConverter { } - public interface AttrConverterSameType extends AttributeConverter { - } - - public static class AttrConverterSameTypeImpl implements AttrConverterSameType { + public static class AttrConverterSameTypeImpl implements AttributeConverter { @Override public String convertToDatabaseColumn(String attribute) { @@ -87,9 +84,6 @@ default T convertToEntityAttribute(V dbData) { } } - public static abstract class DelegatingAttrConverter implements DelegatingAttributeConverter { - } - public static class DelegatingAttrConverterImpl implements DelegatingAttributeConverter { @Override public AttributeConverter delegate() { @@ -97,8 +91,8 @@ public AttributeConverter delegate() { } } - public static class MultiAttrConverter extends DelegatingAttrConverter - implements AttrConverterSameType { + public static class MultiAttrConverter + implements DelegatingAttributeConverter { @Override public AttributeConverter delegate() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ExplicitJavaTypeDescriptorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ExplicitJavaTypeDescriptorTest.java index a9a7b0202f3f..34f4da840a16 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ExplicitJavaTypeDescriptorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ExplicitJavaTypeDescriptorTest.java @@ -145,11 +145,6 @@ public String getState() { return state; } - // mutable - public void setState(String state) { - this.state = state; - } - @Override public boolean equals(Object o) { if ( this == o ) { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/onetoone/BidirectionalOneToOneWithConverterEagerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/onetoone/BidirectionalOneToOneWithConverterEagerTest.java index e77d0ff02840..2d01633a05f7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/onetoone/BidirectionalOneToOneWithConverterEagerTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/onetoone/BidirectionalOneToOneWithConverterEagerTest.java @@ -118,10 +118,6 @@ public BusinessId(String value) { public String getValue() { return value; } - - public void setValue(String value) { - this.value = value; - } } public static class BusinessIdConverter implements AttributeConverter { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/onetoone/BidirectionalOneToOneWithConverterLazyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/onetoone/BidirectionalOneToOneWithConverterLazyTest.java index c56dfb0e7d81..5bf5f2db7ec3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/onetoone/BidirectionalOneToOneWithConverterLazyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/onetoone/BidirectionalOneToOneWithConverterLazyTest.java @@ -116,10 +116,6 @@ public BusinessId(String value) { public String getValue() { return value; } - - public void setValue(String value) { - this.value = value; - } } public static class BusinessIdConverter implements AttributeConverter { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/Aggregate.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/Aggregate.java index 6343d93a18e9..bcd68451ff5c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/Aggregate.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/Aggregate.java @@ -12,7 +12,6 @@ import org.hibernate.annotations.JdbcTypeCode; import org.hibernate.testing.orm.domain.gambit.EntityOfBasics; import org.hibernate.testing.orm.domain.gambit.MutableValue; -import org.junit.jupiter.api.Assertions; import java.net.MalformedURLException; import java.net.URL; @@ -281,51 +280,6 @@ public void setMutableValue(MutableValue mutableValue) { this.mutableValue = mutableValue; } - static void assertEquals(Aggregate a1, Aggregate a2) { - Assertions.assertEquals( a1.theInt, a2.theInt ); - Assertions.assertEquals( a1.theDouble, a2.theDouble ); - Assertions.assertEquals( a1.theBoolean, a2.theBoolean ); - Assertions.assertEquals( a1.theNumericBoolean, a2.theNumericBoolean ); - Assertions.assertEquals( a1.theStringBoolean, a2.theStringBoolean ); - Assertions.assertEquals( a1.theString, a2.theString ); - Assertions.assertEquals( a1.theInteger, a2.theInteger ); - Assertions.assertEquals( a1.theClob, a2.theClob ); - assertArrayEquals( a1.theBinary, a2.theBinary ); - Assertions.assertEquals( a1.theDate, a2.theDate ); - Assertions.assertEquals( a1.theTime, a2.theTime ); - Assertions.assertEquals( a1.theTimestamp, a2.theTimestamp ); - Assertions.assertEquals( a1.theInstant, a2.theInstant ); - Assertions.assertEquals( a1.theUuid, a2.theUuid ); - Assertions.assertEquals( a1.gender, a2.gender ); - Assertions.assertEquals( a1.convertedGender, a2.convertedGender ); - Assertions.assertEquals( a1.ordinalGender, a2.ordinalGender ); - Assertions.assertEquals( a1.theDuration, a2.theDuration ); - Assertions.assertEquals( a1.theLocalDateTime, a2.theLocalDateTime ); - Assertions.assertEquals( a1.theLocalDate, a2.theLocalDate ); - Assertions.assertEquals( a1.theLocalTime, a2.theLocalTime ); - if ( a1.theZonedDateTime == null ) { - assertNull( a2.theZonedDateTime ); - } - else { - assertNotNull( a2.theZonedDateTime ); - Assertions.assertEquals( a1.theZonedDateTime.toInstant(), a2.theZonedDateTime.toInstant() ); - } - if ( a1.theOffsetDateTime == null ) { - assertNull( a2.theOffsetDateTime ); - } - else { - assertNotNull( a2.theOffsetDateTime ); - Assertions.assertEquals( a1.theOffsetDateTime.toInstant(), a2.theOffsetDateTime.toInstant() ); - } - if ( a1.mutableValue == null ) { - assertNull( a2.mutableValue ); - } - else { - assertNotNull( a2.mutableValue ); - Assertions.assertEquals( a1.mutableValue.getState(), a2.mutableValue.getState() ); - } - } - public static Aggregate createAggregate1() { final Aggregate aggregate = new Aggregate(); aggregate.theBoolean = true; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/PartTimeEmployee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/PartTimeEmployee.java deleted file mode 100644 index c8d5998f82de..000000000000 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/PartTimeEmployee.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.hibernate.orm.test.mapping.inheritance.discriminator; -import java.math.BigDecimal; - -/** - * @author Gail Badner - */ -public class PartTimeEmployee extends Employee { - private String title; - private BigDecimal salary; - private Employee manager; - private int percent; - - public int getPercent() { - return percent; - } - - public void setPercent(int percent) { - this.percent = percent; - } -} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/usertypes/xmlmapping/AccountCurrencyUnit.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/usertypes/xmlmapping/AccountCurrencyUnit.java index 8e9836bc15ac..123449b5bccd 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/usertypes/xmlmapping/AccountCurrencyUnit.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/usertypes/xmlmapping/AccountCurrencyUnit.java @@ -1,15 +1,11 @@ package org.hibernate.orm.test.mapping.usertypes.xmlmapping; public class AccountCurrencyUnit implements CurrencyUnit { - private String code; - private int numericCode; public AccountCurrencyUnit() { } - public AccountCurrencyUnit(String code, int numericCode) { - this.code = code; - this.numericCode = numericCode; + public AccountCurrencyUnit(String code) { } @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/usertypes/xmlmapping/CurrencyUnitTypeDescriptor.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/usertypes/xmlmapping/CurrencyUnitTypeDescriptor.java index 43bef4a8d6f9..5a957a02ef5d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/usertypes/xmlmapping/CurrencyUnitTypeDescriptor.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/usertypes/xmlmapping/CurrencyUnitTypeDescriptor.java @@ -49,7 +49,7 @@ public CurrencyUnit wrap(X currencyCode, WrapperOptions options) { return null; } if ( currencyCode instanceof String ) { - return new AccountCurrencyUnit( currencyCode.toString(), 0 ); + return new AccountCurrencyUnit( currencyCode.toString()); } throw unknownWrap( currencyCode.getClass() ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/usertypes/xmlmapping/UserTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/usertypes/xmlmapping/UserTypeTest.java index 2f7ba17a77b5..2f8dcc70a0ed 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/usertypes/xmlmapping/UserTypeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/usertypes/xmlmapping/UserTypeTest.java @@ -15,7 +15,7 @@ public class UserTypeTest { public void testTypeAnnotationIsDetected(EntityManagerFactoryScope scope) { scope.inTransaction( entityManager -> { - Account account = new Account( "first", new AccountCurrencyUnit( "2", 0 ) ); + Account account = new Account( "first", new AccountCurrencyUnit( "2") ); entityManager.persist( account ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mappingexception/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mappingexception/User.java deleted file mode 100644 index 82d873ccd22b..000000000000 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mappingexception/User.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.hibernate.orm.test.mappingexception; - - - -/** - * - * - * @author Max Rydahl Andersen - */ -public class User { - private Long id; - private String username; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getUsername() { - return username; - } - - public void setUsername(String username) { - this.username = username; - } -} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/TestingConnectionProvider.java b/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/TestingConnectionProvider.java index b8f9f7e3f60b..83664e5401b2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/TestingConnectionProvider.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/TestingConnectionProvider.java @@ -12,10 +12,6 @@ public class TestingConnectionProvider extends AbstractMultiTenantConnectionProvider { private Map connectionProviderMap; - public TestingConnectionProvider(Map connectionProviderMap) { - this.connectionProviderMap = connectionProviderMap; - } - public TestingConnectionProvider(NamedConnectionProviderPair... pairs) { Map map = new HashMap(); for ( NamedConnectionProviderPair pair : pairs ) { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/schema/AbstractSchemaBasedMultiTenancyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/schema/AbstractSchemaBasedMultiTenancyTest.java index 72172fb259cc..156bfc35c654 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/schema/AbstractSchemaBasedMultiTenancyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/schema/AbstractSchemaBasedMultiTenancyTest.java @@ -42,10 +42,6 @@ public abstract class AbstractSchemaBasedMultiTenancyTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SelectUnknownEnumLiteralTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SelectUnknownEnumLiteralTest.java index c83830e1206a..74a92b8ac5de 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SelectUnknownEnumLiteralTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SelectUnknownEnumLiteralTest.java @@ -55,6 +55,6 @@ static class Transaction { } enum Type { - TRANSACTION, DIRECT_DEBIT_GROUP, DIRECT_DEBIT + TRANSACTION } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/ToHqlStringTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/ToHqlStringTest.java index 2c90efbae20b..0af64d35a8fe 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/ToHqlStringTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/ToHqlStringTest.java @@ -147,11 +147,8 @@ public static class TestDto { @Id public Integer id; - public String name; - public TestDto(Integer id, String name) { this.id = id; - this.name = name; } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/CompositeIdNativeQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/CompositeIdNativeQueryTest.java index e611448b0f23..d40b13a3325b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/CompositeIdNativeQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/CompositeIdNativeQueryTest.java @@ -192,10 +192,6 @@ public BookPK() { } - public BookPK(final String fileid) { - this( fileid, "" ); - } - public BookPK(final String fileid, final String versionid) { this.fileid = fileid; this.versionid = versionid; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/NativeQueryResultBuilderTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/NativeQueryResultBuilderTests.java index 968012639694..f0708e70dc18 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/NativeQueryResultBuilderTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/NativeQueryResultBuilderTests.java @@ -426,35 +426,4 @@ public void prepareData(SessionFactoryScope scope) throws MalformedURLException public void cleanUpData(SessionFactoryScope scope) { scope.getSessionFactory().getSchemaManager().truncate(); } - - public static class DTO { - private Integer key; - private String text; - - public DTO(Integer key, String text) { - this.key = key; - this.text = text; - } - } - - public static class Bean { - private Integer key; - private String text; - - public Integer getKey() { - return key; - } - - public void setKey(Integer key) { - this.key = key; - } - - public String getText() { - return text; - } - - public void setText(String text) { - this.text = text; - } - } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/domain/NestedInjectedLookupListItem.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/domain/NestedInjectedLookupListItem.java deleted file mode 100644 index ae24f5033833..000000000000 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/domain/NestedInjectedLookupListItem.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.hibernate.orm.test.query.sqm.domain; - -/** - * @author Steve Ebersole - */ -public class NestedInjectedLookupListItem extends InjectedLookupListItem implements NestedLookupListItem { - private LookupListItem nested; - - public void setNested(LookupListItem nested) { - this.nested = nested; - } - - @Override - public LookupListItem getNested() { - return nested; - } -} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/Address.java index 4cdf6d4138d9..a24b8709380a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/Address.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/Address.java @@ -7,20 +7,15 @@ * @author Steve Ebersole */ public class Address { - private long id; - private String addressType; private String street; private String city; private String stateProvince; private String postalCode; private String country; - private Student student; public Address() {} - public Address(Student student, String type, String street, String city, String stateProvince, String postalCode, String country) { - this.student = student; - this.addressType = type; + public Address(String street, String city, String stateProvince, String postalCode, String country) { this.street = street; this.city = city; this.stateProvince = stateProvince; @@ -28,66 +23,22 @@ public Address(Student student, String type, String street, String city, String this.country = country; } - public long getId() { - return id; - } - - public void setId(long id) { - this.id = id; - } - - public Student getStudent() { - return student; - } - - public void setStudent(Student student) { - this.student = student; - } - - public String getAddressType() { - return addressType; - } - - public void setAddressType(String addressType) { - this.addressType = addressType; - } - - public String getStreet() { - return street; - } - public void setStreet(String street) { this.street = street; } - public String getCity() { - return city; - } - public void setCity(String city) { this.city = city; } - public String getPostalCode() { - return postalCode; - } - public void setPostalCode(String postalCode) { this.postalCode = postalCode; } - public String getCountry() { - return country; - } - public void setCountry(String country) { this.country = country; } - public String getStateProvince() { - return stateProvince; - } - public void setStateProvince(String stateProvince) { this.stateProvince = stateProvince; } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/Course.java b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/Course.java index 4db7dfa74bce..00948c5cd69b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/Course.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/Course.java @@ -1,7 +1,5 @@ package org.hibernate.orm.test.querycache; import java.io.Serializable; -import java.util.HashSet; -import java.util.Set; /** * @author Gavin King @@ -9,7 +7,6 @@ public class Course implements Serializable { private String courseCode; private String description; - private Set courseMeetings = new HashSet(); public String getCourseCode() { return courseCode; @@ -23,12 +20,6 @@ public String getDescription() { public void setDescription(String description) { this.description = description; } - public Set getCourseMeetings() { - return courseMeetings; - } - public void setCourseMeetings(Set courseMeetings) { - this.courseMeetings = courseMeetings; - } public boolean equals(Object o) { if ( this == o ) { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/CourseMeeting.java b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/CourseMeeting.java index a3f15f02209c..550a1011a7ec 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/CourseMeeting.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/CourseMeeting.java @@ -14,16 +14,9 @@ public CourseMeeting(Course course, String day, int period, String location) { this.id = new CourseMeetingId( course, day, period, location ); this.course = course; } - - public CourseMeetingId getId() { - return id; - } public void setId(CourseMeetingId id) { this.id = id; } - public Course getCourse() { - return course; - } public void setCourse(Course course) { this.course = course; } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/CourseMeetingId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/CourseMeetingId.java index 80872a335dc0..78bac4a151c4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/CourseMeetingId.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/CourseMeetingId.java @@ -18,28 +18,15 @@ public CourseMeetingId(Course course, String day, int period, String location) { this.period = period; this.location = location; } - - public String getCourseCode() { - return courseCode; - } public void setCourseCode(String courseCode) { this.courseCode = courseCode; } - public String getDay() { - return day; - } public void setDay(String day) { this.day = day; } - public int getPeriod() { - return period; - } public void setPeriod(int period) { this.period = period; } - public String getLocation() { - return location; - } public void setLocation(String location) { this.location = location; } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/Enrolment.java b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/Enrolment.java deleted file mode 100644 index 5e9a14263a15..000000000000 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/Enrolment.java +++ /dev/null @@ -1,85 +0,0 @@ -package org.hibernate.orm.test.querycache; -import java.io.Serializable; - -/** - * @author Gavin King - */ -public class Enrolment implements Serializable { - private Student student; - private Course course; - private long studentNumber; - private String courseCode; - private short year; - private short semester; - - public String getCourseCode() { - return courseCode; - } - public void setCourseCode(String courseId) { - this.courseCode = courseId; - } - public long getStudentNumber() { - return studentNumber; - } - public void setStudentNumber(long studentId) { - this.studentNumber = studentId; - } - public Course getCourse() { - return course; - } - public void setCourse(Course course) { - this.course = course; - } - public Student getStudent() { - return student; - } - public void setStudent(Student student) { - this.student = student; - } - public short getSemester() { - return semester; - } - public void setSemester(short semester) { - this.semester = semester; - } - public short getYear() { - return year; - } - public void setYear(short year) { - this.year = year; - } - - public boolean equals(Object o) { - if ( this == o ) { - return true; - } - if ( o == null || getClass() != o.getClass() ) { - return false; - } - - Enrolment enrolment = ( Enrolment ) o; - - if ( semester != enrolment.semester ) { - return false; - } - if ( studentNumber != enrolment.studentNumber ) { - return false; - } - if ( year != enrolment.year ) { - return false; - } - if ( courseCode != null ? !courseCode.equals( enrolment.courseCode ) : enrolment.courseCode != null ) { - return false; - } - - return true; - } - - public int hashCode() { - int result = ( int ) ( studentNumber ^ ( studentNumber >>> 32 ) ); - result = 31 * result + ( courseCode != null ? courseCode.hashCode() : 0 ); - result = 31 * result + ( int ) year; - result = 31 * result + ( int ) semester; - return result; - } -} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/PersonName.java b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/PersonName.java index ecb317acba7e..339efb928f02 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/PersonName.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/PersonName.java @@ -18,26 +18,14 @@ public PersonName(String first, String middle, String state) { this.last = state; } - public String getFirst() { - return first; - } - public void setFirst(String first) { this.first = first; } - public String getMiddle() { - return middle; - } - public void setMiddle(String middle) { this.middle = middle; } - public String getLast() { - return last; - } - public void setLast(String last) { this.last = last; } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/QueryCacheTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/QueryCacheTest.java index 5bc91b00c2a9..40c0f541958d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/QueryCacheTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/QueryCacheTest.java @@ -6,22 +6,17 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import jakarta.annotation.Nonnull; import org.hibernate.Hibernate; -import org.hibernate.Interceptor; -import org.hibernate.Session; -import org.hibernate.SessionBuilder; import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.JdbcSettings; import org.hibernate.query.NativeQuery; import org.hibernate.stat.EntityStatistics; import org.hibernate.stat.QueryStatistics; import org.hibernate.stat.spi.StatisticsImplementor; -import org.hibernate.type.Type; import org.hibernate.testing.jdbc.ConnectionProviderDelegate; import org.hibernate.testing.jdbc.SharedDriverManagerConnectionProvider; @@ -735,68 +730,6 @@ public void testConnectionFailure(SessionFactoryScope scope) { } ); } - protected Item findByDescription(SessionBuilder sessionBuilder, final String description) { - try (Session s = sessionBuilder.openSession()) { - CriteriaBuilder criteriaBuilder = s.getCriteriaBuilder(); - CriteriaQuery criteria = criteriaBuilder.createQuery( Item.class ); - Root root = criteria.from( Item.class ); - criteria.where( criteriaBuilder.equal( root.get( "description" ), description ) ); - - return s.createQuery( criteria ).setCacheable( true ).setReadOnly( true ).uniqueResult(); -// return (Item) s.createCriteria(Item.class) -// .setCacheable(true) -// .setReadOnly(true) -// .add(Restrictions.eq("description", description)) -// .uniqueResult(); - - } - } - - public class DelayLoadOperations implements Interceptor { - - private volatile CountDownLatch blockLatch; - private volatile CountDownLatch waitLatch; - - @Override - public boolean onLoad(Object entity, Object id, Object[] state, String[] propertyNames, Type[] types){ - onLoad(); - return true; - } - - private void onLoad() { - // Synchronize load and update activities - try { - if ( waitLatch != null ) { - waitLatch.countDown(); - } - if ( blockLatch != null ) { - blockLatch.await(); - } - } - catch (InterruptedException e) { - Thread.currentThread().interrupt(); - throw new RuntimeException( e ); - } - } - - - - public void blockOnLoad() { - blockLatch = new CountDownLatch( 1 ); - waitLatch = new CountDownLatch( 1 ); - } - - public void waitOnLoad() throws InterruptedException { - waitLatch.await(); - } - - public void unblockOnLoad() { - if ( blockLatch != null ) { - blockLatch.countDown(); - } - } - } - public static class ProxyConnectionProvider extends ConnectionProviderDelegate { private static final ThreadLocal CONNECTION_RETRIEVAL_EXCEPTION_TO_THROW = new ThreadLocal<>(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/Student.java b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/Student.java index ecfb9962a172..2a6cec7ecea4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/Student.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/Student.java @@ -1,10 +1,4 @@ package org.hibernate.orm.test.querycache; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; /** * @author Gavin King @@ -12,10 +6,6 @@ public class Student { private long studentNumber; private PersonName name; - private Course preferredCourse; - private Set enrolments = new HashSet(); - private Map addresses = new HashMap(); - private List secretCodes = new ArrayList(); public Student() {} @@ -40,38 +30,6 @@ public void setStudentNumber(long studentNumber) { this.studentNumber = studentNumber; } - public Map getAddresses() { - return addresses; - } - - public void setAddresses(Map addresses) { - this.addresses = addresses; - } - - public Course getPreferredCourse() { - return preferredCourse; - } - - public void setPreferredCourse(Course preferredCourse) { - this.preferredCourse = preferredCourse; - } - - public Set getEnrolments() { - return enrolments; - } - - public void setEnrolments(Set employments) { - this.enrolments = employments; - } - - public List getSecretCodes() { - return secretCodes; - } - - public void setSecretCodes(List secretCodes) { - this.secretCodes = secretCodes; - } - public boolean equals(Object o) { if ( this == o ) { return true; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/StudentDTO.java b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/StudentDTO.java index 0906dcd6d62a..12e55360f883 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/StudentDTO.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/StudentDTO.java @@ -21,14 +21,6 @@ public StudentDTO(PersonName name, String description) { this.courseDescription = description; } - public PersonName getName() { - return studentName; - } - - public String getDescription() { - return courseDescription; - } - public boolean equals(Object o) { if ( this == o ) { return true; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlyVersionedNodesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlyVersionedNodesTest.java index af286e8600b8..129017311295 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlyVersionedNodesTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlyVersionedNodesTest.java @@ -629,17 +629,4 @@ public void testGetChildMakeReadOnlyThenMergeDetachedChildWithNewParent(SessionF assertUpdateCount( 0, scope ); assertDeleteCount( 2, scope ); } - - protected void cleanupTest(SessionFactoryScope scope) throws Exception { - cleanup( scope ); - } - - private void cleanup(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "delete from VersionedNode where parent is not null" ).executeUpdate(); - session.createQuery( "delete from VersionedNode" ).executeUpdate(); - } - ); - } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/StudentDTO.java b/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/StudentDTO.java deleted file mode 100644 index b7ed86665781..000000000000 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/StudentDTO.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.hibernate.orm.test.readonly; - - -/** - * @author max - * - */ -public class StudentDTO { - - private String studentName; - private String courseDescription; - - public StudentDTO() { } - - public String getName() { - return studentName; - } - - public String getDescription() { - return courseDescription; - } - -} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/common/SynchronizationErrorImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/common/SynchronizationErrorImpl.java index 218f40ecda30..3b89ea02365b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/common/SynchronizationErrorImpl.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/common/SynchronizationErrorImpl.java @@ -17,10 +17,6 @@ public static SynchronizationErrorImpl forAfter() { return new SynchronizationErrorImpl( false, true ); } - public static SynchronizationErrorImpl forBoth() { - return new SynchronizationErrorImpl( true, true ); - } - private SynchronizationErrorImpl(boolean errorOnBefore, boolean errorOnAfter) { this.errorOnBefore = errorOnBefore; this.errorOnAfter = errorOnAfter; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/autocommit/SkipAutoCommitTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/autocommit/SkipAutoCommitTest.java index 533043b83c53..4c3002b472b0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/autocommit/SkipAutoCommitTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/autocommit/SkipAutoCommitTest.java @@ -6,7 +6,6 @@ import java.util.Map; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.dialect.Dialect; import org.hibernate.dialect.H2Dialect; import org.hibernate.dialect.MySQLDialect; import org.hibernate.dialect.OracleDialect; @@ -14,7 +13,6 @@ import org.hibernate.dialect.SQLServerDialect; import org.hibernate.testing.orm.jdbc.PreparedStatementSpyConnectionProvider; -import org.hibernate.testing.orm.junit.DialectContext; import org.hibernate.testing.orm.junit.DialectFeatureChecks; import org.hibernate.testing.orm.junit.EntityManagerFactoryBasedFunctionalTest; import org.hibernate.testing.orm.junit.RequiresDialect; @@ -76,10 +74,6 @@ protected Class[] getAnnotatedClasses() { }; } - protected Dialect getDialect() { - return DialectContext.getDialect(); - } - @Test public void test() throws Throwable { inTransaction( diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/JtaPlatformStandardTestingImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/JtaPlatformStandardTestingImpl.java index 977ff17a3f9f..36b68d237ec1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/JtaPlatformStandardTestingImpl.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/JtaPlatformStandardTestingImpl.java @@ -74,14 +74,6 @@ public TransactionManager transactionManager() { return retrieveTransactionManager(); } - public UserTransaction userTransaction() { - return retrieveUserTransaction(); - } - - public TransactionSynchronizationRegistry synchronizationRegistry() { - return synchronizationRegistry; - } - @Override protected TransactionManager locateTransactionManager() { return transactionManager; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schematools/TestExtraPhysicalTableTypes.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schematools/TestExtraPhysicalTableTypes.java index 7223290515db..4b569b23ebbd 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schematools/TestExtraPhysicalTableTypes.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schematools/TestExtraPhysicalTableTypes.java @@ -20,11 +20,9 @@ import org.hibernate.tool.schema.extract.internal.InformationExtractorJdbcDatabaseMetaDataImpl; import org.hibernate.tool.schema.extract.spi.DatabaseInformation; import org.hibernate.tool.schema.extract.spi.ExtractionContext; -import org.hibernate.tool.schema.internal.exec.JdbcContext; import org.hibernate.tool.schema.spi.SchemaManagementTool; import org.junit.jupiter.api.Test; -import java.sql.Connection; import java.sql.SQLException; import static org.hamcrest.MatcherAssert.assertThat; @@ -171,27 +169,4 @@ public boolean isPhysicalTableType(String tableType) { return super.isPhysicalTableType( tableType ); } } - - static class DdlTransactionIsolatorImpl implements DdlTransactionIsolator{ - - @Override - public JdbcContext getJdbcContext() { - return null; - } - - @Override - public Connection getIsolatedConnection() { - return null; - } - - @Override - public Connection getIsolatedConnection(boolean autocommit) { - return null; - } - - @Override - public void release() { - - } - } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/uniqueconstraint/TestEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/uniqueconstraint/TestEntity.java deleted file mode 100644 index 71d6102271b9..000000000000 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/uniqueconstraint/TestEntity.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.hibernate.orm.test.schemaupdate.uniqueconstraint; - -import java.util.List; -import java.util.Set; - -/** - * @author Andrea Boriero - */ -public class TestEntity { - private Long id; - - private List children; - - private Set items; -} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/ValidateConstraintTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/ValidateConstraintTests.java index 0374d2aebc21..d85f04214bdb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/ValidateConstraintTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/ValidateConstraintTests.java @@ -188,20 +188,6 @@ private void validateSchema( ); } - private void updateSchema( - Metadata schema, - HibernateSchemaManagementTool schemaTooling, - ServiceRegistryImplementor registry) { - SchemaManagementToolCoordinator.performDatabaseAction( - Action.UPDATE, - schema, - schemaTooling, - registry, - new Options( registry ), - ContributableMatcher.ALL - ); - } - private static void createSchema( Metadata schema, HibernateSchemaManagementTool schemaTooling, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/entity/AnEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/entity/AnEntity.java index c69dc423ed3f..fcfdc075af81 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/entity/AnEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/entity/AnEntity.java @@ -8,20 +8,6 @@ * @author Gail Badner */ public class AnEntity { - private PK pk; - public AnEntity() { } - - public AnEntity(PK pk) { - this.pk = pk; - } - - protected PK getPk() { - return pk; - } - - protected void setPk(PK pk) { - this.pk = pk; - } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sharedSession/SimpleSharedSessionBuildingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sharedSession/SimpleSharedSessionBuildingTests.java index 197569ce0b61..81d76cc4fd8f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sharedSession/SimpleSharedSessionBuildingTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sharedSession/SimpleSharedSessionBuildingTests.java @@ -5,7 +5,6 @@ import jakarta.persistence.Table; import org.hibernate.FlushMode; import org.hibernate.Interceptor; -import org.hibernate.SessionEventListener; import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.engine.spi.StatelessSessionImplementor; @@ -313,17 +312,4 @@ public String inspect(String sql) { public record InterceptorImpl(String name) implements Interceptor { } - - public static class SessionListener implements SessionEventListener { - private boolean closed; - - public boolean wasClosed() { - return closed; - } - - @Override - public void end() { - closed = true; - } - } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/ast/SqlAstTranslatorSurfaceTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/ast/SqlAstTranslatorSurfaceTests.java index 0ea2ca632227..5cc62286d402 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/ast/SqlAstTranslatorSurfaceTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/ast/SqlAstTranslatorSurfaceTests.java @@ -1377,11 +1377,6 @@ private static void assertFinalMethod(String name, Class parameterType) throw ) ).isTrue(); } - private static void assertFinalMethod(String name) throws NoSuchMethodException { - assertThat( Modifier.isFinal( AbstractSqlAstTranslator.class.getDeclaredMethod( name ).getModifiers() ) ) - .isTrue(); - } - private static void assertPrivateMethod(String name, Class... parameterTypes) throws NoSuchMethodException { assertThat( Modifier.isPrivate( AbstractSqlAstTranslator.class.getDeclaredMethod( name, parameterTypes ).getModifiers() diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/StatementsWithoutTerminalCharsImportFileTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/StatementsWithoutTerminalCharsImportFileTest.java index 263df7f607fc..790e92993553 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/StatementsWithoutTerminalCharsImportFileTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/StatementsWithoutTerminalCharsImportFileTest.java @@ -1,13 +1,7 @@ package org.hibernate.orm.test.tool.schema.scripts; -import org.hibernate.boot.Metadata; -import org.hibernate.boot.MetadataSources; -import org.hibernate.boot.registry.StandardServiceRegistry; import org.hibernate.dialect.H2Dialect; import org.hibernate.engine.config.spi.ConfigurationService; -import org.hibernate.resource.transaction.backend.jta.internal.JtaTransactionCoordinatorBuilderImpl; -import org.hibernate.resource.transaction.spi.TransactionCoordinatorBuilder; -import org.hibernate.testing.jta.TestingJtaBootstrap; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.DomainModelScope; import org.hibernate.testing.orm.junit.JiraKey; @@ -36,7 +30,6 @@ import java.util.Map; import static org.hamcrest.CoreMatchers.endsWith; -import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.MatcherAssert.assertThat; import static org.hibernate.cfg.SchemaToolingSettings.HBM2DDL_AUTO; import static org.hibernate.cfg.SchemaToolingSettings.HBM2DDL_HALT_ON_ERROR; @@ -136,19 +129,4 @@ public ScriptTargetOutput getScriptTargetOutput() { } } - - private Metadata buildMappings(StandardServiceRegistry registry) { - return new MetadataSources( registry ) - .buildMetadata(); - } - - protected StandardServiceRegistry buildJtaStandardServiceRegistry() { - StandardServiceRegistry registry = TestingJtaBootstrap.prepare().build(); - assertThat( - registry.getService( TransactionCoordinatorBuilder.class ), - instanceOf( JtaTransactionCoordinatorBuilderImpl.class ) - ); - return registry; - } - } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/OracleNestedTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/OracleNestedTableTest.java index c9de2a920850..226505eab93a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/OracleNestedTableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/OracleNestedTableTest.java @@ -104,7 +104,7 @@ public class OracleNestedTableTest { }); } - public enum ActivityType { Work, Play, Sleep } + public enum ActivityType { Work, Play} @Entity(name = "ContainerWithArrays") public static class Container { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/OracleSqlArrayTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/OracleSqlArrayTest.java index ddcb20bdda6b..7fb96c7f7e30 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/OracleSqlArrayTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/OracleSqlArrayTest.java @@ -110,7 +110,7 @@ void tearDown(SessionFactoryScope factoryScope) { }); } - public enum ActivityKind { Work, Play, Sleep } + public enum ActivityKind { Work, Play} @Entity(name = "ContainerWithArrays") public static class Container { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/usertype/hhh18787/CustomData.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/usertype/hhh18787/CustomData.java index 2729ccf0fef4..86cd508b380b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/usertype/hhh18787/CustomData.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/usertype/hhh18787/CustomData.java @@ -16,15 +16,7 @@ public String getText() { return text; } - public void setText(String text) { - this.text = text; - } - public Long getNumber() { return number; } - - public void setNumber(Long number) { - this.number = number; - } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/temporal/AbstractParametersBuilder.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/temporal/AbstractParametersBuilder.java index a1f77648231e..9bdd692540c0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/temporal/AbstractParametersBuilder.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/temporal/AbstractParametersBuilder.java @@ -15,7 +15,7 @@ /** * @author Steve Ebersole */ -public class AbstractParametersBuilder,B extends AbstractParametersBuilder> { +public class AbstractParametersBuilder> { protected final Dialect dialect; private final List> result = new ArrayList<>(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/temporal/Data.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/temporal/Data.java deleted file mode 100644 index 208e69bcfd6b..000000000000 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/temporal/Data.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.hibernate.orm.test.type.temporal; - -/** - * @author Steve Ebersole - */ -public interface Data { - V makeValue(); -} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/temporal/InstantTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/temporal/InstantTests.java index 437de468f1c5..c3784dba8403 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/temporal/InstantTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/temporal/InstantTests.java @@ -171,7 +171,7 @@ protected void bindJdbcValue( } public record InstantData(int year, int month, int day, - int hour, int minute, int second, int nanosecond) implements Data { + int hour, int minute, int second, int nanosecond) { public Instant asInstant() { return OffsetDateTime.of( year, month, day, hour, minute, second, nanosecond, ZoneOffset.UTC ).toInstant(); @@ -181,7 +181,6 @@ public Timestamp asTimestamp() { return Timestamp.from( asInstant() ); } - @Override public Instant makeValue() { return asInstant(); } @@ -202,42 +201,6 @@ public ParametersBuilder add(int year, int month, int day, } } - protected Instant createInstant(int year, int month, int day, int hour, int minute, int second, int nanosecond) { - return OffsetDateTime.of( year, month, day, hour, minute, second, nanosecond, ZoneOffset.UTC ).toInstant(); - } - - protected Timestamp createTimestamp(int year, int month, int day, int hour, int minute, int second, int nanosecond) { - return Timestamp.from( createInstant( year, month, day, hour, minute, second, nanosecond ) ); - } - - protected void setJdbcValueForNonHibernateWrite( - PreparedStatement statement, - int parameterIndex, - Instant instant, - SessionFactoryScope factoryScope) throws SQLException { - if ( factoryScope.getSessionFactory().getJdbcServices().getDialect().getTimeZoneSupport() == TimeZoneSupport.NATIVE ) { - // Oracle and H2 require reading/writing through OffsetDateTime to avoid TZ related miscalculations - statement.setObject( parameterIndex, instant.atOffset( ZoneOffset.UTC ) ); - } - else { - statement.setTimestamp( - parameterIndex, - Timestamp.from( instant ), - Calendar.getInstance( TimeZone.getTimeZone( "UTC" ) ) - ); - } - } - - protected Object getActualJdbcValue(ResultSet resultSet, int columnIndex, SessionFactoryScope factoryScope) throws SQLException { - if ( factoryScope.getSessionFactory().getJdbcServices().getDialect().getTimeZoneSupport() == TimeZoneSupport.NATIVE ) { - // Oracle and H2 require reading/writing through OffsetDateTime to avoid TZ related miscalculations - return Timestamp.from( resultSet.getObject( columnIndex, OffsetDateTime.class ).toInstant() ); - } - else { - return resultSet.getTimestamp( columnIndex, Calendar.getInstance( TimeZone.getTimeZone( "UTC" ) ) ); - } - } - @Entity @Table(name = ENTITY_TBL_NAME) public static class EntityWithInstant { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/temporal/LocalDateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/temporal/LocalDateTest.java index 94a4b775befe..e0122002baca 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/temporal/LocalDateTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/temporal/LocalDateTest.java @@ -198,8 +198,7 @@ public DateAsTimestampRemappingH2Dialect() { } } - public record DataImpl(int year, int month, int day) implements Data { - @Override + public record DataImpl(int year, int month, int day) { public LocalDate makeValue() { return LocalDate.of( year, month, day ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/temporal/LocalDateTimeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/temporal/LocalDateTimeTest.java index 1072376a9b92..086821e83217 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/temporal/LocalDateTimeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/temporal/LocalDateTimeTest.java @@ -196,8 +196,7 @@ public record DataImpl( int hour, int minute, int second, - int nanosecond) implements Data { - @Override + int nanosecond) { public LocalDateTime makeValue() { return LocalDateTime.of( year, month, day, hour, minute, second, nanosecond ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/temporal/LocalTimeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/temporal/LocalTimeTest.java index 7ef7085e0154..c7a64753087e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/temporal/LocalTimeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/temporal/LocalTimeTest.java @@ -259,8 +259,7 @@ public record LocalTimeData( int nanosecond, int yearWhenPersistedWithoutHibernate, int monthWhenPersistedWithoutHibernate, - int dayWhenPersistedWithoutHibernate) implements Data { - @Override + int dayWhenPersistedWithoutHibernate) { public LocalTime makeValue() { return LocalTime.of( hour(), minute(), second(), nanosecond() ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/temporal/OffsetDateTimeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/temporal/OffsetDateTimeTest.java index 7a4271db3291..d8c3728a3dab 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/temporal/OffsetDateTimeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/temporal/OffsetDateTimeTest.java @@ -260,8 +260,7 @@ public ParametersBuilder add(int year, int month, int day, public record DataImpl( int year, int month, int day, int hour, int minute, int second, int nanosecond, - String offset) implements Data { - @Override + String offset) { public OffsetDateTime makeValue() { return OffsetDateTime.of( year, month, day, hour, minute, second, nanosecond, ZoneOffset.of( offset ) ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/temporal/OffsetTimeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/temporal/OffsetTimeTest.java index 5545e74a0b45..ec3e04b81832 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/temporal/OffsetTimeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/temporal/OffsetTimeTest.java @@ -250,8 +250,7 @@ public TimeAsTimestampRemappingH2Dialect() { public record DataImpl(int hour, int minute, int second, int nanosecond, String offset, int yearWhenPersistedWithoutHibernate, int monthWhenPersistedWithoutHibernate, - int dayWhenPersistedWithoutHibernate) implements Data { - @Override + int dayWhenPersistedWithoutHibernate) { public OffsetTime makeValue() { return OffsetTime.of( hour, minute, second, nanosecond, ZoneOffset.of( offset ) ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/temporal/Parameter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/temporal/Parameter.java index ffc9d58c4d30..eeb0b360eb7f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/temporal/Parameter.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/temporal/Parameter.java @@ -3,5 +3,5 @@ /** * @author Steve Ebersole */ -public record Parameter>(Environment env, D data) { +public record Parameter(Environment env, D data) { } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/temporal/Timezones.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/temporal/Timezones.java index 1503d77580ae..a73f83a79868 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/temporal/Timezones.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/temporal/Timezones.java @@ -1,8 +1,6 @@ package org.hibernate.orm.test.type.temporal; -import org.hibernate.cfg.AvailableSettings; import org.hibernate.testing.jdbc.SharedDriverManagerConnectionProvider; -import org.junit.jupiter.api.Assumptions; import java.time.ZoneId; import java.util.TimeZone; @@ -75,14 +73,4 @@ else if ( cause instanceof Error ) { SharedDriverManagerConnectionProvider.getInstance().onDefaultTimeZoneChange(); } } - - public static void assumeNoJdbcTimeZone(Environment env) { - Assumptions.assumeTrue( - env.hibernateJdbcTimeZone() == null, - "Tests with native read/writes are only relevant when not using " + AvailableSettings.JDBC_TIME_ZONE - + ", because the expectations do not take that time zone into account." - + " When this property is set, we only test that a write by Hibernate followed by " - + " a read by Hibernate returns the same value." - ); - } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/temporal/ZonedDateTimeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/temporal/ZonedDateTimeTest.java index d7f4a3e3228e..2bec67cafc04 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/temporal/ZonedDateTimeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/temporal/ZonedDateTimeTest.java @@ -275,9 +275,7 @@ public ParametersBuilder add( } } - public record DataImpl(int year, int month, int day, int hour, int minute, int second, int nanosecond, String zone) - implements Data { - @Override + public record DataImpl(int year, int month, int day, int hour, int minute, int second, int nanosecond, String zone) { public ZonedDateTime makeValue() { return ZonedDateTime.of( year, month, day, hour, minute, second, nanosecond, ZoneId.of( zone ) ); } diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/Configuration.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/Configuration.java index 3c1b42ed8f02..424d28e153e5 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/Configuration.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/Configuration.java @@ -425,12 +425,5 @@ String getString(String propertyName, String defaultValue) { boolean getBoolean(String propertyName, boolean defaultValue) { return ConfigurationHelper.getBoolean( propertyName, properties, defaultValue ); } - - boolean getBooleanWithFallback(String basePropertyName, String newPropertyName, boolean defaultValue) { - if ( !properties.containsKey( basePropertyName ) ) { - return getBoolean( newPropertyName, defaultValue ); - } - return ConfigurationHelper.getBoolean( basePropertyName, properties ); - } } } diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/RevisionInfoConfiguration.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/RevisionInfoConfiguration.java index 4c4734c5d347..d54ed98feb2c 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/RevisionInfoConfiguration.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/RevisionInfoConfiguration.java @@ -123,13 +123,6 @@ public RevisionInfoConfiguration(Configuration config, InFlightMetadataCollector } } - /** - * The full entity name for the revision entity. - */ - public String getRevisionInfoEntityName() { - return revisionInfoEntityName; - } - /** * The query name for the revision entity. */ @@ -137,10 +130,6 @@ public String getRevisionInfoQueryName() { return revisionInfoQueryName; } - public String getRevisionInfoPropertyType() { - return revisionPropType; - } - public Class getRevisionInfoClass() { return revisionInfoClass; } diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/ComponentMetadataGenerator.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/ComponentMetadataGenerator.java index f465d94d5ab7..bb520ce8d5bc 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/ComponentMetadataGenerator.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/ComponentMetadataGenerator.java @@ -134,7 +134,7 @@ else if ( propComponent.getComponentClass() != null && if ( !firstPass ) { final EntityConfiguration owningEntityConfiguration = getAuditedEntityConfigurations().get( entityName ); - owningEntityConfiguration.addToOneComponent( propertyAuditingData.getName(), componentAuditingData ); + owningEntityConfiguration.addToOneComponent( propertyAuditingData.getName()); } } diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/EntityMappingData.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/EntityMappingData.java index d86f02c392f5..f60d022d5150 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/EntityMappingData.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/EntityMappingData.java @@ -53,24 +53,4 @@ public void build() { additionalDefinition.build( newMapping ); } } - - public boolean isRootEntity() { - return !mapping.getClazz().isEmpty(); - } - - public boolean isSubclassEntity() { - return !mapping.getSubclass().isEmpty(); - } - - public boolean isUnionSubclassEntity() { - return !mapping.getUnionSubclass().isEmpty(); - } - - public boolean isJoinedSubclassEntity() { - return !mapping.getJoinedSubclass().isEmpty(); - } - - public boolean isEntityTypeKnown() { - return !isRootEntity() && !isSubclassEntity() && !isUnionSubclassEntity() && !isJoinedSubclassEntity(); - } } diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/IdMetadataGenerator.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/IdMetadataGenerator.java index 1dd61568456f..8819e2ec1881 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/IdMetadataGenerator.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/IdMetadataGenerator.java @@ -8,7 +8,6 @@ import org.hibernate.envers.boot.model.Identifier; import org.hibernate.envers.boot.model.IdentifierRelation; import org.hibernate.envers.boot.model.ManyToOneAttribute; -import org.hibernate.envers.boot.registry.classloading.ClassLoaderAccessHelper; import org.hibernate.envers.boot.spi.EnversMetadataBuildingContext; import org.hibernate.envers.configuration.internal.metadata.reader.PropertyAuditingData; import org.hibernate.envers.internal.entities.IdMappingData; @@ -45,10 +44,6 @@ public IdMetadataGenerator(EnversMetadataBuildingContext metadataBuildingContext this.basicMetadataGenerator = basicMetadataGenerator; } - private Class loadClass(Component component) { - return ClassLoaderAccessHelper.loadClass( getMetadataBuildingContext(), component.getComponentClassName() ); - } - private static boolean isSameType(Property left, Property right) { return left.getType().getName().equals( right.getType().getName() ); } diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/JoinColumnCollectionMetadataGenerator.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/JoinColumnCollectionMetadataGenerator.java index 0d05557d2749..995662771af7 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/JoinColumnCollectionMetadataGenerator.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/JoinColumnCollectionMetadataGenerator.java @@ -190,7 +190,6 @@ private PropertyMapper getBidirectionalRelationMapper(String entityName, IdMappi // when constructing the PropertyData. new PropertyData( auditMappedBy, null, null ), entityName, - false, false ); } diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/ToOneRelationMetadataGenerator.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/ToOneRelationMetadataGenerator.java index 2bc5024ce3f5..89796330e31f 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/ToOneRelationMetadataGenerator.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/ToOneRelationMetadataGenerator.java @@ -96,7 +96,7 @@ public void addToOne( final PropertyData propertyData = propertyAuditingData.resolvePropertyData(); mapper.addComposite( propertyData, - new ToOneIdMapper( relMapper, propertyData, referencedEntityName, nonInsertableFake, lazy ) + new ToOneIdMapper( relMapper, propertyData, referencedEntityName, nonInsertableFake) ); } diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/ClassAuditingData.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/ClassAuditingData.java index dda166675825..a75b415bbea2 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/ClassAuditingData.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/ClassAuditingData.java @@ -65,10 +65,6 @@ public String getEntityName() { return persistentClass.getEntityName(); } - public Iterable getPropertyNames() { - return properties.keySet(); - } - public Map getSecondaryTableDictionary() { return secondaryTableDictionary; } diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/PropertyAuditingData.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/PropertyAuditingData.java index 3f13c6e24137..1efd2beff168 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/PropertyAuditingData.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/PropertyAuditingData.java @@ -137,10 +137,6 @@ public void setName(String name) { this.name = name; } - public String getBeanName() { - return beanName; - } - public void setBeanName(String beanName) { this.beanName = beanName; } @@ -307,30 +303,14 @@ public Value getValue() { return value; } - public void setValue(Value value) { - this.value = value; - } - - public Type getPropertyType() { - return propertyType; - } - public void setPropertyType(Type propertyType) { this.propertyType = propertyType; } - public PropertyAccessStrategy getPropertyAccessStrategy() { - return propertyAccessStrategy; - } - public void setPropertyAccessStrategy(PropertyAccessStrategy propertyAccessStrategy) { this.propertyAccessStrategy = propertyAccessStrategy; } - public Type getVirtualPropertyType() { - return virtualPropertyType; - } - public void setVirtualPropertyType(Type virtualPropertyType) { this.virtualPropertyType = virtualPropertyType; } diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/EnversLogging.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/EnversLogging.java deleted file mode 100644 index f272117ee5d4..000000000000 --- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/EnversLogging.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.hibernate.envers.internal; - -import org.jboss.logging.Logger; - -import java.lang.invoke.MethodHandles; -import java.util.Locale; - -/** - * Sad when you need helpers for generating loggers... - * - * @author Steve Ebersole - */ -public class EnversLogging { - /** - * Disallow instantiation - */ - private EnversLogging() { - } - - public static EnversMessageLogger messageLogger(Class classNeedingLogging) { - return messageLogger( classNeedingLogging.getName() ); - } - - public static EnversMessageLogger messageLogger(String loggerName) { - return Logger.getMessageLogger( MethodHandles.lookup(), EnversMessageLogger .class, loggerName, Locale.ROOT ); - } - - public static Logger logger(Class classNeedingLogging) { - return Logger.getLogger( classNeedingLogging ); - } - - public static Logger logger(String loggerName) { - return Logger.getLogger( loggerName ); - } -} diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/ComponentDescription.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/ComponentDescription.java index 5867c5d165ef..bc69ba49ec12 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/ComponentDescription.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/ComponentDescription.java @@ -1,6 +1,5 @@ package org.hibernate.envers.internal.entities; -import org.hibernate.envers.configuration.internal.metadata.reader.ComponentAuditingData; import org.hibernate.envers.internal.entities.mapper.relation.MiddleIdData; /** @@ -12,26 +11,23 @@ public class ComponentDescription { private final String propertyName; private final String auditMiddleEntityName; private final MiddleIdData middleIdData; - private final ComponentAuditingData auditingData; private ComponentDescription(ComponentType type, String propertyName, String auditMiddleEntityName, - MiddleIdData middleIdData, - ComponentAuditingData componentAuditingData) { + MiddleIdData middleIdData) { this.type = type; this.propertyName = propertyName; this.auditMiddleEntityName = auditMiddleEntityName; this.middleIdData = middleIdData; - this.auditingData = componentAuditingData; } public static ComponentDescription many(String propertyName, String auditMiddleEntityName, MiddleIdData middleIdData) { - return new ComponentDescription( ComponentType.MANY, propertyName, auditMiddleEntityName, middleIdData, null ); + return new ComponentDescription( ComponentType.MANY, propertyName, auditMiddleEntityName, middleIdData); } - public static ComponentDescription one(String propertyName, ComponentAuditingData componentAuditingData) { - return new ComponentDescription( ComponentType.ONE, propertyName, null, null, componentAuditingData ); + public static ComponentDescription one(String propertyName) { + return new ComponentDescription( ComponentType.ONE, propertyName, null, null); } public ComponentType getType() { @@ -50,10 +46,6 @@ public MiddleIdData getMiddleIdData() { return middleIdData; } - public ComponentAuditingData getAuditingData() { - return auditingData; - } - public enum ComponentType { ONE, MANY } diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/EntityConfiguration.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/EntityConfiguration.java index cf336e07250c..fa6eff885066 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/EntityConfiguration.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/EntityConfiguration.java @@ -2,8 +2,6 @@ import java.util.HashMap; import java.util.Map; - -import org.hibernate.envers.configuration.internal.metadata.reader.ComponentAuditingData; import org.hibernate.envers.internal.entities.mapper.ExtendedPropertyMapper; import org.hibernate.envers.internal.entities.mapper.PropertyMapper; import org.hibernate.envers.internal.entities.mapper.id.IdMapper; @@ -175,8 +173,8 @@ public void addToManyComponent(String propertyName, String auditMiddleEntityName components.put( propertyName, ComponentDescription.many( propertyName, auditMiddleEntityName, middleIdData ) ); } - public void addToOneComponent(String propertyName, ComponentAuditingData auditingData) { - components.put( propertyName, ComponentDescription.one( propertyName, auditingData ) ); + public void addToOneComponent(String propertyName) { + components.put( propertyName, ComponentDescription.one( propertyName) ); } public boolean isRelation(String propertyName) { diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/RevisionTimestampData.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/RevisionTimestampData.java index 1a23a77d3e4f..f4205f327ae3 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/RevisionTimestampData.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/RevisionTimestampData.java @@ -25,14 +25,6 @@ public RevisionTimestampData( this.javaType = javaType; } - public RevisionTimestampData(RevisionTimestampData old, String typeName, Class javaType) { - this( old.getName(), old.getBeanName(), old.getAccessType(), typeName, javaType ); - } - - public String getTypeName() { - return typeName; - } - public boolean isTimestampDate() { return Date.class.isAssignableFrom( javaType ); } diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/ComponentPropertyMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/ComponentPropertyMapper.java index 6a930430ec61..f1fbba7637a5 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/ComponentPropertyMapper.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/ComponentPropertyMapper.java @@ -36,7 +36,7 @@ public ComponentPropertyMapper( this.embeddableInstantiator = instantiator; //if class is a map it means that this is dynamic component if ( Map.class.isAssignableFrom( componentClass ) ) { - this.delegate = new MultiDynamicComponentMapper( propertyData ); + this.delegate = new MultiDynamicComponentMapper( ); this.componentClass = HashMap.class; } else { diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/MultiDynamicComponentMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/MultiDynamicComponentMapper.java index 0b05189b345e..bb16996ea118 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/MultiDynamicComponentMapper.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/MultiDynamicComponentMapper.java @@ -15,10 +15,7 @@ */ public class MultiDynamicComponentMapper extends MultiPropertyMapper { - private PropertyData dynamicComponentData; - - public MultiDynamicComponentMapper(PropertyData dynamicComponentData) { - this.dynamicComponentData = dynamicComponentData; + public MultiDynamicComponentMapper() { } @Override diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/ToOneIdMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/ToOneIdMapper.java index c3f2fe91883d..902bcb38b00b 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/ToOneIdMapper.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/ToOneIdMapper.java @@ -26,19 +26,16 @@ public class ToOneIdMapper extends AbstractToOneMapper { private final IdMapper delegate; private final String referencedEntityName; private final boolean nonInsertableFake; - private final boolean lazyMapping; public ToOneIdMapper( IdMapper delegate, PropertyData propertyData, String referencedEntityName, - boolean nonInsertableFake, - boolean lazyMapping) { + boolean nonInsertableFake) { super( delegate.getServiceRegistry(), propertyData ); this.delegate = delegate; this.referencedEntityName = referencedEntityName; this.nonInsertableFake = nonInsertableFake; - this.lazyMapping = lazyMapping; } @Override diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/initializor/ArrayCollectionInitializor.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/initializor/ArrayCollectionInitializor.java deleted file mode 100644 index 3fb1d4acc10f..000000000000 --- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/initializor/ArrayCollectionInitializor.java +++ /dev/null @@ -1,56 +0,0 @@ -package org.hibernate.envers.internal.entities.mapper.relation.lazy.initializor; - -import java.util.List; -import java.util.Map; - -import org.hibernate.envers.boot.internal.EnversService; -import org.hibernate.envers.internal.entities.mapper.relation.MiddleComponentData; -import org.hibernate.envers.internal.entities.mapper.relation.query.RelationQueryGenerator; -import org.hibernate.envers.internal.reader.AuditReaderImplementor; - -/** - * Initializes a map. - * - * @author Adam Warski (adam at warski dot org) - */ -public class ArrayCollectionInitializor extends AbstractCollectionInitializor { - private final MiddleComponentData elementComponentData; - private final MiddleComponentData indexComponentData; - - public ArrayCollectionInitializor( - EnversService enversService, - AuditReaderImplementor versionsReader, - RelationQueryGenerator queryGenerator, - Object primaryKey, Number revision, boolean removed, - MiddleComponentData elementComponentData, - MiddleComponentData indexComponentData) { - super( enversService, versionsReader, queryGenerator, primaryKey, revision, removed ); - - this.elementComponentData = elementComponentData; - this.indexComponentData = indexComponentData; - } - - @Override - protected Object[] initializeCollection(int size) { - return new Object[size]; - } - - @Override - @SuppressWarnings("unchecked") - protected void addToCollection(Object[] collection, Object collectionRow) { - final Object elementData = ( (List) collectionRow ).get( elementComponentData.getComponentIndex() ); - final Object element = elementComponentData.getComponentMapper().mapToObjectFromFullMap( - entityInstantiator, - (Map) elementData, null, revision - ); - - final Object indexData = ( (List) collectionRow ).get( indexComponentData.getComponentIndex() ); - final Object indexObj = indexComponentData.getComponentMapper().mapToObjectFromFullMap( - entityInstantiator, - (Map) indexData, element, revision - ); - final int index = ( (Number) indexObj ).intValue(); - - collection[index] = element; - } -} diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/AuditProcess.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/AuditProcess.java index 83dc076b5df2..51b6734bc3e6 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/AuditProcess.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/AuditProcess.java @@ -27,7 +27,6 @@ public class AuditProcess implements BeforeTransactionCompletionProcess { private static final Logger log = Logger.getLogger( AuditProcess.class ); private final RevisionInfoGenerator revisionInfoGenerator; - private final SharedSessionContractImplementor session; private final LinkedList workUnits; private final Queue undoQueue; @@ -40,7 +39,6 @@ public class AuditProcess implements BeforeTransactionCompletionProcess { public AuditProcess(RevisionInfoGenerator revisionInfoGenerator, SharedSessionContractImplementor session) { this.revisionInfoGenerator = revisionInfoGenerator; - this.session = session; workUnits = new LinkedList<>(); undoQueue = new LinkedList<>(); diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/PersistentCollectionChangeWorkUnit.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/PersistentCollectionChangeWorkUnit.java index e8b825e33eba..34d4dedbd318 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/PersistentCollectionChangeWorkUnit.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/PersistentCollectionChangeWorkUnit.java @@ -89,10 +89,6 @@ public void perform(SharedSessionContractImplementor session, Object revisionDat } } - public String getReferencingPropertyName() { - return referencingPropertyName; - } - public List getCollectionChanges() { return collectionChanges; } diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/ArraysTools.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/ArraysTools.java index 5ff9c323e45d..4130618cbc4a 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/ArraysTools.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/ArraysTools.java @@ -6,16 +6,6 @@ * @author Adam Warski (adam at warski dot org) */ public abstract class ArraysTools { - public static boolean arrayIncludesInstanceOf(T[] array, Class cls) { - for ( T obj : array ) { - if ( cls.isAssignableFrom( obj.getClass() ) ) { - return true; - } - } - - return false; - } - public static boolean arraysEqual(Object[] array1, Object[] array2) { if ( array1 == null ) { return array2 == null; diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/ConcurrentReferenceHashMap.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/ConcurrentReferenceHashMap.java index f8e382aabf80..47cdcdcf7f1c 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/ConcurrentReferenceHashMap.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/ConcurrentReferenceHashMap.java @@ -979,25 +979,6 @@ public ConcurrentReferenceHashMap( ); } - /** - * Creates a new, empty map with the specified initial capacity - * and load factor and with the default reference types (weak keys, - * strong values), and concurrencyLevel (16). - * - * @param initialCapacity The implementation performs internal - * sizing to accommodate this many elements. - * @param loadFactor the load factor threshold, used to control resizing. - * Resizing may be performed when the average number of elements per - * bin exceeds this threshold. - * - * @throws IllegalArgumentException if the initial capacity of - * elements is negative or the load factor is nonpositive - * @since 1.6 - */ - public ConcurrentReferenceHashMap(int initialCapacity, float loadFactor) { - this( initialCapacity, loadFactor, DEFAULT_CONCURRENCY_LEVEL ); - } - /** * Creates a new, empty map with the specified initial capacity, @@ -1020,21 +1001,6 @@ public ConcurrentReferenceHashMap( ); } - /** - * Creates a new, empty map with the specified initial capacity, - * and with default reference types (weak keys, strong values), - * load factor (0.75) and concurrencyLevel (16). - * - * @param initialCapacity the initial capacity. The implementation - * performs internal sizing to accommodate this many elements. - * - * @throws IllegalArgumentException if the initial capacity of - * elements is negative. - */ - public ConcurrentReferenceHashMap(int initialCapacity) { - this( initialCapacity, DEFAULT_LOAD_FACTOR, DEFAULT_CONCURRENCY_LEVEL ); - } - /** * Creates a new, empty map with a default initial capacity (16), * reference types (weak keys, strong values), default @@ -1044,25 +1010,6 @@ public ConcurrentReferenceHashMap() { this( DEFAULT_INITIAL_CAPACITY, DEFAULT_LOAD_FACTOR, DEFAULT_CONCURRENCY_LEVEL ); } - /** - * Creates a new map with the same mappings as the given map. - * The map is created with a capacity of 1.5 times the number - * of mappings in the given map or 16 (whichever is greater), - * and a default load factor (0.75) and concurrencyLevel (16). - * - * @param m the map - */ - public ConcurrentReferenceHashMap(Map m) { - this( - Math.max( - (int) ( m.size() / DEFAULT_LOAD_FACTOR ) + 1, - DEFAULT_INITIAL_CAPACITY - ), - DEFAULT_LOAD_FACTOR, DEFAULT_CONCURRENCY_LEVEL - ); - putAll( m ); - } - /** * Returns {@code true} if this map contains no key-value mappings. * @@ -1268,27 +1215,6 @@ public boolean containsValue(Object value) { return found; } - /** - * Legacy method testing if some key maps into the specified value - * in this table. This method is identical in functionality to - * {@link #containsValue}, and exists solely to ensure - * full compatibility with class {@link java.util.Hashtable}, - * which supported this method prior to introduction of the - * Java Collections framework. - * - * @param value a value to search for - * - * @return {@code true} if and only if some key maps to the - * {@code value} argument in this table as - * determined by the {@code equals} method; - * {@code false} otherwise - * - * @throws NullPointerException if the specified value is null - */ - public boolean contains(Object value) { - return containsValue( value ); - } - /** * Maps the specified key to the specified value in this table. * Neither the key nor the value can be null. @@ -1419,23 +1345,6 @@ public void clear() { } } - /** - * Removes any stale entries whose keys have been finalized. Use of this - * method is normally not necessary since stale entries are automatically - * removed lazily, when blocking operations are required. However, there - * are some cases where this operation should be performed eagerly, such - * as cleaning up old references to a ClassLoader in a multi-classloader - * environment. - *

    - * Note: this method will acquire locks, one at a time, across all segments - * of this table, so if it is to be used, it should be used sparingly. - */ - public void purgeStaleEntries() { - for ( int i = 0; i < segments.length; ++i ) { - segments[i].removeStale(); - } - } - /** * Returns a {@link Set} view of the keys contained in this map. @@ -1503,28 +1412,6 @@ public Set> entrySet() { return ( es != null ) ? es : ( entrySet = new EntrySet() ); } - /** - * Returns an enumeration of the keys in this table. - * - * @return an enumeration of the keys in this table - * - * @see #keySet() - */ - public Enumeration keys() { - return new KeyIterator(); - } - - /** - * Returns an enumeration of the values in this table. - * - * @return an enumeration of the values in this table - * - * @see #values() - */ - public Enumeration elements() { - return new ValueIterator(); - } - /* ---------------- Iterator Support -------------- */ abstract class HashIterator { @@ -1647,11 +1534,6 @@ public SimpleEntry(K key, V value) { this.value = value; } - public SimpleEntry(Entry entry) { - this.key = entry.getKey(); - this.value = entry.getValue(); - } - @Override public K getKey() { return key; diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/MutableBoolean.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/MutableBoolean.java index 84fdead449eb..842d7ed4e62f 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/MutableBoolean.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/MutableBoolean.java @@ -18,10 +18,6 @@ public boolean isSet() { return value; } - public void set() { - value = true; - } - public void unset() { value = false; } diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/MutableInteger.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/MutableInteger.java index b8fe8ee24dec..a62faaf7b6d5 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/MutableInteger.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/MutableInteger.java @@ -25,10 +25,6 @@ public int get() { return value; } - public void set(int value) { - this.value = value; - } - public void increase() { ++value; } diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/ReflectionTools.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/ReflectionTools.java index 2fb0ecfbe2ac..33a7996b03b7 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/ReflectionTools.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/ReflectionTools.java @@ -73,21 +73,6 @@ private static PropertyAccess getPropertyAccess(Class cls, String propertyName, return value; } - public static Field getField(Class cls, PropertyData propertyData) { - Field field = null; - Class clazz = cls; - while ( clazz != null && field == null ) { - try { - field = clazz.getDeclaredField( propertyData.getBeanName() ); - } - catch ( Exception e ) { - // ignore - } - clazz = clazz.getSuperclass(); - } - return field; - } - public static Class getType(Class cls, PropertyData propertyData, ServiceRegistry serviceRegistry) { PropertyAccess propertyAccess = getPropertyAccess( cls, propertyData.getBeanName(), propertyData.getAccessType(), serviceRegistry ); if ( propertyAccess.getGetter().getMember() instanceof Field field ) { diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/StringTools.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/StringTools.java index 3f9277a7617b..a448e06f02d5 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/StringTools.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/StringTools.java @@ -1,7 +1,6 @@ package org.hibernate.envers.internal.tools; import java.util.Iterator; -import java.util.Locale; /** * @author Adam Warski (adam at warski dot org) @@ -53,15 +52,4 @@ public static void append(StringBuilder sb, Iterator contents, String se isFirst = false; } } - - /** - * Capitalizes first letter of the string - * - * @param fieldName field name - * - * @return capitalized string - */ - public static String capitalizeFirst(String fieldName) { - return fieldName.substring( 0, 1 ).toUpperCase( Locale.ROOT ) + fieldName.substring( 1 ); - } } diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/Tools.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/Tools.java index 35fd0de919ff..4508433cb7b9 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/Tools.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/Tools.java @@ -31,15 +31,6 @@ public static Map newLinkedHashMap() { return new LinkedHashMap<>(); } - public static List iteratorToList(Iterator iter) { - final List ret = new ArrayList<>(); - while ( iter.hasNext() ) { - ret.add( iter.next() ); - } - - return ret; - } - public static List collectionToList(Collection collection) { if ( collection instanceof List ) { return (List) collection; diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/Triple.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/Triple.java index a192b996bfe2..9c7eee29abeb 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/Triple.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/Triple.java @@ -22,18 +22,6 @@ public Triple(T1 obj1, T2 obj2, T3 obj3) { this.obj3 = obj3; } - public T1 getFirst() { - return obj1; - } - - public T2 getSecond() { - return obj2; - } - - public T3 getThird() { - return obj3; - } - @Override public boolean equals(Object o) { if ( this == o ) { diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/query/Parameters.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/query/Parameters.java index 154bd00a4aed..b330cbd61281 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/query/Parameters.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/query/Parameters.java @@ -138,16 +138,6 @@ public void addNullRestriction(String alias, String propertyName) { addWhere( alias, propertyName, "is", null, "null" ); } - /** - * Adds IS NOT NULL restriction. - * - * @param propertyName Property name. - * @param addAlias Positive if an alias to property name shall be added. - */ - public void addNotNullRestriction(String propertyName, boolean addAlias) { - addWhere( propertyName, addAlias, "is not", "null", false ); - } - /** * Adds IS NOT NULL restriction. * diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/query/QueryBuilder.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/query/QueryBuilder.java index 754badf36f00..3fb27719c00a 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/query/QueryBuilder.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/query/QueryBuilder.java @@ -36,7 +36,6 @@ * @author Adam Warski (adam at warski dot org) */ public class QueryBuilder { - private final String entityName; private final String alias; /** @@ -91,7 +90,6 @@ private QueryBuilder( MutableInteger aliasCounter, MutableInteger paramCounter, SessionFactoryImplementor sessionFactory) { - this.entityName = entityName; this.alias = alias; this.aliasCounter = aliasCounter; this.paramCounter = paramCounter; @@ -113,29 +111,6 @@ private QueryBuilder( addFrom( entityName, alias, true ); } - // Only for deep copy purpose. - private QueryBuilder(QueryBuilder other) { - this.entityName = other.entityName; - this.alias = other.alias; - this.sessionFactory = other.sessionFactory; - this.revisionType = other.revisionType; - this.aliasCounter = other.aliasCounter.deepCopy(); - this.paramCounter = other.paramCounter.deepCopy(); - for (final Parameters params : other.parameters) { - this.parameters.add( params.deepCopy() ); - } - - froms = new ArrayList<>( other.froms ); - orders = new ArrayList<>( other.orders ); - projections = new ArrayList<>( other.projections ); - projectionQueryParamValues = new HashMap<>( other.projectionQueryParamValues ); - orderFragments = new ArrayList<>( other.orderFragments ); - } - - public QueryBuilder deepCopy() { - return new QueryBuilder( this ); - } - /** * @return the main alias of this query builder */ diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/query/UpdateBuilder.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/query/UpdateBuilder.java deleted file mode 100644 index a71feaf2d159..000000000000 --- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/query/UpdateBuilder.java +++ /dev/null @@ -1,77 +0,0 @@ -package org.hibernate.envers.internal.tools.query; - -import java.util.HashMap; -import java.util.Map; - -import org.hibernate.Session; -import org.hibernate.envers.internal.tools.MutableInteger; -import org.hibernate.query.Query; - -/** - * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) - */ -public class UpdateBuilder { - private final String entityName; - private final String alias; - private final MutableInteger paramCounter; - private final Parameters rootParameters; - private final Map updates; - - public UpdateBuilder(String entityName, String alias) { - this( entityName, alias, new MutableInteger() ); - } - - private UpdateBuilder(String entityName, String alias, MutableInteger paramCounter) { - this.entityName = entityName; - this.alias = alias; - this.paramCounter = paramCounter; - rootParameters = new Parameters( alias, "and", paramCounter ); - updates = new HashMap<>(); - } - - public Parameters getRootParameters() { - return rootParameters; - } - - public void updateValue(String propertyName, Object value) { - updates.put( propertyName, value ); - } - - public void build(StringBuilder sb, Map updateParamValues) { - sb.append( "update " ).append( entityName ).append( " " ).append( alias ); - sb.append( " set " ); - int i = 1; - for ( Map.Entry entry : updates.entrySet() ) { - final String property = entry.getKey(); - final String paramName = generateParameterName(); - sb.append( alias ).append( "." ).append( property ).append( " = " ).append( ":" ).append( paramName ); - updateParamValues.put( paramName, entry.getValue() ); - if ( i < updates.size() ) { - sb.append( ", " ); - } - ++i; - } - if ( !rootParameters.isEmpty() ) { - sb.append( " where " ); - rootParameters.build( sb, updateParamValues ); - } - } - - private String generateParameterName() { - return "_u" + paramCounter.getAndIncrease(); - } - - public Query toQuery(Session session) { - final StringBuilder querySb = new StringBuilder(); - final Map queryParamValues = new HashMap<>(); - - build( querySb, queryParamValues ); - - final Query query = session.createQuery( querySb.toString() ); - for ( Map.Entry paramValue : queryParamValues.entrySet() ) { - query.setParameter( paramValue.getKey(), paramValue.getValue() ); - } - - return query; - } -} diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/AbstractAuditQuery.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/AbstractAuditQuery.java index b1a9b0ad663c..344d77c7b76e 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/AbstractAuditQuery.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/AbstractAuditQuery.java @@ -265,18 +265,6 @@ public AuditQuery setLockMode(LockMode lockMode) { return this; } - /** - * Set lock options - * - * @param lockOptions The @{link LockOptions} used for this query. - * - * @return this object - */ - public AuditQuery setLockOptions(LockOptions lockOptions) { - LockOptions.copy( lockOptions, this.lockOptions ); - return this; - } - protected void setQueryProperties(Query query) { if ( maxResults != null ) { query.setMaxResults( maxResults ); diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/property/OriginalIdPropertyName.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/property/OriginalIdPropertyName.java deleted file mode 100644 index e8838240bdf6..000000000000 --- a/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/property/OriginalIdPropertyName.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.hibernate.envers.query.internal.property; - -import org.hibernate.envers.configuration.Configuration; - -/** - * Used for specifying restrictions on the identifier. - * - * @author Adam Warski (adam at warski dot org) - * @author Chris Cranford - */ -public class OriginalIdPropertyName implements PropertyNameGetter { - private final String idPropertyName; - - public OriginalIdPropertyName(String idPropertyName) { - this.idPropertyName = idPropertyName; - } - - @Override - public String get(Configuration configuration) { - return configuration.getOriginalIdPropertyName() + "." + idPropertyName; - } -} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/Priority.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/Priority.java deleted file mode 100644 index 14ea0dc269c8..000000000000 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/Priority.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.hibernate.orm.test.envers; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * An annotation for specifying test method priority. Methods with higher priorities execute earlier. - * If the annotation is not present priority 0 is assumed. - * - * @author Adam Warski (adam at warski dot org) - */ -@Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.METHOD, ElementType.TYPE}) -public @interface Priority { - int value(); -} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/customtype/Component.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/customtype/Component.java index 0763fe3c51bc..d24f7fb82988 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/customtype/Component.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/customtype/Component.java @@ -17,18 +17,10 @@ public Component(String prop1, int prop2) { public Component() { } - public String getProp1() { - return prop1; - } - public void setProp1(String prop1) { this.prop1 = prop1; } - public int getProp2() { - return prop2; - } - public void setProp2(int prop2) { this.prop2 = prop2; } diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/data/SerObject.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/data/SerObject.java index 2033a4832406..7c6cae6c3ddb 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/data/SerObject.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/data/SerObject.java @@ -17,14 +17,6 @@ public SerObject(String data) { this.data = data; } - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - public boolean equals(Object o) { if ( this == o ) { return true; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/allAudited/union/UnionAllAuditedTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/allAudited/union/UnionAllAuditedTest.java index cac1c3e1b463..0700af63b57a 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/allAudited/union/UnionAllAuditedTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/allAudited/union/UnionAllAuditedTest.java @@ -10,7 +10,4 @@ @EnversTest @Jpa(xmlMappings = "mappings/interfaces/unionAllAuditedMappings.hbm.xml") public class UnionAllAuditedTest extends AbstractAllAuditedTest { - protected String[] getMappings() { - return new String[] {"mappings/interfaces/unionAllAuditedMappings.hbm.xml"}; - } } diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/tools/TablePrinter.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/tools/TablePrinter.java deleted file mode 100644 index 04daef2819e0..000000000000 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/tools/TablePrinter.java +++ /dev/null @@ -1,105 +0,0 @@ -package org.hibernate.orm.test.envers.tools; - -import java.util.List; -import java.util.Map; -import java.util.TreeMap; -import java.util.function.Supplier; - -import jakarta.persistence.EntityManager; -import jakarta.persistence.EntityManagerFactory; -import jakarta.persistence.Tuple; -import jakarta.persistence.TupleElement; - -import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; - -/** - * @author Chris Cranford - */ -public class TablePrinter { - - private static Map buildColumnSizesFromRows(List rows) { - Map columnSizes = new TreeMap<>(); - for ( int i = 0; i < rows.size(); ++i ) { - Tuple row = rows.get( i ); - // on first row, handle columns - if ( i == 0 ) { - for ( int j = 0; j < row.getElements().size(); ++j ) { - TupleElement element = row.getElements().get( j ); - columnSizes.put( j, element.getAlias().length() ); - } - } - // handle values - for ( int j = 0; j < row.getElements().size(); ++j ) { - Object value = row.get( j ); - int length = ( "" + value ).trim().length(); - if ( length > columnSizes.get( j ) ) { - columnSizes.put( j, length ); - } - } - } - return columnSizes; - } - - private static void writeColumn(int columnIndex, int columns, int length, String value) { - System.out.print( "| " + String.format( "%1$-" + length + "s", value ) + " " ); - if ( columnIndex + 1 >= columns ) { - System.out.println( "|" ); - } - } - - private static String buildSplitter(List> columns, Map columnSizes) { - StringBuilder sb = new StringBuilder(); - for ( int i = 0; i < columns.size(); ++i ) { - sb.append( "+-" + String.format( "%1$-" + columnSizes.get( i ) + "s", "" ).replace( ' ', '-' ) + '-' ); - if ( i + 1 >= columns.size() ) { - sb.append( '+' ); - } - } - return sb.toString(); - } - - private static void printTableFromRows(List rows) { - if ( rows.size() > 0 ) { - Map columnSizes = buildColumnSizesFromRows( rows ); - String rowSplitter = null; - for ( int i = 0; i < rows.size(); ++i ) { - Tuple row = rows.get( i ); - List> columns = row.getElements(); - - if ( rowSplitter == null ) { - rowSplitter = buildSplitter( columns, columnSizes ); - } - - // handle columns on first row - if ( i == 0 ) { - System.out.println( rowSplitter ); - for ( int j = 0; j < columns.size(); ++j ) { - writeColumn( j, columns.size(), columnSizes.get( j ), columns.get( j ).getAlias() ); - } - System.out.println( rowSplitter ); - } - - // handle column values - for ( int j = 0; j < columns.size(); ++j ) { - final String value = row.get( j ) + "".trim(); - writeColumn( j, columns.size(), columnSizes.get( j ), value ); - } - } - - System.out.println( rowSplitter ); - } - } - - public static void print(EntityManager entityManager, String... tables) { - for ( String table : tables ) { - List rows = entityManager.createNativeQuery( "SELECT * FROM " + table + " ORDER BY REV", Tuple.class ).getResultList(); - printTableFromRows( rows ); - } - } - - public static void print(Supplier factorySupplier, String... tables) { - doInJPA( factorySupplier, entityManager -> { - print( entityManager, tables ); - } ); - } -} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/tools/TestTools.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/tools/TestTools.java index 8e00ebd44768..686a4a48c52a 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/tools/TestTools.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/tools/TestTools.java @@ -94,7 +94,6 @@ public static MapBuilder mapBuilder() { public interface MapBuilder { MapBuilder add(K key, E value); Set> entries(); - Map map(); } private static class MashMapBuilderImpl implements MapBuilder { @@ -110,10 +109,5 @@ public MapBuilder add(K key, E value) { public Set> entries() { return hashMap.entrySet(); } - - @Override - public Map map() { - return hashMap; - } } } diff --git a/hibernate-envers/src/test/java/org/hibernate/testing/envers/DialectAccess.java b/hibernate-envers/src/test/java/org/hibernate/testing/envers/DialectAccess.java deleted file mode 100644 index a40433283a4f..000000000000 --- a/hibernate-envers/src/test/java/org/hibernate/testing/envers/DialectAccess.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.hibernate.testing.envers; - -import org.hibernate.dialect.Dialect; - - -/** - * Contract for things that expose a Dialect - * - * @author Steve Ebersole - */ -public interface DialectAccess { - Dialect getDialect(); -} diff --git a/hibernate-envers/src/test/java/org/hibernate/testing/envers/EntityManagerFactoryAccess.java b/hibernate-envers/src/test/java/org/hibernate/testing/envers/EntityManagerFactoryAccess.java deleted file mode 100644 index 77334c7c9fd8..000000000000 --- a/hibernate-envers/src/test/java/org/hibernate/testing/envers/EntityManagerFactoryAccess.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.hibernate.testing.envers; - -import jakarta.persistence.EntityManagerFactory; - -import org.hibernate.dialect.Dialect; - -import org.hibernate.testing.orm.junit.DialectContext; - -/** - * Contract for things that expose an EntityManagerFactory - * - * @author Chris Cranford - */ -public interface EntityManagerFactoryAccess extends DialectAccess { - EntityManagerFactory getEntityManagerFactory(); - - @Override - default Dialect getDialect() { - return DialectContext.getDialect(); - } -} diff --git a/hibernate-envers/src/test/java/org/hibernate/testing/envers/EnversEntityManagerFactoryProducer.java b/hibernate-envers/src/test/java/org/hibernate/testing/envers/EnversEntityManagerFactoryProducer.java index 5c7deb318de8..69ef83fe283b 100644 --- a/hibernate-envers/src/test/java/org/hibernate/testing/envers/EnversEntityManagerFactoryProducer.java +++ b/hibernate-envers/src/test/java/org/hibernate/testing/envers/EnversEntityManagerFactoryProducer.java @@ -1,12 +1,9 @@ package org.hibernate.testing.envers; -import jakarta.persistence.EntityManagerFactory; - /** * Envers contract for something that can build an EntityManagerFactory based on an audit strategy. * * @author Chris Cranford */ public interface EnversEntityManagerFactoryProducer { - EntityManagerFactory produceEntityManagerFactory(String auditStrategyName); } diff --git a/hibernate-envers/src/test/java/org/hibernate/testing/envers/EnversEntityManagerFactoryScope.java b/hibernate-envers/src/test/java/org/hibernate/testing/envers/EnversEntityManagerFactoryScope.java index 3160ace15af1..77ba2829816d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/testing/envers/EnversEntityManagerFactoryScope.java +++ b/hibernate-envers/src/test/java/org/hibernate/testing/envers/EnversEntityManagerFactoryScope.java @@ -1,228 +1,24 @@ package org.hibernate.testing.envers; -import java.util.ArrayList; -import java.util.List; -import java.util.function.Consumer; -import java.util.function.Function; import jakarta.persistence.EntityManager; -import jakarta.persistence.EntityManagerFactory; import org.hibernate.Session; import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.envers.boot.internal.EnversService; import org.hibernate.envers.strategy.spi.AuditStrategy; -import org.hibernate.testing.jta.TestingJtaPlatformImpl; /** * @author Chris Cranford */ -public class EnversEntityManagerFactoryScope implements EntityManagerFactoryAccess { +public class EnversEntityManagerFactoryScope { private final EnversEntityManagerFactoryProducer entityManagerFactoryProducer; private final Strategy auditStrategy; - private EntityManagerFactory entityManagerFactory; - public EnversEntityManagerFactoryScope(EnversEntityManagerFactoryProducer producer, Strategy auditStrategy) { this.auditStrategy = auditStrategy; this.entityManagerFactoryProducer = producer; } - public void releaseEntityManagerFactory() { - if ( entityManagerFactory != null ) { - entityManagerFactory.close(); - entityManagerFactory = null; - } - } - - @Override - public EntityManagerFactory getEntityManagerFactory() { - if ( entityManagerFactory == null || !entityManagerFactory.isOpen() ) { - final String strategy = auditStrategy.getSettingValue(); - entityManagerFactory = entityManagerFactoryProducer.produceEntityManagerFactory( strategy ); - } - return entityManagerFactory; - } - - public void inJtaTransaction(Consumer action) throws Exception { - inJtaTransaction( getEntityManagerFactory(), action ); - } - - public void inJtaTransaction(EntityManagerFactory factory, Consumer action) throws Exception { - TestingJtaPlatformImpl.INSTANCE.getTransactionManager().begin(); - EntityManager entityManager = factory.createEntityManager(); - try { - action.accept( entityManager ); - } - finally { - entityManager.close(); - TestingJtaPlatformImpl.tryCommit(); - } - } - - public void inTransaction(Consumer action) { - inTransaction( getEntityManagerFactory(), action ); - } - - public void inTransaction(EntityManagerFactory factory, Consumer action) { - EntityManager entityManager = factory.createEntityManager(); - try { - entityManager.getTransaction().begin(); - action.accept( entityManager ); - entityManager.getTransaction().commit(); - } - catch ( Exception e ) { - if ( entityManager.getTransaction().isActive() ) { - entityManager.getTransaction().rollback(); - } - throw e; - } - finally { - entityManager.close(); - } - } - - public void inTransaction(EntityManager entityManager, Consumer action) { - try { - entityManager.getTransaction().begin(); - action.accept( entityManager ); - entityManager.getTransaction().commit(); - } - catch ( Exception e ) { - if ( entityManager.getTransaction().isActive() ) { - entityManager.getTransaction().rollback(); - } - throw e; - } - } - - @SafeVarargs - public final void inTransactions(Consumer... actions) { - EntityManager entityManager = getEntityManagerFactory().createEntityManager(); - try { - for ( Consumer action : actions ) { - try { - entityManager.getTransaction().begin(); - action.accept( entityManager ); - entityManager.getTransaction().commit(); - } - catch ( Exception e ) { - if ( entityManager.getTransaction().isActive() ) { - entityManager.getTransaction().rollback(); - } - throw e; - } - } - } - finally { - entityManager.close(); - } - } - - @SafeVarargs - public final List inTransactionsWithTimeouts(int timeout, Consumer... actions) { - EntityManager entityManager = getEntityManagerFactory().createEntityManager(); - try { - final List timestamps = new ArrayList<>(); - - timestamps.add( System.currentTimeMillis() ); - for ( Consumer action : actions ) { - try { - Thread.sleep( 100 ); - entityManager.getTransaction().begin(); - action.accept( entityManager ); - entityManager.getTransaction().commit(); - timestamps.add( System.currentTimeMillis() ); - } - catch ( InterruptedException e ) { - if ( entityManager.getTransaction().isActive() ) { - entityManager.getTransaction().rollback(); - } - throw new RuntimeException( "Failed to wait on timeout", e ); - } - catch ( Exception e ) { - if ( entityManager.getTransaction().isActive() ) { - entityManager.getTransaction().rollback(); - } - throw e; - } - } - - return timestamps; - } - finally { - entityManager.close(); - } - } - - public R inTransaction(Function action) { - return inTransaction( getEntityManagerFactory(), action ); - } - - public R inTransaction(EntityManagerFactory factory, Function action) { - EntityManager entityManager = factory.createEntityManager(); - try { - return inTransaction( entityManager, action ); - } - finally { - entityManager.close(); - } - } - - public R inTransaction(EntityManager entityManager, Function action) { - try { - entityManager.getTransaction().begin(); - R result = action.apply( entityManager ); - entityManager.getTransaction().commit(); - return result; - } - catch ( Exception e ) { - if ( entityManager.getTransaction().isActive() ) { - entityManager.getTransaction().rollback(); - } - throw e; - } - } - - public void inJPA(Consumer action) { - inJPA( getEntityManagerFactory(), action ); - } - - public R inJPA(Function action) { - return inJPA( getEntityManagerFactory(), action ); - } - - public void inJPA(EntityManagerFactory factory, Consumer action) { - EntityManager entityManager = factory.createEntityManager(); - try { - action.accept( entityManager ); - } - catch ( Exception e ) { - if ( entityManager.getTransaction().isActive() ) { - entityManager.getTransaction().rollback(); - } - throw e; - } - finally { - entityManager.close(); - } - } - - public R inJPA(EntityManagerFactory factory, Function action) { - EntityManager entityManager = factory.createEntityManager(); - try { - return action.apply( entityManager ); - } - catch ( Exception e ) { - if ( entityManager.getTransaction().isActive() ) { - entityManager.getTransaction().rollback(); - } - throw e; - } - finally { - entityManager.close(); - } - } - public static AuditStrategy getAuditStrategy(EntityManager entityManager) { if ( entityManager.getDelegate() instanceof Session ) { return getAuditStrategy( (Session) entityManager.getDelegate() ); diff --git a/hibernate-envers/src/test/java/org/hibernate/testing/envers/EnversSessionFactoryProducer.java b/hibernate-envers/src/test/java/org/hibernate/testing/envers/EnversSessionFactoryProducer.java deleted file mode 100644 index 7f74a6c1130e..000000000000 --- a/hibernate-envers/src/test/java/org/hibernate/testing/envers/EnversSessionFactoryProducer.java +++ /dev/null @@ -1,12 +0,0 @@ -package org.hibernate.testing.envers; - -import org.hibernate.SessionFactory; - -/** - * Envers contract for something that can build a SessionFactory based on an audit strategy. - * - * @author Chris Cranford - */ -public interface EnversSessionFactoryProducer { - SessionFactory produceSessionFactory(String auditStrategyName); -} diff --git a/hibernate-envers/src/test/java/org/hibernate/testing/envers/ExcludeAuditStrategy.java b/hibernate-envers/src/test/java/org/hibernate/testing/envers/ExcludeAuditStrategy.java deleted file mode 100644 index 68eb81d379a7..000000000000 --- a/hibernate-envers/src/test/java/org/hibernate/testing/envers/ExcludeAuditStrategy.java +++ /dev/null @@ -1,41 +0,0 @@ -package org.hibernate.testing.envers; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import org.hibernate.envers.strategy.spi.AuditStrategy; - -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -/** - * Annotation used to indicate that a test should be excluded for a specific audit strategy. - * - * @author Chris Cranford - * @since 6.0 - */ -@Retention(RUNTIME) -@Target({METHOD, TYPE}) -public @interface ExcludeAuditStrategy { - /** - * The strategies against which to exclude the test. - * - * @return The strategies. - */ - Class[] value(); - - /** - * Comment describing the reason why the audit strategy is excluded. - * - * @return The comment. - */ - String comment() default ""; - - /** - * The key of a JIRA issue hwich relates to this restriction. - * - * @return The jira issue key. - */ - String jiraKey() default ""; -} diff --git a/hibernate-envers/src/test/java/org/hibernate/testing/envers/Strategy.java b/hibernate-envers/src/test/java/org/hibernate/testing/envers/Strategy.java index ea6e6ac9f924..f5e520d129ed 100644 --- a/hibernate-envers/src/test/java/org/hibernate/testing/envers/Strategy.java +++ b/hibernate-envers/src/test/java/org/hibernate/testing/envers/Strategy.java @@ -19,16 +19,4 @@ public enum Strategy { this.settingValue = settingValue; this.strategyClass = strategyClass; } - - public String getDisplayName() { - return displayName; - } - - public String getSettingValue() { - return settingValue; - } - - public boolean isStrategy(Class strategyClass) { - return strategyClass.isAssignableFrom( this.strategyClass ); - } } diff --git a/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/domain/EventManager.java b/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/domain/EventManager.java index 5c705553ce6d..683bf7dd4ab5 100644 --- a/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/domain/EventManager.java +++ b/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/domain/EventManager.java @@ -4,14 +4,9 @@ import java.util.Date; import java.util.Iterator; import java.util.List; -import java.util.ListIterator; - -import jakarta.persistence.criteria.CriteriaBuilder; -import jakarta.persistence.criteria.CriteriaQuery; import org.hibernate.Session; import org.hibernate.SessionFactory; -import org.hibernate.query.SelectionQuery; public class EventManager { @@ -94,64 +89,6 @@ public List listEvents() { return result; } - /** - * Call setEntity() on a cacheable query - see FORGE-265 - */ - public List listEventsOfOrganizer(Person organizer) { - - Session session = sessionFactory.getCurrentSession(); - - try { - session.beginTransaction(); - - SelectionQuery query = session.createSelectionQuery( "from Event ev where ev.organizer = :organizer", Event.class ); - - query.setCacheable( true ); - query.setParameter( "organizer", organizer ); - List result = query.list(); - - session.getTransaction().commit(); - - return result; - } - catch (Exception e){ - if(session.getTransaction().isActive()){ - session.getTransaction().rollback(); - } - throw e; - } - } - - /** - * Use a Criteria query - see FORGE-247 - */ - public List listEventsWithCriteria() { - Session session = sessionFactory.getCurrentSession(); - - try { - session.beginTransaction(); - - CriteriaBuilder criteriaBuilder = session.getCriteriaBuilder(); - CriteriaQuery criteria = criteriaBuilder.createQuery( Event.class ); - criteria.from( Event.class ); - - List result = session.createSelectionQuery( criteria ).setCacheable( true ).list(); -// List result = session.createCriteria( Event.class ) -// .setCacheable( true ) -// .list(); - - session.getTransaction().commit(); - - return result; - } - catch (Exception e){ - if(session.getTransaction().isActive()){ - session.getTransaction().rollback(); - } - throw e; - } - } - public void addPersonToEvent(Long personId, Long eventId) { Session session = sessionFactory.getCurrentSession(); @@ -165,29 +102,6 @@ public void addPersonToEvent(Long personId, Long eventId) { session.getTransaction().commit(); } - public Long addPersonToAccount(Long personId, Account account) { - Session session = sessionFactory.getCurrentSession(); - session.beginTransaction(); - - Person aPerson = session.getReference(Person.class, personId); - account.setPerson(aPerson); - - session.persist(account); - - session.getTransaction().commit(); - return account.getId(); - } - - public Account getAccount(Long accountId) { - Session session = sessionFactory.getCurrentSession(); - session.beginTransaction(); - - Account account = session.getReference(Account.class, accountId); - - session.getTransaction().commit(); - return account; - } - public void addEmailToPerson(Long personId, String emailAddress) { Session session = sessionFactory.getCurrentSession(); @@ -223,36 +137,4 @@ public void addTalismanToPerson(Long personId, String talisman) { session.getTransaction().commit(); } - - public Long createHolidayCalendar() { - - Session session = sessionFactory.getCurrentSession(); - session.beginTransaction(); - - // delete all existing calendars - List calendars = session.createSelectionQuery("from HolidayCalendar", HolidayCalendar.class).setCacheable(true).list(); - for (ListIterator li = calendars.listIterator(); li.hasNext(); ) { - session.remove(li.next()); - } - - HolidayCalendar calendar = new HolidayCalendar(); - calendar.init(); - - session.persist(calendar); - - session.getTransaction().commit(); - return calendar.getId(); - } - - public HolidayCalendar getHolidayCalendar() { - Session session = sessionFactory.getCurrentSession(); - - session.beginTransaction(); - - List calendars = session.createSelectionQuery("from HolidayCalendar", HolidayCalendar.class).setCacheable(true).list(); - - session.getTransaction().commit(); - - return calendars.isEmpty() ? null : calendars.get(0); - } } diff --git a/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/domain/UuidItem.java b/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/domain/UuidItem.java deleted file mode 100644 index 1437a7d051a3..000000000000 --- a/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/domain/UuidItem.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.hibernate.orm.test.jcache.domain; - -public class UuidItem { - private String id; - private String name; - private String description; - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } -} diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/SpatialFunction.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/SpatialFunction.java index a05654b3c942..76aae1a9f18d 100644 --- a/hibernate-spatial/src/main/java/org/hibernate/spatial/SpatialFunction.java +++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/SpatialFunction.java @@ -19,127 +19,127 @@ public enum SpatialFunction { /** * The dimension function, cfr. OGC 99-049, s2.1.1.1 */ - dimension( "SFS 1.1" ), + dimension( ), /** * The geometryType function, cfr. OGC 99-049, s2.1.1.1 */ - geometrytype( "SFS 1.1" ), + geometrytype( ), /** * The SRID function, cfr. OGC 99-049, s2.1.1.1 */ - srid( "SFS 1.1" ), + srid( ), /** * The envelope function, cfr. OGC 99-049, s2.1.1.1 */ - envelope( "SFS 1.1" ), + envelope( ), /** * The asText function, cfr. OGC 99-049, s2.1.1.1 */ - astext( "SFS 1.1" ), + astext( ), /** * The asBinary function, cfr. OGC 99-049, s2.1.1.1 */ - asbinary( "SFS 1.1" ), + asbinary( ), /** * The isEmpty function, cfr. OGC 99-049, s2.1.1.1 */ - isempty( "SFS 1.1" ), + isempty( ), /** * The isSimple function, cfr. OGC 99-049, s2.1.1.1 */ - issimple( "SFS 1.1" ), + issimple( ), /** * The boundery function, cfr. OGC 99-049, s2.1.1.1 */ - boundary( "SFS 1.1" ), + boundary( ), /** * The equals function, cfr. OGC 99-049, s2.1.1.2 */ - equals( "SFS 1.1" ), + equals( ), /** * The disjoint function, cfr. OGC 99-049, s2.1.1.2 */ - disjoint( "SFS 1.1" ), + disjoint( ), /** * The intersects function, cfr. OGC 99-049, s2.1.1.2 */ - intersects( "SFS 1.1" ), + intersects( ), /** * The touches function, cfr. OGC 99-049, s2.1.1.2 */ - touches( "SFS 1.1" ), + touches( ), /** * The crosses function, cfr. OGC 99-049, s2.1.1.2 */ - crosses( "SFS 1.1" ), + crosses( ), /** * The within function, cfr. OGC 99-049, s2.1.1.2 */ - within( "SFS 1.1" ), + within( ), /** * The contains function, cfr. OGC 99-049, s2.1.1.2 */ - contains( "SFS 1.1" ), + contains( ), /** * The overlaps function, cfr. OGC 99-049, s2.1.1.2 */ - overlaps( "SFS 1.1" ), + overlaps( ), /** * The relate function, cfr. OGC 99-049, s2.1.1.2 */ - relate( "SFS 1.1" ), + relate( ), /** * The distance function, cfr. OGC 99-049, s2.1.1.3 */ - distance( "SFS 1.1" ), + distance( ), /** * The buffer function, cfr. OGC 99-049, s2.1.1.3 */ - buffer( "SFS 1.1" ), + buffer( ), /** * The convexHull function, cfr. OGC 99-049, s2.1.1.3 */ - convexhull( "SFS 1.1" ), + convexhull( ), /** * The intersection function, cfr. OGC 99-049, s2.1.1.3 */ - intersection( "SFS 1.1" ), + intersection( ), /** * The union function, cfr. OGC 99-049, s2.1.1.3 */ - geomunion( "SFS 1.1" ), + geomunion( ), /** * The difference function, cfr. OGC 99-049, s2.1.1.3 */ - difference( "SFS 1.1" ), + difference( ), /** * The symDifference function, cfr. OGC 99-049, s2.1.1.3 */ - symdifference( "SFS 1.1" ), + symdifference( ), /** * the distance within function @@ -147,7 +147,7 @@ public enum SpatialFunction { * The semantics are those of Postgis function ST_Dwithin (geom1, geom2, distance) : boolean. It returns true * if geom1 and geom2 are within the specified distance of one another (in units of the spatial reference system). */ - dwithin( "common" ), + dwithin( ), /** * the transform function @@ -155,27 +155,24 @@ public enum SpatialFunction { * The semantics are those of the Postgis function ST_Transform(geometry, srid) : geometry. It returns new geometry * with its coordinates transformed to the spatial reference system referenced by the srid parameter. */ - transform( "common" ), + transform( ), /** * the extents function */ - extent( "common" ), + extent( ), /** * The filter function *

    * Corresponds to the Oracle Spatial's "SDO_FILTER" function, or the "&&" operator of PostGIS. */ - filter( "filter" ), + filter( ), ; - private final String description; - - SpatialFunction(String specification) { - this.description = specification; + SpatialFunction() { } } diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/SDOGeometryType.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/SDOGeometryType.java index 6f56b39bcc19..57f0fdcf29bf 100644 --- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/SDOGeometryType.java +++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/SDOGeometryType.java @@ -22,7 +22,6 @@ public class SDOGeometryType implements JdbcType { private final OracleJDBCTypeFactory typeFactory; - private final boolean useSTGeometry; /** * Constructs a {@code SqlTypeDescriptor} for the Oracle SDOGeometry type. @@ -32,7 +31,6 @@ public class SDOGeometryType implements JdbcType { */ public SDOGeometryType(OracleJDBCTypeFactory typeFactory, boolean useSTGeometry) { this.typeFactory = typeFactory; - this.useSTGeometry = useSTGeometry; } @Override diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/predicate/GeolatteFilterPredicate.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/predicate/GeolatteFilterPredicate.java index 0ed213c1964c..a9ddc55e6e83 100644 --- a/hibernate-spatial/src/main/java/org/hibernate/spatial/predicate/GeolatteFilterPredicate.java +++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/predicate/GeolatteFilterPredicate.java @@ -13,22 +13,16 @@ import org.geolatte.geom.crs.CoordinateReferenceSystem; /** - * {@link JTSFilterPredicate}, but for geolatte-geom. + * {@code JTSFilterPredicate}, but for geolatte-geom. * * @deprecated Use {@link org.hibernate.spatial.criteria.GeolatteSpatialCriteriaBuilder GeolatteSpatialCriteriaBuilder} instead */ @Deprecated(since = "6.2") public class GeolatteFilterPredicate { - private final Expression geometry; - private final Expression filter; - public GeolatteFilterPredicate( CriteriaBuilder criteriaBuilder, Expression geometry, Expression filter) { - - this.geometry = geometry; - this.filter = filter; } public GeolatteFilterPredicate( diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/predicate/JTSFilterPredicate.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/predicate/JTSFilterPredicate.java deleted file mode 100644 index 5207c1bbdc0e..000000000000 --- a/hibernate-spatial/src/main/java/org/hibernate/spatial/predicate/JTSFilterPredicate.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.hibernate.spatial.predicate; - -import jakarta.persistence.criteria.Expression; -import jakarta.persistence.criteria.Predicate; - -/** - * JPA Spatial Filter {@link Predicate} - * - * @deprecated Use {@link org.hibernate.spatial.criteria.JTSSpatialCriteriaBuilder JTSSpatialCriteriaBuilder} instead - */ -@Deprecated(since = "6.2") -class JTSFilterPredicate { - - private Expression geometry; - private Expression filter; - -//require to completely re-implement - - -} diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/SpatialTestDataProvider.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/SpatialTestDataProvider.java index 9dc44244f5ad..488bea97afdf 100644 --- a/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/SpatialTestDataProvider.java +++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/SpatialTestDataProvider.java @@ -25,7 +25,6 @@ @Deprecated public class SpatialTestDataProvider { - protected final static String JTS = "jts"; protected NativeSQLTemplates templates; protected final PredicateRegexes predicateRegexes; protected final Map hqlOverrides; @@ -55,10 +54,6 @@ public SpatialTestDataProvider() { } } - protected > List entities(Class clazz) { - return entities( clazz, StoreRetrieveData ); - } - protected > List entities(Class clazz, TestSupport.TestDataPurpose purpose) { try { List entities = new ArrayList<>(); diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/HQLTemplate.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/HQLTemplate.java index d99d6b6c57f8..fb9df07435b8 100644 --- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/HQLTemplate.java +++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/HQLTemplate.java @@ -10,10 +10,6 @@ public HQLTemplate(String template) { this.hqlTemplate = template; } - public static HQLTemplate from(String s) { - return new HQLTemplate( s ); - } - public String mkHQLString(Object... params) { return String.format( Locale.ROOT, hqlTemplate, params ); } diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/TestSupportFactories.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/TestSupportFactories.java index 3aa4a400055d..4448e7b7874a 100644 --- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/TestSupportFactories.java +++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/TestSupportFactories.java @@ -93,8 +93,4 @@ private TestSupport instantiate(Class testSupportFactoryC return testSupportFactoryClass.newInstance(); } - private ClassLoader getClassLoader() { - return this.getClass().getClassLoader(); - } - } diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/db2/DB2ExpectationsFactory.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/db2/DB2ExpectationsFactory.java index 652ea41ce81f..b4e8e02a9cce 100644 --- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/db2/DB2ExpectationsFactory.java +++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/db2/DB2ExpectationsFactory.java @@ -1,8 +1,5 @@ package org.hibernate.spatial.testing.dialects.db2; -import java.sql.SQLException; -import java.util.Map; - import org.hibernate.spatial.dialect.db2.DB2GeometryType; import org.hibernate.spatial.testing.AbstractExpectationsFactory; import org.hibernate.spatial.testing.NativeSQLStatement; @@ -26,22 +23,6 @@ public DB2ExpectationsFactory() { super(); } - /** - * Returns the expected extent of all testsuite-suite geometries. - * - * @return map of identifier, extent - * - * @throws SQLException - */ - public Map getExtent() throws SQLException { - throw new UnsupportedOperationException(); - } - - public NativeSQLStatement createNativeExtentStatement() { - return createNativeSQLStatement( - "select max(t.id), db2gse.ST_GetAggrResult(MAX(db2gse.st_BuildMBRAggr(t.geom))) from GeomTest t where db2gse.st_srid(t.geom) = 4326" ); - } - @Override public NativeSQLStatement createNativeTouchesStatement(Geometry geom) { return createNativeSQLStatementAllWKTParams( diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/hana/HANAExpectationsFactory.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/hana/HANAExpectationsFactory.java index e30b694d24ce..c680f5b5c48e 100644 --- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/hana/HANAExpectationsFactory.java +++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/hana/HANAExpectationsFactory.java @@ -278,13 +278,6 @@ public Map getAlphaShape(double radius) throws SQLException { throw new UnsupportedOperationException(); } - private NativeSQLStatement createNativeAlphaShapeStatement(double radius) { - return createNativeSQLStatement( - "select t.id, t.geom.ST_AlphaShape(?).ST_AsEWKB() from GeomTest t where t.geom.ST_GeometryType() in ('ST_Point', 'ST_MultiPoint')", - new Object[] { radius } - ); - } - /** * Returns the expected area of all testsuite-suite geometries. * @@ -296,11 +289,6 @@ public Map getArea() throws SQLException { throw new UnsupportedOperationException(); } - private NativeSQLStatement createNativeAreaStatement() { - return createNativeSQLStatement( - "select t.id, t.geom.ST_Area() from GeomTest t where t.geom.ST_GeometryType() in ('ST_Polygon', 'ST_MultiPolygon')" ); - } - /** * Returns the expected EWKB representation of all testsuite-suite geometries. * @@ -312,10 +300,6 @@ public Map getAsEWKB() throws SQLException { throw new UnsupportedOperationException(); } - private NativeSQLStatement createNativeAsEWKBStatement() { - return createNativeSQLStatement( "select t.id, t.geom.ST_AsEWKB() from GeomTest t" ); - } - /** * Returns the expected EWKT representation of all testsuite-suite geometries. * @@ -327,10 +311,6 @@ public Map getAsEWKT() throws SQLException { throw new UnsupportedOperationException(); } - private NativeSQLStatement createNativeAsEWKTStatement() { - return createNativeSQLStatement( "select t.id, t.geom.ST_AsEWKT() from GeomTest t" ); - } - /** * Returns the expected GeoJSON representation of all testsuite-suite geometries. * @@ -342,10 +322,6 @@ public Map getAsGeoJSON() throws SQLException { throw new UnsupportedOperationException(); } - private NativeSQLStatement createNativeAsGeoJSONStatement() { - return createNativeSQLStatement( "select t.id, t.geom.ST_AsGeoJSON() from GeomTest t" ); - } - /** * Returns the expected SVG representation of all testsuite-suite geometries. * @@ -357,10 +333,6 @@ public Map getAsSVG() throws SQLException { throw new UnsupportedOperationException(); } - private NativeSQLStatement createNativeAsSVGStatement() { - return createNativeSQLStatement( "select t.id, t.geom.ST_AsSVG() from GeomTest t" ); - } - /** * Returns the expected aggregated SVG representation of all testsuite-suite geometries. * @@ -372,10 +344,6 @@ public Map getAsSVGAggr() throws SQLException { throw new UnsupportedOperationException(); } - private NativeSQLStatement createNativeAsSVGAggrStatement() { - return createNativeSQLStatement( "select cast(count(*) as int), ST_AsSVGAggr(t.geom) from GeomTest t" ); - } - /** * Returns the expected WKB representation of all testsuite-suite geometries. * @@ -387,10 +355,6 @@ public Map getAsWKB() throws SQLException { throw new UnsupportedOperationException(); } - private NativeSQLStatement createNativeAsWKBStatement() { - return createNativeSQLStatement( "select t.id, t.geom.ST_AsWKB() from GeomTest t" ); - } - /** * Returns the expected WKT representation of all testsuite-suite geometries. * @@ -402,10 +366,6 @@ public Map getAsWKT() throws SQLException { throw new UnsupportedOperationException(); } - private NativeSQLStatement createNativeAsWKTStatement() { - return createNativeSQLStatement( "select t.id, t.geom.ST_AsWKT() from GeomTest t" ); - } - /** * Returns the expected centroid of all testsuite-suite geometries. * @@ -417,11 +377,6 @@ public Map getCentroid() throws SQLException { throw new UnsupportedOperationException(); } - private NativeSQLStatement createNativeCentroidStatement() { - return createNativeSQLStatement( - "select id, t.geom.ST_Centroid() from GeomTest t where t.geom.ST_GeometryType() = 'ST_Polygon'" ); - } - /** * Returns the expected aggregated convex hull representation of all testsuite-suite geometries. * @@ -433,10 +388,6 @@ public Map getConvexHullAggr() throws SQLException { throw new UnsupportedOperationException(); } - private NativeSQLStatement createNativeConvexHullAggrStatement() { - return createNativeSQLStatement( "select cast(count(*) as int), ST_ConvexHullAggr(t.geom) from GeomTest t" ); - } - /** * Returns the expected number of coordinate dimensions of all testsuite-suite geometries. * @@ -448,10 +399,6 @@ public Map getCoordDim() throws SQLException { throw new UnsupportedOperationException(); } - private NativeSQLStatement createNativeCoordDimStatement() { - return createNativeSQLStatement( "select t.id, t.geom.ST_CoordDim() from GeomTest t" ); - } - /** * Returns the testsuite-suite geometries that are covered by the given geometry. * @@ -463,14 +410,6 @@ public Map getCoveredBy(Geometry geom) throws SQLException { throw new UnsupportedOperationException(); } - private NativeSQLStatement createNativeCoveredByStatement(Geometry geom) { - return createNativeSQLStatementAllWKTParams( - "select t.id, t.geom.ST_CoveredBy(ST_GeomFromText(?, " + getTestSrid() + ")) from GeomTest t where t.geom.ST_CoveredBy(ST_GeomFromText(?, " - + getTestSrid() + ")) = 1 and t.geom.ST_SRID() = " + getTestSrid(), - geom.toText() - ); - } - /** * Returns the testsuite-suite geometries that are cover the given geometry. * @@ -482,14 +421,6 @@ public Map getCovers(Geometry geom) throws SQLException { throw new UnsupportedOperationException(); } - private NativeSQLStatement createNativeCoversStatement(Geometry geom) { - return createNativeSQLStatementAllWKTParams( - "select t.id, t.geom.ST_Covers(ST_GeomFromText(?, " + getTestSrid() + ")) from GeomTest t where t.geom.ST_Covers(ST_GeomFromText(?, " - + getTestSrid() + ")) = 1 and t.geom.ST_SRID() = " + getTestSrid(), - geom.toText() - ); - } - /** * Returns the expected endpoint of all testsuite-suite geometries. * @@ -501,11 +432,6 @@ public Map getEndPoint() throws SQLException { throw new UnsupportedOperationException(); } - private NativeSQLStatement createNativeEndPointStatement() { - return createNativeSQLStatement( - "select id, t.geom.ST_EndPoint() from GeomTest t where t.geom.ST_GeometryType() = 'ST_LineString'" ); - } - /** * Returns the expected aggregated bounding rectangle of all testsuite-suite geometries. * @@ -517,10 +443,6 @@ public Map getEnvelopeAggr() throws SQLException { throw new UnsupportedOperationException(); } - private NativeSQLStatement createNativeEnvelopeAggrStatement() { - return createNativeSQLStatement( "select cast(count(*) as int), ST_EnvelopeAggr(t.geom) from GeomTest t" ); - } - /** * Returns the expected exterior ring of all testsuite-suite geometries. * @@ -532,11 +454,6 @@ public Map getExteriorRing() throws SQLException { throw new UnsupportedOperationException(); } - private NativeSQLStatement createNativeExteriorRingStatement() { - return createNativeSQLStatement( - "select id, t.geom.ST_ExteriorRing() from GeomTest t where t.geom.ST_GeometryType() = 'ST_Polygon'" ); - } - /** * Returns the geometry from an EWKB representation. * @@ -548,10 +465,6 @@ public Map getGeomFromEWKB(byte[] ewkb) throws SQLException { throw new UnsupportedOperationException(); } - private NativeSQLStatement createNativeGeomFromEWKBStatement(byte[] ewkb) { - return createNativeSQLStatement( "select 1, ST_GeomFromEWKB(?) from GeomTest t", new Object[] { ewkb } ); - } - /** * Returns the geometry from an EWKT representation. * @@ -563,10 +476,6 @@ public Map getGeomFromEWKT(String ewkt) throws SQLException { throw new UnsupportedOperationException(); } - private NativeSQLStatement createNativeGeomFromEWKTStatement(String ewkt) { - return createNativeSQLStatement( "select 1, ST_GeomFromEWKT(?) from GeomTest t", new Object[] { ewkt } ); - } - /** * Returns the geometry from a text representation. * @@ -578,10 +487,6 @@ public Map getGeomFromText(String text) throws SQLException { throw new UnsupportedOperationException(); } - private NativeSQLStatement createNativeGeomFromTextStatement(String text) { - return createNativeSQLStatement( "select 1, ST_GeomFromText(?) from GeomTest t", new Object[] { text } ); - } - /** * Returns the geometry from a WKB representation. * @@ -593,10 +498,6 @@ public Map getGeomFromWKB(byte[] wkb) throws SQLException { throw new UnsupportedOperationException(); } - private NativeSQLStatement createNativeGeomFromWKBStatement(byte[] wkb) { - return createNativeSQLStatement( "select 1, ST_GeomFromWKB(?) from GeomTest t", new Object[] { wkb } ); - } - /** * Returns the geometry from a WKT representation. * @@ -608,10 +509,6 @@ public Map getGeomFromWKT(String wkt) throws SQLException { throw new UnsupportedOperationException(); } - private NativeSQLStatement createNativeGeomFromWKTStatement(String wkt) { - return createNativeSQLStatement( "select 1, ST_GeomFromWKT(?) from GeomTest t", new Object[] { wkt } ); - } - /** * Returns the expected nth geometry of all testsuite-suite geometries. * @@ -623,13 +520,6 @@ public Map getGeometryN(int n) throws SQLException { throw new UnsupportedOperationException(); } - private NativeSQLStatement createNativeGeometryNStatement(int n) { - return createNativeSQLStatement( - "select id, t.geom.ST_GeometryN(?) from GeomTest t where t.geom.ST_GeometryType() = 'ST_GeometryCollection'", - new Object[] { n } - ); - } - /** * Returns the expected nth interior ring of all testsuite-suite geometries. * @@ -642,13 +532,6 @@ public Map getInteriorRingN(int n) throws SQLException { } - private NativeSQLStatement createNativeInteriorRingNStatement(int n) { - return createNativeSQLStatement( - "select id, t.geom.ST_InteriorRingN(?) from GeomTest t where t.geom.ST_GeometryType() = 'ST_Polygon'", - new Object[] { n } - ); - } - /** * Returns the expected aggregated intersection of all testsuite-suite geometries. * @@ -660,10 +543,6 @@ public Map getIntersectionAggr() throws SQLException { throw new UnsupportedOperationException(); } - private NativeSQLStatement createNativeIntersectionAggrStatement() { - return createNativeSQLStatement( "select cast(count(*) as int), ST_IntersectionAggr(t.geom) from GeomTest t" ); - } - /** * Returns the testsuite-suite geometries that intersect the given rectangle. * @@ -675,15 +554,6 @@ public Map getIntersectsRect(Point pmin, Point pmax) throws SQ throw new UnsupportedOperationException(); } - private NativeSQLStatement createNativeIntersectsRectStatement(Point pmin, Point pmax) { - return createNativeSQLStatement( - "select t.id, t.geom.ST_IntersectsRect(ST_GeomFromText(?, " + getTestSrid() + "), ST_GeomFromText(?, " + getTestSrid() - + ")) from GeomTest t where t.geom.ST_IntersectsRect(ST_GeomFromText(?, " - + getTestSrid() + "), ST_GeomFromText(?, " + getTestSrid() + ")) = 1 and t.geom.ST_SRID() = " + getTestSrid(), - new Object[] { pmin.toText(), pmax.toText(), pmin.toText(), pmax.toText() } - ); - } - /** * Returns the testsuite-suite geometries that are 3D geometries. * @@ -695,11 +565,6 @@ public Map getIs3D() throws SQLException { throw new UnsupportedOperationException(); } - private NativeSQLStatement createNativeIs3DStatement() { - return createNativeSQLStatement( - "select t.id, t.geom.ST_Is3D() from GeomTest t where t.geom.ST_Is3D() = 1 and t.geom.ST_SRID() = " + getTestSrid() ); - } - /** * Returns the testsuite-suite geometries that are closed. * @@ -711,12 +576,6 @@ public Map getIsClosed() throws SQLException { throw new UnsupportedOperationException(); } - private NativeSQLStatement createNativeIsClosedStatement() { - return createNativeSQLStatement( - "select t.id, t.geom.ST_IsClosed() from GeomTest t where t.geom.ST_GeometryType() in ('ST_LineString', 'ST_MultiLineString') and t.geom.ST_IsClosed() = 1 and t.geom.ST_SRID() = " - + getTestSrid() ); - } - /** * Returns the testsuite-suite geometries that are measured. * @@ -728,12 +587,6 @@ public Map getIsMeasured() throws SQLException { throw new UnsupportedOperationException(); } - private NativeSQLStatement createNativeIsMeasuredStatement() { - return createNativeSQLStatement( - "select t.id, t.geom.ST_IsMeasured() from GeomTest t where t.geom.ST_IsMeasured() = 1 and t.geom.ST_SRID() = " - + getTestSrid() ); - } - /** * Returns the testsuite-suite geometries that are rings. * @@ -745,12 +598,6 @@ public Map getIsRing() throws SQLException { throw new UnsupportedOperationException(); } - private NativeSQLStatement createNativeIsRingStatement() { - return createNativeSQLStatement( - "select t.id, t.geom.ST_IsRing() from GeomTest t where t.geom.ST_GeometryType() in ('ST_LineString') and t.geom.ST_SRID() = " - + getTestSrid() ); - } - /** * Returns the testsuite-suite geometries that are valid. * @@ -762,12 +609,6 @@ public Map getIsValid() throws SQLException { throw new UnsupportedOperationException(); } - private NativeSQLStatement createNativeIsValidStatement() { - return createNativeSQLStatement( - "select t.id, t.geom.ST_IsValid() from GeomTest t where t.geom.ST_IsValid() = 1 and t.geom.ST_SRID() = " - + getTestSrid() ); - } - /** * Returns the length of all testsuite-suite geometries. * @@ -779,12 +620,6 @@ public Map getLength() throws SQLException { throw new UnsupportedOperationException(); } - private NativeSQLStatement createNativeLengthStatement() { - return createNativeSQLStatement( - "select t.id, t.geom.ST_Length() from GeomTest t where t.geom.ST_GeometryType() in ('ST_LineString', 'ST_MultiLineString') and t.geom.ST_SRID() = " - + getTestSrid() ); - } - /** * Returns the measure value of all testsuite-suite geometries. * @@ -797,12 +632,6 @@ public Map getM() throws SQLException { } - private NativeSQLStatement createNativeMStatement() { - return createNativeSQLStatement( - "select t.id, t.geom.ST_M() from GeomTest t where t.geom.ST_GeometryType() in ('ST_Point') and t.geom.ST_SRID() = " - + getTestSrid() ); - } - /** * Returns the maximum measure value of all testsuite-suite geometries. * @@ -815,12 +644,6 @@ public Map getMMax() throws SQLException { } - private NativeSQLStatement createNativeMMaxStatement() { - return createNativeSQLStatement( - "select t.id, t.geom.ST_MMax() from GeomTest t where t.geom.ST_SRID() = " - + getTestSrid() ); - } - /** * Returns the minimum measure value of all testsuite-suite geometries. * @@ -833,12 +656,6 @@ public Map getMMin() throws SQLException { } - private NativeSQLStatement createNativeMMinStatement() { - return createNativeSQLStatement( - "select t.id, t.geom.ST_MMin() from GeomTest t where t.geom.ST_SRID() = " - + getTestSrid() ); - } - /** * Returns the number of geometries of all testsuite-suite geometries. * @@ -851,12 +668,6 @@ public Map getNumGeometries() throws SQLException { } - private NativeSQLStatement createNativeNumGeometriesStatement() { - return createNativeSQLStatement( - "select t.id, t.geom.ST_NumGeometries() from GeomTest t where (t.geom.ST_GeometryType() in ('ST_GeometryCollection')) and t.geom.ST_SRID() = " - + getTestSrid() ); - } - /** * Returns the number of interior rings of all testsuite-suite geometries. * @@ -869,12 +680,6 @@ public Map getNumInteriorRing() throws SQLException { } - private NativeSQLStatement createNativeNumInteriorRingStatement() { - return createNativeSQLStatement( - "select t.id, t.geom.ST_NumInteriorRing() from GeomTest t where t.geom.ST_GeometryType() in ('ST_Polygon') and t.geom.ST_SRID() = " - + getTestSrid() ); - } - /** * Returns the number of interior rings of all testsuite-suite geometries. * @@ -887,12 +692,6 @@ public Map getNumInteriorRings() throws SQLException { } - private NativeSQLStatement createNativeNumInteriorRingsStatement() { - return createNativeSQLStatement( - "select t.id, t.geom.ST_NumInteriorRings() from GeomTest t where t.geom.ST_GeometryType() in ('ST_Polygon') and t.geom.ST_SRID() = " - + getTestSrid() ); - } - /** * Returns the number of points of all testsuite-suite geometries. * @@ -905,12 +704,6 @@ public Map getNumPoints() throws SQLException { } - private NativeSQLStatement createNativeNumPointsStatement() { - return createNativeSQLStatement( - "select t.id, t.geom.ST_NumPoints() from GeomTest t where t.geom.ST_GeometryType() in ('ST_LineString') and t.geom.ST_SRID() = " - + getTestSrid() ); - } - /** * Returns the testsuite-suite geometries that are equal. * @@ -923,14 +716,6 @@ public Map getOrderingEquals(Geometry geom) throws SQLExceptio } - private NativeSQLStatement createNativeOrderingEqualsStatement(Geometry geom) { - return createNativeSQLStatementAllWKTParams( - "select t.id, t.geom.ST_OrderingEquals(ST_GeomFromText(?)) from GeomTest t where t.geom.ST_OrderingEquals(ST_GeomFromText(?)) = 1 and t.geom.ST_SRID() = " - + getTestSrid(), - geom.toText() - ); - } - /** * Returns the perimeter of all testsuite-suite geometries. * @@ -943,12 +728,6 @@ public Map getPerimeter() throws SQLException { } - private NativeSQLStatement createNativePerimeterStatement() { - return createNativeSQLStatement( - "select t.id, t.geom.ST_Perimeter() from GeomTest t where t.geom.ST_GeometryType() in ('ST_Polygon', 'ST_MultiPolygon') and t.geom.ST_SRID() = " - + getTestSrid() ); - } - /** * Returns a point on the surface of all testsuite-suite geometries. * @@ -961,12 +740,6 @@ public Map getPointOnSurface() throws SQLException { } - private NativeSQLStatement createNativePointOnSurfaceStatement() { - return createNativeSQLStatement( - "select t.id, t.geom.ST_PointOnSurface() from GeomTest t where t.geom.ST_GeometryType() in ('ST_Polygon', 'ST_MultiPolygon') and t.geom.ST_SRID() = " - + getTestSrid() ); - } - /** * Returns the nth point of all testsuite-suite geometries. * @@ -979,14 +752,6 @@ public Map getPointN(int n) throws SQLException { } - private NativeSQLStatement createNativePointNStatement(int n) { - return createNativeSQLStatement( - "select t.id, t.geom.ST_PointN(?) from GeomTest t where t.geom.ST_GeometryType() in ('ST_LineString') and t.geom.ST_SRID() = " - + getTestSrid(), - new Object[] { n } - ); - } - /** * Returns a copy of all testsuite-suite geometries with all points snapped to the grid. * @@ -999,12 +764,6 @@ public Map getSnapToGrid() throws SQLException { } - private NativeSQLStatement createNativeSnapToGridStatement() { - return createNativeSQLStatement( - "select t.id, t.geom.ST_SnapToGrid() from GeomTest t where t.geom.ST_SRID() = " - + getTestSrid() ); - } - /** * Returns the expected startpoint of all testsuite-suite geometries. * @@ -1017,11 +776,6 @@ public Map getStartPoint() throws SQLException { } - private NativeSQLStatement createNativeStartPointStatement() { - return createNativeSQLStatement( - "select id, t.geom.ST_StartPoint() from GeomTest t where t.geom.ST_GeometryType() = 'ST_LineString'" ); - } - /** * Returns the expected aggregated union of all testsuite-suite geometries. * @@ -1034,10 +788,6 @@ public Map getUnionAggr() throws SQLException { } - private NativeSQLStatement createNativeUnionAggrStatement() { - return createNativeSQLStatement( "select cast(count(*) as int), ST_UnionAggr(t.geom) from GeomTest t" ); - } - /** * Returns the x coordinate of all testsuite-suite geometries. * @@ -1050,12 +800,6 @@ public Map getX() throws SQLException { } - private NativeSQLStatement createNativeXStatement() { - return createNativeSQLStatement( - "select t.id, t.geom.ST_X() from GeomTest t where t.geom.ST_GeometryType() in ('ST_Point') and t.geom.ST_SRID() = " - + getTestSrid() ); - } - /** * Returns the maximum x coordinate of all testsuite-suite geometries. * @@ -1068,12 +812,6 @@ public Map getXMax() throws SQLException { } - private NativeSQLStatement createNativeXMaxStatement() { - return createNativeSQLStatement( - "select t.id, t.geom.ST_XMax() from GeomTest t where t.geom.ST_SRID() = " - + getTestSrid() ); - } - /** * Returns the minimum x coordinate of all testsuite-suite geometries. * @@ -1086,12 +824,6 @@ public Map getXMin() throws SQLException { } - private NativeSQLStatement createNativeXMinStatement() { - return createNativeSQLStatement( - "select t.id, t.geom.ST_XMin() from GeomTest t where t.geom.ST_SRID() = " - + getTestSrid() ); - } - /** * Returns the y coordinate of all testsuite-suite geometries. * @@ -1104,12 +836,6 @@ public Map getY() throws SQLException { } - private NativeSQLStatement createNativeYStatement() { - return createNativeSQLStatement( - "select t.id, t.geom.ST_Y() from GeomTest t where t.geom.ST_GeometryType() in ('ST_Point') and t.geom.ST_SRID() = " - + getTestSrid() ); - } - /** * Returns the maximum y coordinate of all testsuite-suite geometries. * @@ -1122,12 +848,6 @@ public Map getYMax() throws SQLException { } - private NativeSQLStatement createNativeYMaxStatement() { - return createNativeSQLStatement( - "select t.id, t.geom.ST_YMax() from GeomTest t where t.geom.ST_SRID() = " - + getTestSrid() ); - } - /** * Returns the minimum y coordinate of all testsuite-suite geometries. * @@ -1139,12 +859,6 @@ public Map getYMin() throws SQLException { throw new UnsupportedOperationException(); } - private NativeSQLStatement createNativeYMinStatement() { - return createNativeSQLStatement( - "select t.id, t.geom.ST_YMin() from GeomTest t where t.geom.ST_SRID() = " - + getTestSrid() ); - } - /** * Returns the z coordinate of all testsuite-suite geometries. * @@ -1156,12 +870,6 @@ public Map getZ() throws SQLException { throw new UnsupportedOperationException(); } - private NativeSQLStatement createNativeZStatement() { - return createNativeSQLStatement( - "select t.id, t.geom.ST_Z() from GeomTest t where t.geom.ST_GeometryType() in ('ST_Point') and t.geom.ST_SRID() = " - + getTestSrid() ); - } - /** * Returns the maximum z coordinate of all testsuite-suite geometries. * @@ -1173,12 +881,6 @@ public Map getZMax() throws SQLException { throw new UnsupportedOperationException(); } - private NativeSQLStatement createNativeZMaxStatement() { - return createNativeSQLStatement( - "select t.id, t.geom.ST_ZMax() from GeomTest t where t.geom.ST_SRID() = " - + getTestSrid() ); - } - /** * Returns the minimum z coordinate of all testsuite-suite geometries. * @@ -1190,12 +892,6 @@ public Map getZMin() throws SQLException { throw new UnsupportedOperationException(); } - private NativeSQLStatement createNativeZMinStatement() { - return createNativeSQLStatement( - "select t.id, t.geom.ST_ZMin() from GeomTest t where t.geom.ST_SRID() = " - + getTestSrid() ); - } - /** * Returns the result of a nested function call with a parameter inside the inner function * @@ -1207,14 +903,6 @@ public Map getNestedFunctionInner(Geometry geom) throws SQLEx throw new UnsupportedOperationException(); } - private NativeSQLStatement createNativeNestedFunctionInnerStatement(Geometry geom) { - return createNativeSQLStatementAllWKTParams( - "select t.id, t.geom from GeomTest t where t.geom.ST_WithinDistance(ST_GeomFromText(?, " + getTestSrid() - + ").ST_SRID(0), 1) = 1", - geom.toText() - ); - } - /** * Returns the result of a nested function call with a parameter inside the outer function * @@ -1225,11 +913,4 @@ private NativeSQLStatement createNativeNestedFunctionInnerStatement(Geometry geo public Map getNestedFunctionOuter(Geometry geom) throws SQLException { throw new UnsupportedOperationException(); } - - private NativeSQLStatement createNativeNestedFunctionOuterStatement(Geometry geom) { - return createNativeSQLStatementAllWKTParams( - "select t.id, t.geom from GeomTest t where ST_GeomFromText(?, " + getTestSrid() + ").ST_WithinDistance(geom.ST_SRID(0), 1) = 1", - geom.toText() - ); - } } diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/mariadb/MariaDBExpectationsFactory.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/mariadb/MariaDBExpectationsFactory.java deleted file mode 100644 index dd38abd1d99b..000000000000 --- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/mariadb/MariaDBExpectationsFactory.java +++ /dev/null @@ -1,10 +0,0 @@ -package org.hibernate.spatial.testing.dialects.mariadb; - -import org.hibernate.spatial.testing.dialects.mysql.MySQL8ExpectationsFactory; - -//for now, create the same expectations as for MySQL8 -public class MariaDBExpectationsFactory extends MySQL8ExpectationsFactory { - public MariaDBExpectationsFactory() { - super(); - } -} diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/mysql/MySQL8ExpectationsFactory.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/mysql/MySQL8ExpectationsFactory.java deleted file mode 100644 index d724113add92..000000000000 --- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/mysql/MySQL8ExpectationsFactory.java +++ /dev/null @@ -1,240 +0,0 @@ -package org.hibernate.spatial.testing.dialects.mysql; - - -import org.hibernate.spatial.testing.AbstractExpectationsFactory; -import org.hibernate.spatial.testing.NativeSQLStatement; - -import org.geolatte.geom.ByteBuffer; -import org.geolatte.geom.codec.Wkb; -import org.geolatte.geom.codec.WkbDecoder; -import org.geolatte.geom.jts.JTS; -import org.locationtech.jts.geom.Geometry; -import org.locationtech.jts.geom.Point; - -/** - * @author Karel Maesen, Geovise BVBA - * creation-date: 10/9/13 - */ -public class MySQL8ExpectationsFactory extends AbstractExpectationsFactory { - - - public MySQL8ExpectationsFactory() { - super(); - } - - @Override - public NativeSQLStatement createNativeTouchesStatement(Geometry geom) { - return createNativeSQLStatementAllWKTParams( - "select t.id, ST_Touches(t.geom, ST_GeomFromText(?, 31370)) from geomtest t where ST_Touches(t.geom, ST_geomFromText(?, 31370)) = 1 ", - geom.toText() - ); - } - - @Override - public NativeSQLStatement createNativeOverlapsStatement(Geometry geom) { - return createNativeSQLStatementAllWKTParams( - "select t.id, ST_overlaps(t.geom, ST_GeomFromText(?, 31370)) from geomtest t where ST_Overlaps(t.geom, ST_geomFromText(?, 31370)) = 1 ", - geom.toText() - ); - } - - @Override - public NativeSQLStatement createNativeIntersectsStatement(Geometry geom) { - return createNativeSQLStatementAllWKTParams( - "select t.id, ST_Intersects(t.geom, ST_GeomFromText(?, 31370)) from geomtest t where ST_Intersects(t.geom, ST_GeomFromText(?, 31370)) = 1 ", - geom.toText() - ); - } - - @Override - public NativeSQLStatement createNativeWithinStatement(Geometry geom) { - return createNativeSQLStatementAllWKTParams( - "select t.id, ST_Within(t.geom, ST_GeomFromText(?, 31370)) from geomtest t where ST_Within(t.geom, ST_GeomFromText(?, 31370)) = 1 ", - geom.toText() - ); - } - - @Override - public NativeSQLStatement createNativeEqualsStatement(Geometry geom) { - return createNativeSQLStatementAllWKTParams( - "select t.id, ST_Equals(t.geom, ST_GeomFromText(?, 31370)) from geomtest t where ST_Equals(t.geom, ST_GeomFromText(?, 31370)) = 1 ", - geom.toText() - ); - } - - @Override - public NativeSQLStatement createNativeCrossesStatement(Geometry geom) { - return createNativeSQLStatementAllWKTParams( - "select t.id, ST_Crosses(t.geom, ST_GeomFromText(?, 31370)) from geomtest t where ST_Crosses(t.geom, ST_geomFromText(?, 31370)) = 1 ", - geom.toText() - ); - } - - @Override - public NativeSQLStatement createNativeContainsStatement(Geometry geom) { - return createNativeSQLStatementAllWKTParams( - "select t.id, ST_Contains(t.geom, ST_GeomFromText(?, 31370)) from geomtest t where ST_Contains(t.geom, ST_geomFromText(?, 31370)) = 1 ", - geom.toText() - ); - } - - @Override - public NativeSQLStatement createNativeDisjointStatement(Geometry geom) { - return createNativeSQLStatementAllWKTParams( - "select t.id, ST_Disjoint(t.geom, ST_GeomFromText(?, 31370)) from geomtest t where ST_Disjoint(t.geom, ST_geomFromText(?, 31370)) = 1 ", - geom.toText() - ); - } - - - @Override - public NativeSQLStatement createNativeRelateStatement(Geometry geom, String matrix) { - String sql = "select t.id, ST_Relate(t.geom, ST_GeomFromText(?, 31370), '" + matrix + "' ) from geomtest t where ST_Relate(t.geom, ST_GeomFromText(?, 31370), '" + matrix + "') = 1 "; - return createNativeSQLStatementAllWKTParams( sql, geom.toText() ); - } - - @Override - public NativeSQLStatement createNativeDwithinStatement(Point geom, double distance) { - throw new UnsupportedOperationException(); - } - - - @Override - public NativeSQLStatement createNativeFilterStatement(Geometry geom) { - return createNativeSQLStatementAllWKTParams( - "select t.id, MBRIntersects(t.geom, ST_GeomFromtext(?, 31370)) from geomtest t where MBRIntersects(t.geom, ST_GeomFromtext(?, 31370)) = 1", - geom.toText() - ); - } - - @Override - public NativeSQLStatement createNativeDistanceStatement(Geometry geom) { - return createNativeSQLStatementAllWKTParams( - "select t.id, ST_distance(t.geom, ST_GeomFromText(?, 31370)) from geomtest t ", - geom.toText() - ); - } - - @Override - public NativeSQLStatement createNativeDimensionSQL() { - return createNativeSQLStatement( "select id, ST_dimension(geom) from geomtest" ); - } - - @Override - public NativeSQLStatement createNativeBufferStatement(Double distance) { - return createNativeSQLStatement( - "select t.id, ST_buffer(t.geom,?) from geomtest t ", - new Object[] { distance } - ); - } - - @Override - public NativeSQLStatement createNativeConvexHullStatement(Geometry geom) { - return createNativeSQLStatementAllWKTParams( - "select t.id, ST_convexhull(ST_Union(t.geom, ST_GeomFromText(?, 31370))) from geomtest t", - geom.toText() - ); - } - - @Override - public NativeSQLStatement createNativeIntersectionStatement(Geometry geom) { - return createNativeSQLStatementAllWKTParams( - "select t.id, ST_intersection(t.geom, ST_GeomFromtext(?, 31370)) from geomtest t ", - geom.toText() - ); - } - - @Override - public NativeSQLStatement createNativeDifferenceStatement(Geometry geom) { - return createNativeSQLStatementAllWKTParams( - "select t.id, ST_Difference(t.geom, ST_GeomFromtext(?, 31370)) from geomtest t ", - geom.toText() - ); - } - - @Override - public NativeSQLStatement createNativeSymDifferenceStatement(Geometry geom) { - return createNativeSQLStatementAllWKTParams( - "select t.id, ST_Symdifference(t.geom, ST_GeomFromtext(?, 31370)) from geomtest t ", - geom.toText() - ); - } - - @Override - public NativeSQLStatement createNativeGeomUnionStatement(Geometry geom) { - return createNativeSQLStatementAllWKTParams( - "select t.id, ST_Union(t.geom, ST_GeomFromtext(?, 31370)) from geomtest t", - geom.toText() - ); - } - - @Override - public NativeSQLStatement createNativeAsTextStatement() { - return createNativeSQLStatement( "select id, ST_astext(geom) from geomtest" ); - } - - @Override - public NativeSQLStatement createNativeSridStatement() { - return createNativeSQLStatement( "select id, ST_SRID(geom) from geomtest" ); - } - - @Override - public NativeSQLStatement createNativeIsSimpleStatement() { - return createNativeSQLStatement( "select id, ST_IsSimple(geom) from geomtest" ); - } - - @Override - public NativeSQLStatement createNativeIsEmptyStatement() { - return createNativeSQLStatement( "select id, ST_IsEmpty(geom) from geomtest" ); - } - - @Override - public NativeSQLStatement createNativeIsNotEmptyStatement() { - return createNativeSQLStatement( "select id, not ST_IsEmpty(geom) from geomtest" ); - } - - @Override - public NativeSQLStatement createNativeBoundaryStatement() { - return createNativeSQLStatement( "select id, st_boundary(geom) from geomtest" ); - } - - @Override - public NativeSQLStatement createNativeEnvelopeStatement() { - return createNativeSQLStatement( "select id, ST_Envelope(geom) from geomtest" ); - } - - @Override - public NativeSQLStatement createNativeAsBinaryStatement() { - return createNativeSQLStatement( "select id, ST_AsBinary(geom) from geomtest" ); - } - - @Override - public NativeSQLStatement createNativeGeometryTypeStatement() { - return createNativeSQLStatement( "select id, ST_GeometryType(geom) from geomtest" ); - } - - @Override - public NativeSQLStatement createNativeTransformStatement(int epsg) { - throw new UnsupportedOperationException(); - } - - @Override - public NativeSQLStatement createNativeHavingSRIDStatement(int srid) { - return createNativeSQLStatement( "select t.id, (ST_Srid(t.geom) = " + srid + ") from geomtest t where ST_SRID(t.geom) = " + srid ); - } - - @Override - protected Geometry decode(Object bytes) { - if ( bytes == null ) { - return null; - } - ByteBuffer buffer = ByteBuffer.from( (byte[]) bytes ); - WkbDecoder decoder = Wkb.newDecoder( Wkb.Dialect.MYSQL_WKB ); - return JTS.to( decoder.decode( buffer ) ); - } - - @Override - public int getTestSrid() { - return 31370; - } -} diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/mysql/MySQLExpectationsFactory.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/mysql/MySQLExpectationsFactory.java deleted file mode 100644 index 9f4bb0918e4c..000000000000 --- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/mysql/MySQLExpectationsFactory.java +++ /dev/null @@ -1,235 +0,0 @@ -package org.hibernate.spatial.testing.dialects.mysql; - - -import org.hibernate.spatial.testing.AbstractExpectationsFactory; -import org.hibernate.spatial.testing.NativeSQLStatement; - -import org.geolatte.geom.ByteBuffer; -import org.geolatte.geom.codec.Wkb; -import org.geolatte.geom.codec.WkbDecoder; -import org.geolatte.geom.jts.JTS; -import org.locationtech.jts.geom.Geometry; -import org.locationtech.jts.geom.Point; - - -/** - * This class provides the expected return values to the test classes in this package. - * - * @author Karel Maesen, Geovise BVBA - */ - -public class MySQLExpectationsFactory extends AbstractExpectationsFactory { - - public MySQLExpectationsFactory() { - super(); - } - - @Override - public NativeSQLStatement createNativeTouchesStatement(Geometry geom) { - return createNativeSQLStatementAllWKTParams( - "select t.id, touches(t.geom, GeomFromText(?, 4326)) from geomtest t where touches(t.geom, geomFromText(?, 4326)) = 1 and srid(t.geom) = 4326", - geom.toText() - ); - } - - @Override - public NativeSQLStatement createNativeOverlapsStatement(Geometry geom) { - return createNativeSQLStatementAllWKTParams( - "select t.id, overlaps(t.geom, GeomFromText(?, 4326)) from geomtest t where overlaps(t.geom, geomFromText(?, 4326)) = 1 and srid(t.geom) = 4326", - geom.toText() - ); - } - - @Override - public NativeSQLStatement createNativeRelateStatement(Geometry geom, String matrix) { - String sql = "select t.id, relate(t.geom, GeomFromText(?, 4326), '" + matrix + "' ) from geomtest t where relate(t.geom, GeomFromText(?, 4326), '" + matrix + "') = 1 and srid(t.geom) = 4326"; - return createNativeSQLStatementAllWKTParams( sql, geom.toText() ); - } - - @Override - public NativeSQLStatement createNativeDwithinStatement(Point geom, double distance) { - throw new UnsupportedOperationException(); - } - - @Override - public NativeSQLStatement createNativeIntersectsStatement(Geometry geom) { - return createNativeSQLStatementAllWKTParams( - "select t.id, intersects(t.geom, GeomFromText(?, 4326)) from geomtest t where intersects(t.geom, geomFromText(?, 4326)) = 1 and srid(t.geom) = 4326", - geom.toText() - ); - } - - @Override - public NativeSQLStatement createNativeFilterStatement(Geometry geom) { - return createNativeSQLStatementAllWKTParams( - "select t.id, MBRIntersects(t.geom, GeomFromText(?, 4326)) from geomtest t where MBRIntersects(t.geom, GeomFromText(?, 4326)) = 1 and srid(t.geom) = 4326", - geom.toText() - ); - } - - @Override - public NativeSQLStatement createNativeDistanceStatement(Geometry geom) { - return createNativeSQLStatementAllWKTParams( - "select t.id, distance(t.geom, GeomFromText(?, 4326)) from geomtest t where srid(t.geom) = 4326", - geom.toText() - ); - } - - @Override - public NativeSQLStatement createNativeDimensionSQL() { - return createNativeSQLStatement( "select id, dimension(geom) from geomtest" ); - } - - @Override - public NativeSQLStatement createNativeBufferStatement(Double distance) { - return createNativeSQLStatement( - "select t.id, buffer(t.geom,?) from geomtest t where srid(t.geom) = 4326", - new Object[] { distance } - ); - } - - @Override - public NativeSQLStatement createNativeConvexHullStatement(Geometry geom) { - return createNativeSQLStatementAllWKTParams( - "select t.id, convexhull(geomunion(t.geom, GeomFromText(?, 4326))) from geomtest t where srid(t.geom) = 4326", - geom.toText() - ); - } - - @Override - public NativeSQLStatement createNativeIntersectionStatement(Geometry geom) { - return createNativeSQLStatementAllWKTParams( - "select t.id, intersection(t.geom, GeomFromText(?, 4326)) from geomtest t where srid(t.geom) = 4326", - geom.toText() - ); - } - - @Override - public NativeSQLStatement createNativeDifferenceStatement(Geometry geom) { - return createNativeSQLStatementAllWKTParams( - "select t.id, difference(t.geom, GeomFromText(?, 4326)) from geomtest t where srid(t.geom) = 4326", - geom.toText() - ); - } - - @Override - public NativeSQLStatement createNativeSymDifferenceStatement(Geometry geom) { - return createNativeSQLStatementAllWKTParams( - "select t.id, symdifference(t.geom, GeomFromText(?, 4326)) from geomtest t where srid(t.geom) = 4326", - geom.toText() - ); - } - - @Override - public NativeSQLStatement createNativeGeomUnionStatement(Geometry geom) { - return createNativeSQLStatementAllWKTParams( - "select t.id, geomunion(t.geom, GeomFromText(?, 4326)) from geomtest t where srid(t.geom) = 4326", - geom.toText() - ); - } - - @Override - public NativeSQLStatement createNativeAsTextStatement() { - return createNativeSQLStatement( "select id, astext(geom) from geomtest" ); - } - - @Override - public NativeSQLStatement createNativeSridStatement() { - return createNativeSQLStatement( "select id, srid(geom) from geomtest" ); - } - - @Override - public NativeSQLStatement createNativeIsSimpleStatement() { - return createNativeSQLStatement( "select id, issimple(geom) from geomtest" ); - } - - @Override - public NativeSQLStatement createNativeIsEmptyStatement() { - return createNativeSQLStatement( "select id, isempty(geom) from geomtest" ); - } - - @Override - public NativeSQLStatement createNativeIsNotEmptyStatement() { - return createNativeSQLStatement( "select id, not isempty(geom) from geomtest" ); - } - - @Override - public NativeSQLStatement createNativeBoundaryStatement() { - return createNativeSQLStatement( "select id, boundary(geom) from geomtest" ); - } - - @Override - public NativeSQLStatement createNativeEnvelopeStatement() { - return createNativeSQLStatement( "select id, envelope(geom) from geomtest" ); - } - - @Override - public NativeSQLStatement createNativeAsBinaryStatement() { - return createNativeSQLStatement( "select id, asbinary(geom) from geomtest" ); - } - - @Override - public NativeSQLStatement createNativeGeometryTypeStatement() { - return createNativeSQLStatement( "select id, GeometryType(geom) from geomtest" ); - } - - @Override - public NativeSQLStatement createNativeWithinStatement(Geometry geom) { - return createNativeSQLStatementAllWKTParams( - "select t.id, within(t.geom, GeomFromText(?, 4326)) from geomtest t where within(t.geom, geomFromText(?, 4326)) = 1 and srid(t.geom) = 4326", - geom.toText() - ); - } - - @Override - public NativeSQLStatement createNativeEqualsStatement(Geometry geom) { - return createNativeSQLStatementAllWKTParams( - "select t.id, equals(t.geom, GeomFromText(?, 4326)) from geomtest t where equals(t.geom, geomFromText(?, 4326)) = 1 and srid(t.geom) = 4326", - geom.toText() - ); - } - - @Override - public NativeSQLStatement createNativeCrossesStatement(Geometry geom) { - return createNativeSQLStatementAllWKTParams( - "select t.id, crosses(t.geom, GeomFromText(?, 4326)) from geomtest t where crosses(t.geom, geomFromText(?, 4326)) = 1 and srid(t.geom) = 4326", - geom.toText() - ); - } - - @Override - public NativeSQLStatement createNativeContainsStatement(Geometry geom) { - return createNativeSQLStatementAllWKTParams( - "select t.id, contains(t.geom, GeomFromText(?, 4326)) from geomtest t where contains(t.geom, geomFromText(?, 4326)) = 1 and srid(t.geom) = 4326", - geom.toText() - ); - } - - @Override - public NativeSQLStatement createNativeDisjointStatement(Geometry geom) { - return createNativeSQLStatementAllWKTParams( - "select t.id, disjoint(t.geom, GeomFromText(?, 4326)) from geomtest t where disjoint(t.geom, geomFromText(?, 4326)) = 1 and srid(t.geom) = 4326", - geom.toText() - ); - } - - @Override - public NativeSQLStatement createNativeTransformStatement(int epsg) { - throw new UnsupportedOperationException(); - } - - @Override - public NativeSQLStatement createNativeHavingSRIDStatement(int srid) { - return createNativeSQLStatement( "select t.id, (srid(t.geom) = " + srid + ") from geomtest t where SRID(t.geom) = " + srid ); - } - - @Override - protected Geometry decode(Object bytes) { - if ( bytes == null ) { - return null; - } - ByteBuffer buffer = ByteBuffer.from( (byte[]) bytes ); - WkbDecoder decoder = Wkb.newDecoder( Wkb.Dialect.MYSQL_WKB ); - return JTS.to( decoder.decode( buffer ) ); - } -} diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/oracle/SDOTestDataElement.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/oracle/SDOTestDataElement.java index a3bea25fa4dc..396e35974d1f 100644 --- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/oracle/SDOTestDataElement.java +++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/oracle/SDOTestDataElement.java @@ -12,11 +12,8 @@ */ public class SDOTestDataElement extends TestDataElement { - public final String sdo; - - public SDOTestDataElement(int id, String type, String wkt, String sdo) { + public SDOTestDataElement(int id, String type, String wkt) { super( id, type, wkt ); - this.sdo = sdo; } } diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/oracle/SDOTestDataReader.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/oracle/SDOTestDataReader.java index 8fcc8dce92d0..3a8e9ae78e90 100644 --- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/oracle/SDOTestDataReader.java +++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/oracle/SDOTestDataReader.java @@ -17,7 +17,7 @@ protected void addDataElement(Element element, List testDataEle String type = element.selectSingleNode( "type" ).getText(); String wkt = element.selectSingleNode( "wkt" ).getText(); String sdo = element.selectSingleNode( "sdo" ).getText(); - TestDataElement testDataElement = new SDOTestDataElement( id, type, wkt, sdo ); + TestDataElement testDataElement = new SDOTestDataElement( id, type, wkt); testDataElements.add( testDataElement ); } diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/boot/BasicTestingJdbcServiceImpl.java b/hibernate-testing/src/main/java/org/hibernate/testing/boot/BasicTestingJdbcServiceImpl.java index b30eb6ae37b6..800f88c1044f 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/boot/BasicTestingJdbcServiceImpl.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/boot/BasicTestingJdbcServiceImpl.java @@ -17,7 +17,6 @@ import org.hibernate.engine.jdbc.spi.JdbcServices; import org.hibernate.engine.jdbc.spi.SqlExceptionHelper; import org.hibernate.engine.jdbc.spi.SqlStatementLogger; -import org.hibernate.service.ServiceRegistry; import org.hibernate.service.spi.ServiceRegistryAwareService; import org.hibernate.service.spi.ServiceRegistryImplementor; import org.hibernate.service.spi.Stoppable; @@ -42,7 +41,6 @@ public class BasicTestingJdbcServiceImpl implements JdbcServices, ServiceRegistr private @Nullable SqlStatementLogger sqlStatementLogger; private @Nullable JdbcConnectionAccess jdbcConnectionAccess; - private @Nullable ServiceRegistry serviceRegistry; private @Nonnull ParameterMarkerStrategy parameterMarkerStrategy = ParameterMarkerStrategyStandard.INSTANCE; public void start() { @@ -135,7 +133,6 @@ public ExtractedDatabaseMetaData getExtractedMetaDataSupport() { @Override public void injectServices(@Nonnull ServiceRegistryImplementor serviceRegistry) { - this.serviceRegistry = serviceRegistry; this.parameterMarkerStrategy = serviceRegistry.requireService( ParameterMarkerStrategy.class ); } } diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/jdbc/TimeZoneConnectionProvider.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/jdbc/TimeZoneConnectionProvider.java index 6738c6851cc6..af26ec66c30b 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/jdbc/TimeZoneConnectionProvider.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/jdbc/TimeZoneConnectionProvider.java @@ -17,10 +17,8 @@ public class TimeZoneConnectionProvider extends ConnectionProviderDelegate { private final String defaultTimeZone; - private final String customTimeZone; public TimeZoneConnectionProvider(String customTimeZone) { - this.customTimeZone = customTimeZone; this.defaultTimeZone = System.setProperty( "user.timezone", customTimeZone); TimeZone.setDefault(TimeZone.getTimeZone( customTimeZone )); // Clear the connection pool to avoid issues with drivers that initialize the session TZ to the system TZ diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/JUnitHelper.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/JUnitHelper.java index 0ae4a7d9e104..7ce45c57a9a2 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/JUnitHelper.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/JUnitHelper.java @@ -20,12 +20,6 @@ public static ExtensionContext.Store locateExtensionStore( return context.getStore( create( extensionClass.getName(), scopeObject ) ); } - public static ExtensionContext.Store locateExtensionStore( - ExtensionContext context, - Object... scopeRefs) { - return context.getStore( create( scopeRefs ) ); - } - private JUnitHelper() { } diff --git a/hibernate-vector/src/main/java/org/hibernate/vector/internal/SpannerGoogleSqlApproxDistanceFunction.java b/hibernate-vector/src/main/java/org/hibernate/vector/internal/SpannerGoogleSqlApproxDistanceFunction.java index abadc19c2efe..fd6d8f3be6c1 100644 --- a/hibernate-vector/src/main/java/org/hibernate/vector/internal/SpannerGoogleSqlApproxDistanceFunction.java +++ b/hibernate-vector/src/main/java/org/hibernate/vector/internal/SpannerGoogleSqlApproxDistanceFunction.java @@ -1,7 +1,6 @@ package org.hibernate.vector.internal; import java.util.List; -import java.util.Locale; import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor; @@ -32,10 +31,6 @@ public class SpannerGoogleSqlApproxDistanceFunction extends AbstractSqmSelfRende private final String spannerFunctionName; - public SpannerGoogleSqlApproxDistanceFunction(String functionName, TypeConfiguration typeConfiguration) { - this( functionName, functionName.toUpperCase( Locale.ROOT ), typeConfiguration ); - } - public SpannerGoogleSqlApproxDistanceFunction(String hqlName, String spannerFunctionName, TypeConfiguration typeConfiguration) { super( hqlName, diff --git a/hibernate-vector/src/main/java/org/hibernate/vector/internal/SpannerJdbcLiteralFormatterVector.java b/hibernate-vector/src/main/java/org/hibernate/vector/internal/SpannerJdbcLiteralFormatterVector.java index b5e97150183f..e792e19e8c0d 100644 --- a/hibernate-vector/src/main/java/org/hibernate/vector/internal/SpannerJdbcLiteralFormatterVector.java +++ b/hibernate-vector/src/main/java/org/hibernate/vector/internal/SpannerJdbcLiteralFormatterVector.java @@ -12,10 +12,6 @@ public class SpannerJdbcLiteralFormatterVector extends BasicJdbcLiteralFormat private final JdbcLiteralFormatter elementFormatter; private final String baseType; - public SpannerJdbcLiteralFormatterVector(JavaType javaType, JdbcLiteralFormatter elementFormatter) { - this(javaType, elementFormatter, (javaType.getJavaTypeClass() == Double[].class || javaType.getJavaTypeClass() == double[].class) ? "FLOAT64" : "FLOAT32"); - } - public SpannerJdbcLiteralFormatterVector(JavaType javaType, JdbcLiteralFormatter elementFormatter, String baseType) { super( javaType ); //noinspection unchecked diff --git a/hibernate-vector/src/main/java/org/hibernate/vector/internal/SpannerPostgreSQLJdbcLiteralFormatterVector.java b/hibernate-vector/src/main/java/org/hibernate/vector/internal/SpannerPostgreSQLJdbcLiteralFormatterVector.java index 067636ebf07e..efda2269d3ec 100644 --- a/hibernate-vector/src/main/java/org/hibernate/vector/internal/SpannerPostgreSQLJdbcLiteralFormatterVector.java +++ b/hibernate-vector/src/main/java/org/hibernate/vector/internal/SpannerPostgreSQLJdbcLiteralFormatterVector.java @@ -12,10 +12,6 @@ public class SpannerPostgreSQLJdbcLiteralFormatterVector extends BasicJdbcLit private final JdbcLiteralFormatter elementFormatter; private final String baseType; - public SpannerPostgreSQLJdbcLiteralFormatterVector(JavaType javaType, JdbcLiteralFormatter elementFormatter) { - this(javaType, elementFormatter, (javaType.getJavaTypeClass() == Double[].class || javaType.getJavaTypeClass() == double[].class) ? "float8" : "float4"); - } - public SpannerPostgreSQLJdbcLiteralFormatterVector(JavaType javaType, JdbcLiteralFormatter elementFormatter, String baseType) { super( javaType ); //noinspection unchecked diff --git a/hibernate-vector/src/main/java/org/hibernate/vector/internal/SpannerPostgreSqlApproxDistanceFunction.java b/hibernate-vector/src/main/java/org/hibernate/vector/internal/SpannerPostgreSqlApproxDistanceFunction.java index cea0be874733..c7c3e7c75009 100644 --- a/hibernate-vector/src/main/java/org/hibernate/vector/internal/SpannerPostgreSqlApproxDistanceFunction.java +++ b/hibernate-vector/src/main/java/org/hibernate/vector/internal/SpannerPostgreSqlApproxDistanceFunction.java @@ -1,7 +1,6 @@ package org.hibernate.vector.internal; import java.util.List; -import java.util.Locale; import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor; @@ -32,10 +31,6 @@ public class SpannerPostgreSqlApproxDistanceFunction extends AbstractSqmSelfRend private final String pgFunctionName; - public SpannerPostgreSqlApproxDistanceFunction(String functionName, TypeConfiguration typeConfiguration) { - this( functionName, functionName.toLowerCase( Locale.ROOT ), typeConfiguration ); - } - public SpannerPostgreSqlApproxDistanceFunction(String hqlName, String pgFunctionName, TypeConfiguration typeConfiguration) { super( hqlName, diff --git a/hibernate-vector/src/main/java/org/hibernate/vector/internal/SpannerVectorDdlType.java b/hibernate-vector/src/main/java/org/hibernate/vector/internal/SpannerVectorDdlType.java index e11af699a1c8..93355991f53c 100644 --- a/hibernate-vector/src/main/java/org/hibernate/vector/internal/SpannerVectorDdlType.java +++ b/hibernate-vector/src/main/java/org/hibernate/vector/internal/SpannerVectorDdlType.java @@ -20,10 +20,6 @@ public SpannerVectorDdlType(int sqlTypeCode, String baseType, Dialect dialect) { this.baseType = baseType; } - public String getBaseType() { - return baseType; - } - @Override public String getTypeName(Size size, Type type, DdlTypeRegistry ddlTypeRegistry) { final Integer arrayLength = size != null ? size.getArrayLength() : null; @@ -33,10 +29,6 @@ public String getTypeName(Size size, Type type, DdlTypeRegistry ddlTypeRegistry) return "ARRAY<" + baseType + ">"; } - public String getTypeName(Size size) { - return getTypeName( size, (Type) null, null ); - } - @Override public String getCastTypeName(Size size, SqlExpressible type, DdlTypeRegistry ddlTypeRegistry) { return "ARRAY<" + baseType + ">"; diff --git a/hibernate-vector/src/main/java/org/hibernate/vector/internal/VectorDdlType.java b/hibernate-vector/src/main/java/org/hibernate/vector/internal/VectorDdlType.java index 8c6a0b9087ee..5b6a8977f430 100644 --- a/hibernate-vector/src/main/java/org/hibernate/vector/internal/VectorDdlType.java +++ b/hibernate-vector/src/main/java/org/hibernate/vector/internal/VectorDdlType.java @@ -13,26 +13,10 @@ */ public class VectorDdlType extends DdlTypeImpl { - public VectorDdlType(int sqlTypeCode, boolean isLob, String typeNamePattern, String castTypeNamePattern, String castTypeName, Dialect dialect) { - super( sqlTypeCode, isLob, typeNamePattern, castTypeNamePattern, castTypeName, dialect ); - } - - public VectorDdlType(int sqlTypeCode, String typeNamePattern, String castTypeNamePattern, String castTypeName, Dialect dialect) { - super( sqlTypeCode, typeNamePattern, castTypeNamePattern, castTypeName, dialect ); - } - - public VectorDdlType(int sqlTypeCode, boolean isLob, String typeNamePattern, String castTypeName, Dialect dialect) { - super( sqlTypeCode, isLob, typeNamePattern, castTypeName, dialect ); - } - public VectorDdlType(int sqlTypeCode, String typeNamePattern, String castTypeName, Dialect dialect) { super( sqlTypeCode, typeNamePattern, castTypeName, dialect ); } - public VectorDdlType(int sqlTypeCode, String typeNamePattern, Dialect dialect) { - super( sqlTypeCode, typeNamePattern, dialect ); - } - @Override public String getTypeName(Size size, Type type, DdlTypeRegistry ddlTypeRegistry) { final Integer arrayLength = size.getArrayLength(); diff --git a/hibernate-vector/src/test/java/org/hibernate/vector/VectorTestHelper.java b/hibernate-vector/src/test/java/org/hibernate/vector/VectorTestHelper.java index 2f77429361b0..11704fe55953 100644 --- a/hibernate-vector/src/test/java/org/hibernate/vector/VectorTestHelper.java +++ b/hibernate-vector/src/test/java/org/hibernate/vector/VectorTestHelper.java @@ -217,24 +217,6 @@ public static float[] euclideanNormalize(float[] f) { return result; } - public static float[] euclideanNormalize(double[] f) { - final double norm = euclideanNorm( f ); - final float[] result = new float[f.length]; - for ( int i = 0; i < f.length; i++ ) { - result[i] = (float) (f[i] / norm); - } - return result; - } - - public static float[] euclideanNormalize(byte[] f) { - final double norm = euclideanNorm( f ); - final float[] result = new float[f.length]; - for ( int i = 0; i < f.length; i++ ) { - result[i] = (float) (f[i] / norm); - } - return result; - } - public static double euclideanNormBinary(byte[] f) { double result = 0; for ( byte v : f ) { diff --git a/local-build-plugins/src/main/java/org/hibernate/build/aspects/Aspect.java b/local-build-plugins/src/main/java/org/hibernate/build/aspects/Aspect.java deleted file mode 100644 index 64d0d28f01ab..000000000000 --- a/local-build-plugins/src/main/java/org/hibernate/build/aspects/Aspect.java +++ /dev/null @@ -1,12 +0,0 @@ -package org.hibernate.build.aspects; - -import org.gradle.api.Plugin; -import org.gradle.api.Project; - -/** - * An aspect which can be applied to a Project - * - * @author Steve Ebersole - */ -public interface Aspect extends Plugin { -} diff --git a/local-build-plugins/src/main/java/org/hibernate/build/aspects/ModuleAspect.java b/local-build-plugins/src/main/java/org/hibernate/build/aspects/ModuleAspect.java index 634a11c5a8d9..c665158f01d0 100644 --- a/local-build-plugins/src/main/java/org/hibernate/build/aspects/ModuleAspect.java +++ b/local-build-plugins/src/main/java/org/hibernate/build/aspects/ModuleAspect.java @@ -1,5 +1,6 @@ package org.hibernate.build.aspects; +import org.gradle.api.Plugin; import org.gradle.api.Project; import org.hibernate.build.OrmBuildDetails; @@ -10,7 +11,7 @@ * * @author Steve Ebersole */ -public class ModuleAspect implements Aspect { +public class ModuleAspect implements Plugin { @Override public void apply(Project target) { target.getPluginManager().apply( "base" ); diff --git a/local-build-plugins/src/main/java/org/hibernate/orm/antlr/SplitGrammarDescriptor.java b/local-build-plugins/src/main/java/org/hibernate/orm/antlr/SplitGrammarDescriptor.java index b13c51ebd830..94c96fb4efaf 100644 --- a/local-build-plugins/src/main/java/org/hibernate/orm/antlr/SplitGrammarDescriptor.java +++ b/local-build-plugins/src/main/java/org/hibernate/orm/antlr/SplitGrammarDescriptor.java @@ -11,7 +11,6 @@ */ public class SplitGrammarDescriptor implements Named { private final String name; - private final AntlrSpec antlrSpec; private final Property packageName; private final Property lexerFileName; @@ -23,7 +22,6 @@ public class SplitGrammarDescriptor implements Named { @Inject public SplitGrammarDescriptor(String name, AntlrSpec antlrSpec, ObjectFactory objectFactory) { this.name = name; - this.antlrSpec = antlrSpec; packageName = objectFactory.property( String.class ); lexerFileName = objectFactory.property( String.class ); diff --git a/local-build-plugins/src/main/java/org/hibernate/orm/post/ClassificationGraph.java b/local-build-plugins/src/main/java/org/hibernate/orm/post/ClassificationGraph.java index 1520658f671a..01f02d8f419e 100644 --- a/local-build-plugins/src/main/java/org/hibernate/orm/post/ClassificationGraph.java +++ b/local-build-plugins/src/main/java/org/hibernate/orm/post/ClassificationGraph.java @@ -129,7 +129,7 @@ private static List reconstructPath(String target, Map p private void addEdge(String sourceElementId, String targetElementId, String kind) { outgoing.computeIfAbsent( sourceElementId, ignored -> new ArrayList<>() ) - .add( new Edge( sourceElementId, targetElementId, kind ) ); + .add( new Edge( targetElementId, kind ) ); } private static boolean isRoot(ClassificationModel.Element element) { @@ -146,20 +146,14 @@ private static boolean isRoot(ClassificationModel.Element element) { } static final class Edge { - private final String sourceElementId; private final String targetElementId; private final String kind; - private Edge(String sourceElementId, String targetElementId, String kind) { - this.sourceElementId = sourceElementId; + private Edge(String targetElementId, String kind) { this.targetElementId = targetElementId; this.kind = kind; } - String getSourceElementId() { - return sourceElementId; - } - String getTargetElementId() { return targetElementId; } diff --git a/local-build-plugins/src/main/java/org/hibernate/orm/post/ClassificationReportRenderer.java b/local-build-plugins/src/main/java/org/hibernate/orm/post/ClassificationReportRenderer.java index c9f43a39c9a0..a22838de8c4f 100644 --- a/local-build-plugins/src/main/java/org/hibernate/orm/post/ClassificationReportRenderer.java +++ b/local-build-plugins/src/main/java/org/hibernate/orm/post/ClassificationReportRenderer.java @@ -79,20 +79,14 @@ private static String afterKind(String elementId) { } static final class ProjectionEntry { - private final String elementId; private final String path; private final boolean packageEntry; private ProjectionEntry(String elementId, String path, boolean packageEntry) { - this.elementId = elementId; this.path = path; this.packageEntry = packageEntry; } - String getElementId() { - return elementId; - } - String getPath() { return path; } diff --git a/local-build-plugins/src/main/java/org/hibernate/orm/post/ValidationResult.java b/local-build-plugins/src/main/java/org/hibernate/orm/post/ValidationResult.java index 5cbd5e29c0ca..44c328051458 100644 --- a/local-build-plugins/src/main/java/org/hibernate/orm/post/ValidationResult.java +++ b/local-build-plugins/src/main/java/org/hibernate/orm/post/ValidationResult.java @@ -36,11 +36,6 @@ static ValidationResult complete( return new ValidationResult( diagnostics, configurationErrors ); } - static ValidationResult focused(List diagnostics) { - diagnostics.sort( ValidationDiagnostic.ORDERING ); - return new ValidationResult( diagnostics, Collections.emptyList() ); - } - private ValidationResult(List diagnostics, List configurationErrors) { this.diagnostics = Collections.unmodifiableList( new ArrayList<>( diagnostics ) ); this.configurationErrors = Collections.unmodifiableList( new ArrayList<>( configurationErrors ) ); diff --git a/local-build-plugins/src/main/java/org/hibernate/orm/properties/SettingsDocSection.java b/local-build-plugins/src/main/java/org/hibernate/orm/properties/SettingsDocSection.java index a67d45a4ebef..74edd9597679 100644 --- a/local-build-plugins/src/main/java/org/hibernate/orm/properties/SettingsDocSection.java +++ b/local-build-plugins/src/main/java/org/hibernate/orm/properties/SettingsDocSection.java @@ -25,13 +25,6 @@ public SettingsDocSection(String name) { this.name = name; } - private SettingsDocSection( - String name, - Integer explicitPosition) { - this.name = name; - this.explicitPosition = explicitPosition; - } - @Internal public String getName() { return name; diff --git a/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/test/utils/FileUtil.java b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/test/utils/FileUtil.java index 28d576a91b24..bef11aa8c8f0 100644 --- a/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/test/utils/FileUtil.java +++ b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/test/utils/FileUtil.java @@ -3,11 +3,7 @@ import java.io.BufferedReader; import java.io.File; import java.io.FileReader; -import java.io.FileWriter; import java.io.IOException; -import java.io.PrintWriter; - -import static org.junit.jupiter.api.Assertions.assertTrue; public class FileUtil { @@ -28,20 +24,4 @@ static public String findFirstString(String string, File file) { return str; } - static public void generateNoopComparator(File sourceFolder) throws IOException { - File file = new File(sourceFolder.getAbsolutePath() + "/comparator/NoopComparator.java"); - assertTrue(file.getParentFile().mkdirs()); - FileWriter fileWriter = new FileWriter(file); - PrintWriter pw = new PrintWriter(fileWriter); - pw.println("package comparator; "); - pw.println("import java.util.Comparator; "); - pw.println("public class NoopComparator implements Comparator {"); - pw.println(" public int compare(Object o1, Object o2) { "); - pw.println(" return 0; "); - pw.println(" } "); - pw.println("} "); - pw.flush(); - pw.close(); - } - } diff --git a/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/test/utils/JdbcUtil.java b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/test/utils/JdbcUtil.java index 33178ef510ab..0657f89a544c 100644 --- a/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/test/utils/JdbcUtil.java +++ b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/test/utils/JdbcUtil.java @@ -5,7 +5,6 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.sql.Connection; -import java.sql.DatabaseMetaData; import java.sql.DriverManager; import java.sql.SQLException; import java.sql.Statement; @@ -90,35 +89,6 @@ public static void executeSql(Object test, String[] sqls) { } } - public static String toIdentifier(Object test, String string) { - Connection connection = CONNECTION_TABLE.get(test); - try { - DatabaseMetaData databaseMetaData = connection.getMetaData(); - if (databaseMetaData.storesLowerCaseIdentifiers()) { - return string.toLowerCase(); - } else if (databaseMetaData.storesUpperCaseIdentifiers()) { - return string.toUpperCase(); - } else { - return string; - } - } catch (SQLException e) { - throw new RuntimeException(e); - } - } - - public static boolean isDatabaseOnline(Object test) { - boolean result = false; - try { - Connection connection = createJdbcConnection(test); - result = connection.isValid(1); - connection.commit(); - connection.close(); - } catch (SQLException e) { - // this will happen when the connection cannot be created - } - return result; - } - /** * Establish a connection and execute create.sql. * @@ -129,15 +99,6 @@ public static void createDatabase(Object test) { executeSql(test, getSqls(test, "create.sql")); } - /** - * Using an established connection, execute data.sql. - * - * @param test residing in the package of data.sql resource. - */ - public static void populateDatabase(Object test) { - executeSql(test, getSqls(test, "data.sql")); - } - /** * Using an established connection, execute drop.sql. * diff --git a/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/test/utils/ResourceUtil.java b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/test/utils/ResourceUtil.java index 5002fc3a1f09..bb40fb148cd5 100644 --- a/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/test/utils/ResourceUtil.java +++ b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/test/utils/ResourceUtil.java @@ -3,7 +3,6 @@ import java.io.File; import java.io.IOException; import java.io.InputStream; -import java.net.URL; import java.nio.file.Files; public class ResourceUtil { @@ -34,14 +33,6 @@ public static InputStream resolveResourceLocation(Class testClass, String res return result; } - public static File resolveResourceFile(Class testClass, String resourceName) { - String path = testClass.getPackage().getName().replace('.', File.separatorChar); - URL resourceUrl = testClass.getClassLoader().getResource(path + File.separatorChar - + resourceName); - assert resourceUrl != null; - return new File(resourceUrl.getFile()); - } - private static String getRelativeResourcesRoot(Class testClass) { return '/' + testClass.getPackage().getName().replace('.', '/') + '/'; } diff --git a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/DatabaseExporter.java b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/DatabaseExporter.java index 45ff8574aa25..79761f4b5f7d 100644 --- a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/DatabaseExporter.java +++ b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/DatabaseExporter.java @@ -17,7 +17,7 @@ * {@link org.hibernate.tool.schema.spi.SchemaManagementTool} and friends. */ @Deprecated -class DatabaseExporter implements Exporter { +class DatabaseExporter { private final ConnectionHelper connectionHelper; private final SqlExceptionHelper sqlExceptionHelper; @@ -34,12 +34,10 @@ public DatabaseExporter(ConnectionHelper connectionHelper, SqlExceptionHelper sq statement = connection.createStatement(); } - @Override public boolean acceptsImportScripts() { return true; } - @Override public void export(String string) throws Exception { statement.executeUpdate( string ); try { @@ -53,7 +51,6 @@ public void export(String string) throws Exception { } } - @Override public void release() throws Exception { try { statement.close(); diff --git a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/Exporter.java b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/Exporter.java deleted file mode 100644 index ae1e6e4034e2..000000000000 --- a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/Exporter.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.hibernate.tool.hbm2ddl; - -/** -* @author Steve Ebersole - * - * @deprecated Everything in this package has been replaced with - * {@link org.hibernate.tool.schema.spi.SchemaManagementTool} and friends. -*/ -@Deprecated -interface Exporter { - public boolean acceptsImportScripts(); - public void export(String string) throws Exception; - public void release() throws Exception; -} diff --git a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/FileExporter.java b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/FileExporter.java index c6a877e3f873..6ca179a7ea72 100644 --- a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/FileExporter.java +++ b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/FileExporter.java @@ -10,24 +10,21 @@ * {@link org.hibernate.tool.schema.spi.SchemaManagementTool} and friends. */ @Deprecated -class FileExporter implements Exporter { +class FileExporter { private final FileWriter writer; public FileExporter(String outputFile) throws IOException { this.writer = new FileWriter( outputFile ); } - @Override public boolean acceptsImportScripts() { return false; } - @Override public void export(String string) throws Exception { writer.write( string + '\n'); } - @Override public void release() throws Exception { writer.flush(); writer.close(); diff --git a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/ScriptExporter.java b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/ScriptExporter.java index bdb7d1918d79..e58e97f33b6f 100644 --- a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/ScriptExporter.java +++ b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/ScriptExporter.java @@ -9,19 +9,16 @@ * {@link org.hibernate.tool.schema.spi.SchemaManagementTool} and friends. */ @Deprecated -class ScriptExporter implements Exporter { - @Override +class ScriptExporter { public boolean acceptsImportScripts() { return false; } - @Override @AllowSysOut public void export(String string) throws Exception { System.out.println( string ); } - @Override public void release() throws Exception { } } diff --git a/tooling/hibernate-dialect-provider/src/providerFixture/java/org/example/orm/dialect/ExampleDirectSqlAstTranslatorFactory.java b/tooling/hibernate-dialect-provider/src/providerFixture/java/org/example/orm/dialect/ExampleDirectSqlAstTranslatorFactory.java deleted file mode 100644 index b82aec4a1bde..000000000000 --- a/tooling/hibernate-dialect-provider/src/providerFixture/java/org/example/orm/dialect/ExampleDirectSqlAstTranslatorFactory.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.example.orm.dialect; - -import org.hibernate.dialect.sql.ast.spi.SqlAstTranslationRequest; -import org.hibernate.dialect.sql.ast.spi.SqlAstTranslatorFactory; -import org.hibernate.sql.ast.spi.Statement; -import org.hibernate.sql.ast.spi.translation.SqlAstTranslator; -import org.hibernate.sql.exec.spi.JdbcOperation; - -/// Example factory which creates direct, non-SQL translator implementations. -/// -/// @since 8.0 -/// @author Steve Ebersole -public final class ExampleDirectSqlAstTranslatorFactory implements SqlAstTranslatorFactory { - @Override - public SqlAstTranslator buildTranslator( - SqlAstTranslationRequest request) { - return new ExampleDirectSqlAstTranslator<>( request ); - } -} diff --git a/tooling/hibernate-dialect-provider/src/providerFixture/java/org/example/orm/dialect/ExampleMutationOperationConsumer.java b/tooling/hibernate-dialect-provider/src/providerFixture/java/org/example/orm/dialect/ExampleMutationOperationConsumer.java deleted file mode 100644 index 33a14c0b2870..000000000000 --- a/tooling/hibernate-dialect-provider/src/providerFixture/java/org/example/orm/dialect/ExampleMutationOperationConsumer.java +++ /dev/null @@ -1,26 +0,0 @@ -package org.example.orm.dialect; - -import org.hibernate.sql.ast.spi.model.OptionalTableUpdate; -import org.hibernate.sql.spi.mutation.MutationTarget; -import org.hibernate.sql.spi.mutation.jdbc.DeleteOrUpsertOperation; -import org.hibernate.sql.spi.mutation.jdbc.UpsertOperation; - -/// Standalone compatibility use of the public composite-operation accessors -/// consumed by integrations such as Hibernate Reactive. -/// -/// @since 8.0 -/// @author Steve Ebersole -public final class ExampleMutationOperationConsumer { - private ExampleMutationOperationConsumer() { - } - - /// Inspect both supported constituents and return the composite target. - public static MutationTarget inspect(DeleteOrUpsertOperation operation) { - final UpsertOperation upsertOperation = operation.getUpsertOperation(); - final OptionalTableUpdate optionalTableUpdate = operation.getOptionalTableUpdate(); - if ( optionalTableUpdate.getMutationTarget() != upsertOperation.getMutationTarget() ) { - throw new IllegalArgumentException( "Composite operation targets do not match" ); - } - return operation.getMutationTarget(); - } -} diff --git a/tooling/hibernate-dialect-provider/src/providerFixture/java/org/example/orm/dialect/ExampleSqlAstTranslator.java b/tooling/hibernate-dialect-provider/src/providerFixture/java/org/example/orm/dialect/ExampleSqlAstTranslator.java index d584639446f2..60a61059c9ef 100644 --- a/tooling/hibernate-dialect-provider/src/providerFixture/java/org/example/orm/dialect/ExampleSqlAstTranslator.java +++ b/tooling/hibernate-dialect-provider/src/providerFixture/java/org/example/orm/dialect/ExampleSqlAstTranslator.java @@ -25,16 +25,12 @@ import org.hibernate.dialect.sql.ast.spi.TableReferenceAliasContext; import org.hibernate.dialect.sql.ast.spi.ValuesTableRenderingStyle; import org.hibernate.query.SortDirection; -import org.hibernate.metamodel.mapping.EntityVersionMapping; import org.hibernate.dialect.sql.ast.spi.AbstractSqlAstTranslator; import org.hibernate.sql.ast.spi.Statement; import org.hibernate.dialect.sql.ast.spi.SqlAstTranslationRequest; import org.hibernate.sql.ast.spi.query.delete.DeleteStatement; import org.hibernate.sql.ast.spi.query.expression.ColumnReference; import org.hibernate.sql.ast.spi.query.expression.Expression; -import org.hibernate.sql.ast.spi.query.from.FromClause; -import org.hibernate.sql.ast.spi.query.insert.InsertSelectStatement; -import org.hibernate.sql.ast.spi.query.insert.Values; import org.hibernate.sql.ast.spi.query.select.QueryPart; import org.hibernate.sql.ast.spi.query.select.SelectClause; import org.hibernate.sql.ast.spi.query.select.SelectStatement; @@ -53,14 +49,6 @@ public ExampleSqlAstTranslator(SqlAstTranslationRequest super( request ); } - public EntityVersionMapping versionSeedMapping(Expression expression) { - return getVersionSeedMapping( expression ); - } - - public boolean recognizesParameterInterpretation(Expression expression) { - return isParameterInterpretation( expression ); - } - @Override @SPI({ SPI.Role.IMPLEMENT, SPI.Role.SUPPLY }) protected SelectItemReferenceStrategy getGroupBySelectItemReferenceStrategy() { @@ -235,28 +223,4 @@ protected void renderSetAssignment(Assignment assignment) { protected void renderAssignmentColumn(ColumnReference column) { super.renderAssignmentColumn( column ); } - - private void renderStandardMutationPlans( - DeleteStatement deleteStatement, - UpdateStatement updateStatement, - InsertSelectStatement insertStatement, - List valuesList) { - renderDeleteStatementDirect( deleteStatement ); - renderDeleteStatementWithJoinEmulation( deleteStatement, null ); - renderUpdateStatementDirect( updateStatement ); - renderUpdateStatementAsScalarSubquery( updateStatement ); - renderUpdateStatementAsMerge( updateStatement ); - renderUpdateStatementAsInlineView( updateStatement ); - renderUpdateStatementAsTupleSet( updateStatement ); - renderInsertStatementAsMerge( insertStatement ); - renderValuesListAsSelectUnion( valuesList ); - } - - private boolean renderFromClauseSpacesIfPresent(FromClause fromClause) { - if ( hasFrom( fromClause ) ) { - renderFromClauseSpaces( fromClause ); - return true; - } - return false; - } } diff --git a/tooling/hibernate-dialect-provider/src/providerFixture/java/org/example/orm/dialect/ExampleSqmTranslator.java b/tooling/hibernate-dialect-provider/src/providerFixture/java/org/example/orm/dialect/ExampleSqmTranslator.java deleted file mode 100644 index 1c47c0d48f5c..000000000000 --- a/tooling/hibernate-dialect-provider/src/providerFixture/java/org/example/orm/dialect/ExampleSqmTranslator.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.example.orm.dialect; - -import org.hibernate.query.sqm.sql.spi.BaseSqmToSqlAstConverter; -import org.hibernate.query.sqm.sql.spi.SqmTranslationRequest; -import org.hibernate.sql.ast.spi.Statement; - -/// Provider-defined SQM translator used to verify the supported extension -/// boundary exposed by [SqmTranslationRequest] and -/// [BaseSqmToSqlAstConverter]. -/// -/// @param the produced SQL AST statement type -/// -/// @author Steve Ebersole -public final class ExampleSqmTranslator extends BaseSqmToSqlAstConverter { - public ExampleSqmTranslator(SqmTranslationRequest request) { - super( request ); - } -} diff --git a/tooling/hibernate-dialect-provider/src/providerFixture/java/org/example/orm/dialect/ExampleSqmTranslatorFactory.java b/tooling/hibernate-dialect-provider/src/providerFixture/java/org/example/orm/dialect/ExampleSqmTranslatorFactory.java deleted file mode 100644 index caa78ac9aa93..000000000000 --- a/tooling/hibernate-dialect-provider/src/providerFixture/java/org/example/orm/dialect/ExampleSqmTranslatorFactory.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.example.orm.dialect; - -import org.hibernate.query.sqm.sql.spi.SqmTranslationRequest; -import org.hibernate.query.sqm.sql.spi.SqmTranslator; -import org.hibernate.query.sqm.sql.spi.SqmTranslatorFactory; -import org.hibernate.sql.ast.spi.query.MutationStatement; -import org.hibernate.sql.ast.spi.query.select.SelectStatement; - -/// Provider implementation of the global SQM translator integration contract. -/// -/// This factory deliberately consumes only supported request contracts and -/// does not depend on Hibernate's internal parameter-correlation model. -/// -/// @author Steve Ebersole -public final class ExampleSqmTranslatorFactory implements SqmTranslatorFactory { - @Override - public SqmTranslator createSelectTranslator(SqmTranslationRequest.Select request) { - return new ExampleSqmTranslator<>( request ); - } - - @Override - public SqmTranslator createMutationTranslator(SqmTranslationRequest.Mutation request) { - return new ExampleSqmTranslator<>( request ); - } -} diff --git a/tooling/hibernate-maven-plugin/src/test/java/org/hibernate/orm/tooling/maven/reveng/AbstractGenerationMojoTest.java b/tooling/hibernate-maven-plugin/src/test/java/org/hibernate/orm/tooling/maven/reveng/AbstractGenerationMojoTest.java index d7db04892450..9abd966e6a8b 100644 --- a/tooling/hibernate-maven-plugin/src/test/java/org/hibernate/orm/tooling/maven/reveng/AbstractGenerationMojoTest.java +++ b/tooling/hibernate-maven-plugin/src/test/java/org/hibernate/orm/tooling/maven/reveng/AbstractGenerationMojoTest.java @@ -23,11 +23,8 @@ public class AbstractGenerationMojoTest { * Concrete subclass for testing the abstract class. */ static class TestMojo extends AbstractGenerationMojo { - MetadataDescriptor lastDescriptor; - @Override protected void executeExporter(MetadataDescriptor metadataDescriptor) throws MojoFailureException { - lastDescriptor = metadataDescriptor; } } diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/ide/completion/HQLCompletionProposal.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/ide/completion/HQLCompletionProposal.java index 2a7f4c1d04e2..199b03c41661 100644 --- a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/ide/completion/HQLCompletionProposal.java +++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/ide/completion/HQLCompletionProposal.java @@ -6,8 +6,6 @@ public class HQLCompletionProposal { - static final char[] NO_CHAR = new char[0]; - public static final int ENTITY_NAME = 1; public static final int PROPERTY = 2; public static final int KEYWORD = 3; diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/common/AbstractExporter.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/common/AbstractExporter.java index 9169d8bb5eaf..04da61104ba0 100644 --- a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/common/AbstractExporter.java +++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/common/AbstractExporter.java @@ -3,7 +3,6 @@ import org.hibernate.boot.Metadata; import org.hibernate.boot.spi.MetadataImplementor; import org.hibernate.internal.util.ReflectHelper; -import org.hibernate.internal.util.StringHelper; import org.hibernate.tool.reveng.api.export.ArtifactCollector; import org.hibernate.tool.reveng.api.export.Exporter; import org.hibernate.tool.reveng.api.export.ExporterConstants; @@ -197,21 +196,10 @@ protected TemplateHelper getTemplateHelper() { return vh; } - protected File getFileForClassName(File baseDir, String className, String extension) { - String filename = StringHelper.unqualify(className) + extension; - String packagename = StringHelper.qualifier(className); - return new File(getDirForPackage(baseDir, packagename), filename); - } - protected Metadata buildMetadata() { return getMetadataDescriptor().createMetadata(); } - private File getDirForPackage(File baseDir, String packageName) { - String p = packageName == null ? "" : packageName; - return new File( baseDir, p.replace('.', File.separatorChar) ); - } - private String toString(Object[] a) { if (a == null) return "null"; diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/common/ConfigurationNavigator.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/common/ConfigurationNavigator.java index 8c19c2f0269f..c4f468d12fd9 100644 --- a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/common/ConfigurationNavigator.java +++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/common/ConfigurationNavigator.java @@ -2,7 +2,6 @@ import org.hibernate.mapping.Collection; import org.hibernate.mapping.Component; -import org.hibernate.mapping.PersistentClass; import org.hibernate.mapping.Property; import org.hibernate.tool.reveng.internal.export.java.Cfg2JavaTool; import org.hibernate.tool.reveng.internal.export.java.ComponentPOJOClass; @@ -19,11 +18,6 @@ public class ConfigurationNavigator { private static final Logger log = Logger.getLogger(ConfigurationNavigator.class); - public static void collectComponents(Map components, PersistentClass clazz) { - Iterator iter = new Cfg2JavaTool().getPOJOClass(clazz).getAllPropertiesIterator(); - collectComponents( components, iter ); - } - public static void collectComponents(Map components, POJOClass clazz) { Iterator iter = clazz.getAllPropertiesIterator(); collectComponents( components, iter ); diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/common/ExporterSettings.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/common/ExporterSettings.java index a9772d29a030..8b79a0a98883 100644 --- a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/common/ExporterSettings.java +++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/common/ExporterSettings.java @@ -4,26 +4,6 @@ public interface ExporterSettings { public final String PREFIX_KEY = "hibernatetool."; - /** - * if true exporters are allowed to generate EJB3 constructs - */ - public final String EJB3 = PREFIX_KEY + "ejb3"; - - /** - * if true then exporters are allowed to generate JDK 5 constructs - */ - public final String JDK5 = PREFIX_KEY + "jdk5"; - - /** - * the (root) output directory for an exporter - */ - public final String OUTPUT_DIRECTORY = PREFIX_KEY + "output_directory"; - - /** - * the (root) output directory for an exporter - */ - public final String TEMPLATE_PATH = PREFIX_KEY + "template_path"; - } diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/doc/DocFileManager.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/doc/DocFileManager.java index 353797290b36..96590656d08d 100644 --- a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/doc/DocFileManager.java +++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/doc/DocFileManager.java @@ -121,10 +121,6 @@ public class DocFileManager { */ private final Map packageEntityListDocFile = new HashMap(); - public DocFolder getRootDocFolder() { - return rootDocFolder; - } - /** * Constructor. * @@ -215,16 +211,6 @@ public DocFileManager(DocHelper docHelper, File pRootFolder) { } } - /** - * Returns the DocFolder for the helper files. - * - * @return the value. - */ - public DocFolder getAssetsDocFolder() { - - return assetsDocFolder; - } - /** * Returns the DocFile for the CSS definitions. * diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/doc/DocHelper.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/doc/DocHelper.java index 72877659e7b1..3e91690095c1 100644 --- a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/doc/DocHelper.java +++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/doc/DocHelper.java @@ -15,7 +15,6 @@ import org.hibernate.tool.reveng.internal.export.java.ComponentPOJOClass; import org.hibernate.tool.reveng.internal.export.java.POJOClass; import org.hibernate.tool.reveng.internal.core.binder.TypeUtils; -import org.hibernate.type.Type; import java.util.ArrayList; import java.util.Collections; @@ -202,14 +201,6 @@ public Map> getTablesBySchema() { return tablesBySchema; } - /** - * return a Map which has List of POJOClass as value keyed by package name - * as String. - */ - public Map> getClassesByPackage() { - return classesByPackage; - } - /** * Returns a list with all the schemas. * @@ -303,23 +294,6 @@ public String getQualifiedTableName(Table table) { return qualifiedSchemaName + '.' + table.getName(); } - public String getPropertyType(Property p) { - Value v = p.getValue(); - Type t; - String propertyString = "N/D"; - try { - t = v.getType(); - propertyString = t.getReturnedClass().getName(); - - } - catch (Exception ex) { - // TODO we should try to get the value from value here - // Eat Exception?? - } - - return propertyString; - } - /** * Returns the qualified name of a column. * @@ -455,13 +429,6 @@ public List getInheritanceHierarchy(POJOClass pc) { } } - public List getOrderedProperties(POJOClass pojoClass) { - List orderedProperties = getAllProperties(pojoClass); - orderedProperties.sort(PROPERTY_COMPARATOR); - - return orderedProperties; - } - public List getSimpleProperties(POJOClass pojoClass) { List properties = getAllProperties(pojoClass); if (pojoClass.hasIdentifierProperty()) diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/hbm/Cfg2HbmTool.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/hbm/Cfg2HbmTool.java index 84511f7aefdd..1bfdcd6e9d42 100644 --- a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/hbm/Cfg2HbmTool.java +++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/hbm/Cfg2HbmTool.java @@ -195,10 +195,6 @@ public Set getFilteredIdentifierGeneratorKeySet(Property property, Properties return getFilteredIdentifierGeneratorProperties(this.getIdentifierGeneratorProperties(property), props).keySet(); } - public boolean isOneToMany(Property property) { - return isOneToMany(property.getValue()); - } - public boolean isOneToMany(Value value) { if(value instanceof Collection) { return ( (Collection)value ).isOneToMany(); @@ -207,10 +203,6 @@ public boolean isOneToMany(Value value) { return value instanceof OneToMany; } - public boolean isManyToMany(Property property) { - return isManyToMany(property.getValue()); - } - public boolean isManyToMany(Value value) { return (value instanceof Collection && ((Collection)value).getElement() instanceof ManyToOne); @@ -221,10 +213,6 @@ public boolean isCollection(Property property) { return property.getValue() instanceof Collection; } - public boolean isOneToManyCollection(Property property) { - return isCollection(property) && ((Collection)property.getValue()).isOneToMany(); - } - public boolean isSimpleValue(Property property) { return (property.getValue() instanceof SimpleValue); } @@ -233,10 +221,6 @@ public boolean isManyToOne(Property property) { return isManyToOne(property.getValue()); } - public boolean isManyToAny(Property property) { - return isManyToAny(property.getValue()); - } - public boolean isManyToAny(Value value) { return (value instanceof Collection && ((Collection)value).getElement() instanceof Any); @@ -250,20 +234,6 @@ public boolean isOneToOne(Property property) { return (property.getValue() instanceof OneToOne); } - public boolean isTemporalValue(Property property) { - if(property.getValue() instanceof SimpleValue) { - String typeName = ((SimpleValue)property.getValue()).getTypeName(); - if("date".equals(typeName) || "java.sql.Date".equals(typeName)) { - return true; - } - else if ("timestamp".equals(typeName) || "java.sql.Timestamp".equals(typeName)) { - return true; - } - else return "time".equals(typeName) || "java.sql.Time".equals(typeName); - } - return false; - } - public boolean isNamedQueries(Metadata md) { final ArrayList> list = new ArrayList<>(); Consumer> consumer = list::add; diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/java/BasicPOJOClass.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/java/BasicPOJOClass.java index 9ebdccd1d26d..47970e33f578 100644 --- a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/java/BasicPOJOClass.java +++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/java/BasicPOJOClass.java @@ -15,7 +15,6 @@ import org.hibernate.mapping.Set; import org.hibernate.mapping.SimpleValue; import org.hibernate.tool.reveng.internal.export.common.DefaultValueVisitor; -import org.hibernate.tool.reveng.internal.util.NameConverter; import java.util.ArrayList; import java.util.HashMap; @@ -574,13 +573,6 @@ public String getPropertyName(Property p) { } - // get the "opposite" collectionnae for a property. Currently a "hack" that just uses the same naming algorithm as in reveng, will fail on more general models! - public String getCollectionNameFor(Property property) { - String str = getPropertyName(property); - return NameConverter.simplePluralize(str); - } - - /** * foo -> Foo * FOo -> FOo diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/java/ComponentPOJOClass.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/java/ComponentPOJOClass.java index de772a02294e..51466f080e75 100644 --- a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/java/ComponentPOJOClass.java +++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/java/ComponentPOJOClass.java @@ -82,10 +82,6 @@ public boolean hasIdentifierProperty() { return false; } - public boolean needsAnnTableUniqueConstraints() { - return false; - } - public String generateBasicAnnotation(Property property) { return ""; } diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/java/MetaAttributeConstants.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/java/MetaAttributeConstants.java index 08cc748dfb38..9b94290a4b78 100644 --- a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/java/MetaAttributeConstants.java +++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/java/MetaAttributeConstants.java @@ -9,5 +9,4 @@ public interface MetaAttributeConstants { static final String CLASS_DESCRIPTION = "class-description"; static final String IMPLEMENTS = "implements"; static final String EXTENDS = "extends"; - static final String GEN_PROPERTY = "gen-property"; // in templates. } diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/util/ValueUtil.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/util/ValueUtil.java index 5bbb634f3368..c02e394e1ef3 100644 --- a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/util/ValueUtil.java +++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/util/ValueUtil.java @@ -1,6 +1,5 @@ package org.hibernate.tool.reveng.internal.util; -import org.hibernate.boot.spi.MetadataBuildingContext; import org.hibernate.mapping.BasicValue; import org.hibernate.mapping.SimpleValue; @@ -16,10 +15,6 @@ public ValueUtil(SimpleValue sv) { sv.getCustomIdGeneratorCreator(); } - public ValueUtil(MetadataBuildingContext buildingContext) { - super(buildingContext); - } - public Map getIdentifierGeneratorParameters() { getBuildingContext().getMetadataCollector().getIdentifierGenerator("foo"); return Collections.emptyMap(); diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/CompositeElementTest/GlarchProxy.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/CompositeElementTest/GlarchProxy.java index 87bd1ccc83b0..1d47500b121d 100644 --- a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/CompositeElementTest/GlarchProxy.java +++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/CompositeElementTest/GlarchProxy.java @@ -1,38 +1,10 @@ package org.hibernate.tool.reveng.hbm2x.hbm2hbmxml.CompositeElementTest; -import java.util.List; -import java.util.Map; - public interface GlarchProxy { int getVersion(); - int getDerivedVersion(); - void setVersion(int version); String getName(); - void setName(String name); GlarchProxy getNext(); - void setNext(GlarchProxy next); - - short getOrder(); - void setOrder(short order); - - List getStrings(); - void setStrings(List strings); - - Map getDynaBean(); - void setDynaBean(Map bean); - - Map getStringSets(); - void setStringSets(Map stringSets); - - List getFooComponents(); - void setFooComponents(List fooComponents); - - GlarchProxy[] getProxyArray(); - void setProxyArray(GlarchProxy[] proxyArray); - - Object getAny(); - void setAny(Object any); } diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/DynamicComponentTest/GlarchProxy.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/DynamicComponentTest/GlarchProxy.java index 691a0eff99ec..55f4bfebed59 100644 --- a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/DynamicComponentTest/GlarchProxy.java +++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/DynamicComponentTest/GlarchProxy.java @@ -1,38 +1,10 @@ package org.hibernate.tool.reveng.hbm2x.hbm2hbmxml.DynamicComponentTest; -import java.util.List; -import java.util.Map; - public interface GlarchProxy { int getVersion(); - int getDerivedVersion(); - void setVersion(int version); String getName(); - void setName(String name); GlarchProxy getNext(); - void setNext(GlarchProxy next); - - short getOrder(); - void setOrder(short order); - - List getStrings(); - void setStrings(List strings); - - Map getDynaBean(); - void setDynaBean(Map bean); - - Map getStringSets(); - void setStringSets(Map stringSets); - - List getFooComponents(); - void setFooComponents(List fooComponents); - - GlarchProxy[] getProxyArray(); - void setProxyArray(GlarchProxy[] proxyArray); - - Object getAny(); - void setAny(Object any); } diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/FormulaTest/Address.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/FormulaTest/Address.java deleted file mode 100644 index 28244f6e9fdf..000000000000 --- a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/FormulaTest/Address.java +++ /dev/null @@ -1,49 +0,0 @@ -package org.hibernate.tool.reveng.hbm2x.hbm2hbmxml.FormulaTest; - -public class Address { - - private AddressId addressId; - private String street; - private String city; - private String state; - private String zip; - private Customer customer; - - public Customer getCustomer() { - return customer; - } - public void setCustomer(Customer customer) { - this.customer = customer; - } - - public String getCity() { - return city; - } - public void setCity(String city) { - this.city = city; - } - public String getState() { - return state; - } - public void setState(String state) { - this.state = state; - } - public String getStreet() { - return street; - } - public void setStreet(String street) { - this.street = street; - } - public String getZip() { - return zip; - } - public void setZip(String zip) { - this.zip = zip; - } - public AddressId getAddressId() { - return addressId; - } - public void setAddressId(AddressId addressId) { - this.addressId = addressId; - } -} diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/FormulaTest/AddressId.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/FormulaTest/AddressId.java index 313545adfbc0..c7dfedeec9b6 100644 --- a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/FormulaTest/AddressId.java +++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/FormulaTest/AddressId.java @@ -10,16 +10,9 @@ public AddressId(String type, String customerId) { } public AddressId() {} - - public String getType() { - return type; - } public void setType(String type) { this.type = type; } - public String getAddressId() { - return addressId; - } public void setAddressId(String customerId) { this.addressId = customerId; } diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/FormulaTest/Customer.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/FormulaTest/Customer.java index 2fc4f0cf208b..824621ca8b00 100644 --- a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/FormulaTest/Customer.java +++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/FormulaTest/Customer.java @@ -3,32 +3,10 @@ public class Customer { private String name; - private String customerId; - private Address billingAddress; - private Address shippingAddress; - - public Address getBillingAddress() { - return billingAddress; - } - public void setBillingAddress(Address billingAddress) { - this.billingAddress = billingAddress; - } - public String getCustomerId() { - return customerId; - } - public void setCustomerId(String customerId) { - this.customerId = customerId; - } public String getName() { return name; } public void setName(String name) { this.name = name; } - public Address getShippingAddress() { - return shippingAddress; - } - public void setShippingAddress(Address shippingAddress) { - this.shippingAddress = shippingAddress; - } } diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/IdBagTest/User.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/IdBagTest/User.java index d3cd04273e41..9d67cfa9c184 100644 --- a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/IdBagTest/User.java +++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/IdBagTest/User.java @@ -1,11 +1,7 @@ package org.hibernate.tool.reveng.hbm2x.hbm2hbmxml.IdBagTest; -import java.util.ArrayList; -import java.util.List; - public class User { private String name; - private List groups = new ArrayList(); User() {} @@ -22,12 +18,4 @@ void setName(String name) { this.name = name; } - public List getGroups() { - return groups; - } - - void setGroups(List groups) { - this.groups = groups; - } - } diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/JoinTest/Child.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/JoinTest/Child.java index f7718f6d1a31..4a332efc83c6 100644 --- a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/JoinTest/Child.java +++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/JoinTest/Child.java @@ -4,21 +4,7 @@ * @author gavin */ public class Child { - private Long id; private String name; - private Parent parent; - /** - * @return Returns the id. - */ - public Long getId() { - return id; - } - /** - * @param id The id to set. - */ - public void setId(Long id) { - this.id = id; - } /** * @return Returns the name. */ @@ -31,16 +17,4 @@ public String getName() { public void setName(String name) { this.name = name; } - /** - * @return Returns the parent. - */ - public Parent getParent() { - return parent; - } - /** - * @param parent The parent to set. - */ - public void setParent(Parent parent) { - this.parent = parent; - } } diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/JoinTest/Parent.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/JoinTest/Parent.java index b5fb38c71ab3..243c0338cf3a 100644 --- a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/JoinTest/Parent.java +++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/JoinTest/Parent.java @@ -1,39 +1,10 @@ package org.hibernate.tool.reveng.hbm2x.hbm2hbmxml.JoinTest; -import java.util.Collection; -import java.util.HashSet; - /** * @author gavin */ public class Parent { - private Long id; private String name; - private Collection children = new HashSet<>(); - /** - * @return Returns the children. - */ - public Collection getChildren() { - return children; - } - /** - * @param children The children to set. - */ - public void setChildren(Collection children) { - this.children = children; - } - /** - * @return Returns the id. - */ - public Long getId() { - return id; - } - /** - * @param id The id to set. - */ - public void setId(Long id) { - this.id = id; - } /** * @return Returns the name. */ diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/MapAndAnyTest/Address.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/MapAndAnyTest/Address.java deleted file mode 100644 index 1f96af164236..000000000000 --- a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/MapAndAnyTest/Address.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.hibernate.tool.reveng.hbm2x.hbm2hbmxml.MapAndAnyTest; - -import java.util.HashSet; -import java.util.Set; - -public class Address { - private Long id; - private Set lines = new HashSet(); - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Set getLines() { - return lines; - } - - public void setLines(Set lines) { - this.lines = lines; - } -} diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/MapAndAnyTest/Person.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/MapAndAnyTest/Person.java index 30a091f91ecd..91a856f86b69 100644 --- a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/MapAndAnyTest/Person.java +++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/MapAndAnyTest/Person.java @@ -1,18 +1,7 @@ package org.hibernate.tool.reveng.hbm2x.hbm2hbmxml.MapAndAnyTest; public class Person { - private Long id; private String name; - private Object data; - - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } public String getName() { return name; @@ -21,12 +10,4 @@ public String getName() { public void setName(String name) { this.name = name; } - - public Object getData() { - return data; - } - - public void setData(Object data) { - this.data = data; - } } diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/OneToOneTest/Address.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/OneToOneTest/Address.java deleted file mode 100644 index 44c2e9e0fa5a..000000000000 --- a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/OneToOneTest/Address.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.hibernate.tool.reveng.hbm2x.hbm2hbmxml.OneToOneTest; - -public class Address { - - int id; - - Person person; -} diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/OneToOneTest/Person.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/OneToOneTest/Person.java deleted file mode 100644 index 191cff28d21a..000000000000 --- a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/OneToOneTest/Person.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.hibernate.tool.reveng.hbm2x.hbm2hbmxml.OneToOneTest; - -public class Person { - - int id; - - Address address; -} diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/SetElementTest/Search.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/SetElementTest/Search.java index 14797b115280..ee5f0705b5b1 100644 --- a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/SetElementTest/Search.java +++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/SetElementTest/Search.java @@ -1,28 +1,6 @@ package org.hibernate.tool.reveng.hbm2x.hbm2hbmxml.SetElementTest; -import java.util.SortedSet; -import java.util.TreeSet; - public class Search { - private String searchString; - private SortedSet searchResults = new TreeSet<>(); Search() {} - - public Search(String string) { - searchString = string; - } - - public SortedSet getSearchResults() { - return searchResults; - } - public void setSearchResults(SortedSet searchResults) { - this.searchResults = searchResults; - } - public String getSearchString() { - return searchString; - } - public void setSearchString(String searchString) { - this.searchString = searchString; - } } diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/test/utils/JdbcUtil.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/test/utils/JdbcUtil.java index 7ba76411dbb5..0c561fcfe169 100644 --- a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/test/utils/JdbcUtil.java +++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/test/utils/JdbcUtil.java @@ -106,19 +106,6 @@ public static String toIdentifier(Object test, String string) { } } - public static boolean isDatabaseOnline(Object test) { - boolean result = false; - try { - Connection connection = createJdbcConnection(test); - result = connection.isValid(1); - connection.commit(); - connection.close(); - } catch (SQLException e) { - // this will happen when the connection cannot be created - } - return result; - } - /** * Establish a connection and execute create.sql. * diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/hhh20212/HHH20212Repository.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/hhh20212/HHH20212Repository.java index f1c1b653c243..64f77c2f26f6 100644 --- a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/hhh20212/HHH20212Repository.java +++ b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/hhh20212/HHH20212Repository.java @@ -3,14 +3,9 @@ import jakarta.data.repository.CrudRepository; import jakarta.data.repository.Find; import jakarta.data.repository.Repository; -import org.hibernate.StatelessSession; @Repository public interface HHH20212Repository extends CrudRepository { - default StatelessSession getStatelessSession() { - throw new UnsupportedOperationException(); - } - @Find HHH20212Entity byId(Long id); } diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/nonjpaentity/Product.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/nonjpaentity/Product.java index a4b05f07523a..c13306ce876a 100644 --- a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/nonjpaentity/Product.java +++ b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/nonjpaentity/Product.java @@ -2,7 +2,4 @@ @NoSqlEntity public class Product { - Long id; - String name; - Double price; } diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/selectenumproperty/TopicStatus.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/selectenumproperty/TopicStatus.java index 2981a03319ee..3ed55a802928 100644 --- a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/selectenumproperty/TopicStatus.java +++ b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/selectenumproperty/TopicStatus.java @@ -1,16 +1,9 @@ package org.hibernate.processor.test.data.selectenumproperty; public enum TopicStatus { - TOPIC_UNLOCKED( 0 ), - TOPIC_LOCKED( 1 ); + TOPIC_UNLOCKED( ), + TOPIC_LOCKED( ); - private final int topicStatus; - - TopicStatus(final int topicStatus) { - this.topicStatus = topicStatus; - } - - public int topicStatus() { - return topicStatus; + TopicStatus() { } } diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/wildcard/ManagedOperations.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/wildcard/ManagedOperations.java index 82768c62b763..43aa99a9285d 100644 --- a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/wildcard/ManagedOperations.java +++ b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/wildcard/ManagedOperations.java @@ -1,8 +1,4 @@ package org.hibernate.processor.test.data.wildcard; public interface ManagedOperations { - @SuppressWarnings("unchecked") - default Class getEntityClass() { - return (Class) Object.class; - } } diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AbstractFinderMethod.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AbstractFinderMethod.java index 9c56cd6cd5ed..e64b2de860d7 100644 --- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AbstractFinderMethod.java +++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AbstractFinderMethod.java @@ -6,8 +6,6 @@ import java.util.List; import static org.hibernate.metamodel.mapping.EntityIdentifierMapping.ID_ROLE_NAME; -import static org.hibernate.processor.util.Constants.HIB_SESSION; -import static org.hibernate.processor.util.Constants.HIB_STATELESS_SESSION; /** * @author Gavin King @@ -144,15 +142,6 @@ String qualifier(String name) { return index > 0 ? name.substring(0, index) : name; } - void unwrapSession(StringBuilder declaration) { - if ( isUsingEntityManager() || isUsingEntityAgent() ) { - declaration - .append(".unwrap(") - .append(annotationMetaEntity.importType(isUsingEntityAgent() ? HIB_STATELESS_SESSION : HIB_SESSION)) - .append(".class)\n\t\t\t"); - } - } - boolean enableFetchProfile(StringBuilder declaration, boolean unwrapped) { if ( !fetchProfiles.isEmpty() ) { unwrapQuery( declaration, unwrapped ); diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/MockCollectionPersister.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/MockCollectionPersister.java index 3c57caab956b..c36290c72afd 100644 --- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/MockCollectionPersister.java +++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/MockCollectionPersister.java @@ -37,10 +37,6 @@ public MockCollectionPersister(String role, CollectionType collectionType, Type this.ownerEntityName = root(role); } - String getOwnerEntityName() { - return ownerEntityName; - } - @Nonnull @Override public String getRole() { @@ -59,8 +55,6 @@ public EntityPersister getOwnerEntityPersister() { return factory.getMetamodel().getEntityDescriptor(ownerEntityName); } - abstract Type getElementPropertyType(String propertyPath); - @Nonnull @Override public Type getKeyType() { diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/MockEntityPersister.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/MockEntityPersister.java index d94de3dfe32e..c39b686d597f 100644 --- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/MockEntityPersister.java +++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/MockEntityPersister.java @@ -70,8 +70,6 @@ private Type getSubclassPropertyType(String propertyPath) { .orElse(null); } - abstract boolean isSamePersister(MockEntityPersister entityPersister); - abstract boolean isSubclassPersister(MockEntityPersister entityPersister); @Override diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/MockSessionFactory.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/MockSessionFactory.java index 736acdcdc710..a43f24792318 100644 --- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/MockSessionFactory.java +++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/MockSessionFactory.java @@ -336,8 +336,6 @@ static CollectionType createCollectionType(String role, String name) { abstract boolean isFieldDefined(String qualifiedClassName, String fieldName); - abstract boolean isConstructorDefined(String qualifiedClassName, List argumentTypes); - abstract Type propertyType(String typeName, String propertyPath); protected abstract boolean isSubtype(String entityName, String subtypeEntityName); @@ -515,20 +513,6 @@ public RootGraphImplementor findEntityGraphByName(@Nonnull String s) { throw new UnsupportedOperationException("operation not supported"); } - static Class toPrimitiveClass(Class type) { - return switch ( type.getName() ) { - case "java.lang.Boolean" -> boolean.class; - case "java.lang.Character" -> char.class; - case "java.lang.Integer" -> int.class; - case "java.lang.Short" -> short.class; - case "java.lang.Byte" -> byte.class; - case "java.lang.Long" -> long.class; - case "java.lang.Float" -> float.class; - case "java.lang.Double" -> double.class; - default -> Object.class; - }; - } - @Override public NativeQueryInterpreter getNativeQueryInterpreter() { return new NativeQueryInterpreterStandardImpl( this.getNativeJdbcParametersIgnored() ); @@ -1295,7 +1279,7 @@ private AbstractPluralAttribute createPluralAttribute( private EmbeddableTypeImpl createEmbeddableDomainType(String entityName, CompositeType compositeType, ManagedDomainType owner) { final var javaType = new UnknownBasicJavaType(null, compositeType.getReturnedClassName()); - return new EmbeddableTypeImpl<>( javaType, null, null, true, metamodel.getJpaMetamodel() ) { + return new EmbeddableTypeImpl<>( javaType, null, null, metamodel.getJpaMetamodel() ) { @Override public @Nullable SqmPersistentAttribute findAttribute(@Nonnull String name) { return createAttribute( diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/ProcessorSessionFactory.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/ProcessorSessionFactory.java index 3108216c1e52..8fdd1230de51 100644 --- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/ProcessorSessionFactory.java +++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/ProcessorSessionFactory.java @@ -11,7 +11,6 @@ import org.hibernate.type.BasicType; import org.hibernate.type.CollectionType; import org.hibernate.type.CompositeType; -import org.hibernate.type.EntityType; import org.hibernate.type.ManyToOneType; import org.hibernate.type.Type; import org.hibernate.type.descriptor.java.EnumJavaType; @@ -50,7 +49,6 @@ import java.io.Reader; import java.util.ArrayList; import java.util.HashMap; -import java.util.List; import java.util.Map; import java.util.Set; @@ -408,12 +406,6 @@ public String getRootEntityName() { return getHibernateEntityName(result); } - @Override - boolean isSamePersister(MockEntityPersister entityPersister) { - final var persister = (EntityPersister) entityPersister; - return typeUtil.isSameType( persister.type.asType(), type.asType() ); - } - @Override boolean isSubclassPersister(MockEntityPersister entityPersister) { final var persister = (EntityPersister) entityPersister; @@ -471,17 +463,9 @@ public ToManyAssociationPersister(String role, CollectionType collectionType, St new ManyToOneType(that.getTypeConfiguration(), targetEntityName), that); } - - @Override - Type getElementPropertyType(String propertyPath) { - return getElementPersister().getPropertyType(propertyPath); - } } public abstract static class ElementCollectionPersister extends MockCollectionPersister { - private final TypeElement elementType; - private final AccessType defaultAccessType; - private final ProcessorSessionFactory factory; public ElementCollectionPersister(String role, CollectionType collectionType, @@ -494,16 +478,6 @@ public ElementCollectionPersister(String role, propertyPath, defaultAccessType, factory), factory); - this.elementType = elementType; - this.defaultAccessType = defaultAccessType; - this.factory = factory; - } - - @Override - Type getElementPropertyType(String propertyPath) { - final var symbol = findPropertyByPath(elementType, propertyPath, defaultAccessType); - return symbol == null ? null : - factory.propertyType(symbol, getOwnerEntityName(), propertyPath, defaultAccessType); } } @@ -1036,90 +1010,6 @@ boolean isFieldDefined(String qualifiedClassName, String fieldName) { && element.getSimpleName().contentEquals(fieldName)); } - @Override - boolean isConstructorDefined(String qualifiedClassName, List argumentTypes) { - final var symbol = findClassByQualifiedName(qualifiedClassName); - if (symbol==null) { - return false; - } - for (Element cons: symbol.getEnclosedElements()) { - if ( cons.getKind() == ElementKind.CONSTRUCTOR ) { - final var constructor = (ExecutableElement) cons; - final var parameters = constructor.getParameters(); - if (parameters.size()==argumentTypes.size()) { - var argumentsCheckOut = true; - for (int i=0; i primitive; - try { - primitive = toPrimitiveClass( type.getReturnedClass() ); - } - catch (Exception e) { - continue; - } - if (!toPrimitiveClass(param).equals(primitive)) { - argumentsCheckOut = false; - break; - } - } - else { - final TypeElement typeClass; - if ( type instanceof EntityType entityType ) { - typeClass = findEntityClass(entityType.getAssociatedEntityName()); - } - //TODO: - // else if (type instanceof CompositeCustomType) { - // typeClass = ((Component) ((CompositeCustomType) type).getUserType()).type; - // } - else if (type instanceof BasicType) { - final String className; - //TODO: custom impl of getReturnedClassName() - // for many more Hibernate types! - try { - className = type.getReturnedClassName(); - } - catch (Exception e) { - continue; - } - typeClass = findClassByQualifiedName(className); - } - else { - //TODO: what other Hibernate Types do we - // need to consider here? - continue; - } - if (typeClass != null - && !typeUtil.isSubtype( typeClass.asType(), param.asType() ) ) { - argumentsCheckOut = false; - break; - } - } - } - if (argumentsCheckOut) { - return true; //matching constructor found! - } - } - } - } - return false; - } - - private static Class toPrimitiveClass(VariableElement param) { - return switch ( param.asType().getKind() ) { - case BOOLEAN -> boolean.class; - case CHAR -> char.class; - case INT -> int.class; - case SHORT -> short.class; - case BYTE -> byte.class; - case LONG -> long.class; - case FLOAT -> float.class; - case DOUBLE -> double.class; - default -> Object.class; - }; - } - private TypeElement findClassByQualifiedName(String path) { return path == null ? null : elementUtil.getTypeElement(path); } diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/ConcreteLike.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/ConcreteLike.java index 10bfc079bc32..af3363ac2b89 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/ConcreteLike.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/ConcreteLike.java @@ -10,6 +10,6 @@ public Reference getObject() { return new Reference<>(); } - public static class Target implements Like.I1, Like.I2 { + public static class Target { } } diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/Like.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/Like.java index 600c71203fab..e0c058c63a51 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/Like.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/collectionbasictype/Like.java @@ -10,19 +10,13 @@ */ @Entity @Inheritance(strategy = InheritanceType.SINGLE_TABLE) -public abstract class Like { +public abstract class Like { @Id private Long id; public abstract Reference getObject(); - interface I1 { - } - - interface I2 { - } - public static class Reference { } diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/generics/MyTypeImpl.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/generics/MyTypeImpl.java index 24d87ce753a3..c71e7d685f92 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/generics/MyTypeImpl.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/generics/MyTypeImpl.java @@ -3,5 +3,5 @@ /** * @author Chris Cranford */ -public class MyTypeImpl implements MyTypeInterface { +public class MyTypeImpl { } diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/generics/MyTypeInterface.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/generics/MyTypeInterface.java deleted file mode 100644 index 51ee521d7086..000000000000 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/generics/MyTypeInterface.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.hibernate.processor.test.embeddable.generics; - -/** - * @author Chris Cranford - */ -public interface MyTypeInterface { -} diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/generics/ParentEmbeddable.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/generics/ParentEmbeddable.java index 5927443ca1d4..fad03d59f295 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/generics/ParentEmbeddable.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/embeddable/generics/ParentEmbeddable.java @@ -8,7 +8,7 @@ * @author Chris Cranford */ @Embeddable -public class ParentEmbeddable { +public class ParentEmbeddable { private Set fields; public Set getFields() { diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hqlsql/Dto.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hqlsql/Dto.java index 956195b56c20..e1f921748c6a 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hqlsql/Dto.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hqlsql/Dto.java @@ -11,14 +11,6 @@ public Dto(String title, int pages) { this.pages = pages; } - public String title() { - return title; - } - - public int pages() { - return pages; - } - @Override public boolean equals(Object obj) { if (obj == this) return true; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/util/TestUtil.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/util/TestUtil.java index 8ec6856f0f23..b471c9767b1a 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/util/TestUtil.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/util/TestUtil.java @@ -8,7 +8,6 @@ import java.io.BufferedReader; import java.io.File; -import java.io.FileFilter; import java.io.FileReader; import java.io.IOException; import java.lang.reflect.Constructor; @@ -625,19 +624,6 @@ private static Type getComponentType(Type actualType) { } } - private static class MetaModelFilenameFilter implements FileFilter { - @Override - public boolean accept(File pathName) { - if ( pathName.isDirectory() ) { - return true; - } - else { - return pathName.getAbsolutePath().endsWith( "_.java" ) - || pathName.getAbsolutePath().endsWith( "_.class" ); - } - } - } - public static void deleteFilesRecursive(File file) { if ( !file.exists() ) { return; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/wildcard/Property.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/wildcard/Property.java index 7db86db8b973..c10cdfb3b766 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/wildcard/Property.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/wildcard/Property.java @@ -1,8 +1,4 @@ package org.hibernate.processor.test.wildcard; public interface Property { - - String getName(); - - T getValue(); }