diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/StandardCacheEntryImpl.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/StandardCacheEntryImpl.java index 3c5fea152d12..80362aa43540 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/StandardCacheEntryImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/StandardCacheEntryImpl.java @@ -149,7 +149,7 @@ public Object[] assemble( } - persister.setPropertyValues( instance, state ); + persister.setValues( instance, state ); return state; } diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultFlushEntityEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultFlushEntityEventListener.java index 89ea8145c47f..508b985955f9 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultFlushEntityEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultFlushEntityEventListener.java @@ -142,7 +142,7 @@ public void onFlushEntity(FlushEntityEvent event) throws HibernateException { // now update the object // has to be outside the main if block above (because of collections) if ( substitute ) { - persister.setPropertyValues( entity, values ); + persister.setValues( entity, values ); } // Search for collections by reachability, updating their role. // We don't want to touch collections reachable from a deleted object 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 bfdcd4e7fbee..34490de9fd59 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 @@ -1276,25 +1276,6 @@ public void applyBaseManyToManyRestrictions( } } - @Override - public String getManyToManyFilterFragment(TableGroup tableGroup, Map enabledFilters) { - final var fragment = new StringBuilder(); - if ( manyToManyFilterHelper != null ) { - manyToManyFilterHelper.render( fragment, - elementPersister.getFilterAliasGenerator( tableGroup ), enabledFilters ); - } - if ( manyToManyWhereString != null ) { - if ( !fragment.isEmpty() ) { - fragment.append( " and " ); - } - assert elementPersister != null; - fragment.append( replace( manyToManyWhereTemplate, Template.TEMPLATE, - tableGroup.resolveTableReference( elementPersister.getTableName() ) - .getIdentificationVariable() ) ); - } - return fragment.toString(); - } - @Override public EntityPersister getElementPersister() { if ( elementPersister == null ) { diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/CollectionPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/CollectionPersister.java index d937f2e8b907..0b68859fb23e 100644 --- a/hibernate-core/src/main/java/org/hibernate/persister/collection/CollectionPersister.java +++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/CollectionPersister.java @@ -162,8 +162,6 @@ default boolean needsRemove() { */ boolean isManyToMany(); - String getManyToManyFilterFragment(TableGroup tableGroup, Map enabledFilters); - /** * Is this an "indexed" collection? (list or map) */ 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 2c1c3f9fcade..b5862f9dadc0 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 @@ -310,7 +310,15 @@ public abstract class AbstractEntityPersister private static final CoreMessageLogger LOG = CoreLogging.messageLogger( AbstractEntityPersister.class ); + /** + * The property name of the "special" identifier property in HQL + * + * @deprecated this feature of HQL is now deprecated + */ + @Deprecated(since = "6.2") + public static final String ENTITY_ID = "id"; public static final String ENTITY_CLASS = "class"; + public static final String VERSION_COLUMN_ALIAS = "version_"; public static final String ROWID_ALIAS = "rowid_"; @@ -4082,11 +4090,6 @@ public CascadeStyle[] getPropertyCascadeStyles() { return getCascadeStyles(); } - @Override - public boolean isPropertySelectable(int propertyNumber) { - return getAttributeMapping( propertyNumber ).getAttributeMetadata().isSelectable(); - } - @Override public final Class getMappedClass() { return this.getMappedJavaType().getJavaTypeClass(); diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/EntityPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/EntityPersister.java index 1c9e2ace41a0..f9e1afb00473 100644 --- a/hibernate-core/src/main/java/org/hibernate/persister/entity/EntityPersister.java +++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/EntityPersister.java @@ -627,7 +627,10 @@ default MultiNaturalIdLoader getMultiNaturalIdLoader() { /** * Load the id for the entity based on the natural id. + * + * @deprecated No longer used */ + @Deprecated(since = "7.2") Object loadEntityIdByNaturalId( Object[] naturalIdValues, LockOptions lockOptions, @@ -638,17 +641,6 @@ Object loadEntityIdByNaturalId( */ Object load(Object id, Object optionalObject, LockMode lockMode, SharedSessionContractImplementor session); - /** - * @deprecated Use {@link #load(Object, Object, LockMode, SharedSessionContractImplementor)} - */ - @Deprecated(since = "6.0") - default Object load( - Object id, Object optionalObject, LockMode lockMode, SharedSessionContractImplementor session, - @SuppressWarnings("unused") Boolean readOnly) - throws HibernateException { - return load( id, optionalObject, lockMode, session ); - } - /** * Load an instance of the persistent class. */ @@ -898,10 +890,6 @@ default UpdateCoordinator getMergeCoordinator() { */ CascadeStyle[] getPropertyCascadeStyles(); - default boolean isPropertySelectable(int propertyNumber) { - return true; - } - /** * Get the identifier type */ @@ -1378,14 +1366,6 @@ default int[] resolveDirtyAttributeIndexes( boolean hasFilterForLoadByKey(); - /** - * The property name of the "special" identifier property in HQL - * - * @deprecated this feature of HQL is now deprecated - */ - @Deprecated(since = "6.2") - String ENTITY_ID = "id"; - /** * @return Metadata for each unique key defined */ diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/EntityPropertyMapping.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/EntityPropertyMapping.java index 55d62a9e4629..e7a3264a90c2 100644 --- a/hibernate-core/src/main/java/org/hibernate/persister/entity/EntityPropertyMapping.java +++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/EntityPropertyMapping.java @@ -332,9 +332,9 @@ protected void initIdentifierPropertyPaths( if ( etype.isReferenceToPrimaryKey() ) { if ( !hasNonIdentifierPropertyNamedId ) { - String idpath1 = extendPath( path, EntityPersister.ENTITY_ID ); - addPropertyPath( idpath1, idtype, columns, columnReaders, columnReaderTemplates, factory ); - initPropertyPaths( idpath1, idtype, columns, columnReaders, columnReaderTemplates, formulaTemplates, factory ); + String idpath = extendPath( path, AbstractEntityPersister.ENTITY_ID ); + addPropertyPath( idpath, idtype, columns, columnReaders, columnReaderTemplates, factory ); + initPropertyPaths( idpath, idtype, columns, columnReaders, columnReaderTemplates, formulaTemplates, factory ); } } @@ -352,7 +352,7 @@ private boolean hasNonIdentifierPropertyNamedId(final EntityType entityType, fin try { return factory.getReferencedPropertyType( entityType.getAssociatedEntityName(), - EntityPersister.ENTITY_ID + AbstractEntityPersister.ENTITY_ID ) != null; } catch (MappingException e) { 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 464def23a808..397fe335c807 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 @@ -140,7 +140,7 @@ protected boolean preInsertInMemoryValueGeneration(Object[] values, Object entit && generator.generatesOnInsert() && generator.generatedBeforeExecution( entity, session ) ) { values[i] = ( (BeforeExecutionGenerator) generator ).generate( session, entity, values[i], INSERT ); - persister.setPropertyValue( entity, i, values[i] ); + persister.setValue( entity, i, values[i] ); foundStateDependentGenerator = foundStateDependentGenerator || generator.generatedOnExecution(); } } diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/UpdateCoordinatorStandard.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/UpdateCoordinatorStandard.java index 42ab47ff8938..2f75a7ddcf65 100644 --- a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/UpdateCoordinatorStandard.java +++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/UpdateCoordinatorStandard.java @@ -557,7 +557,7 @@ private int[] preUpdateInMemoryValueGeneration( && generator.generatesOnUpdate() && generator.generatedBeforeExecution( object, session ) ) { newValues[i] = ( (BeforeExecutionGenerator) generator ).generate( session, object, newValues[i], UPDATE ); - entityPersister().setPropertyValue( object, i, newValues[i] ); + entityPersister().setValue( object, i, newValues[i] ); fieldsPreUpdateNeeded[count++] = i; } } 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 35f17c1a6b89..a5c6e9f514f6 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 @@ -1366,7 +1366,7 @@ protected void initializeEntityInstance(EntityInitializerData data) { .injectInterceptor( entityInstanceForNotify, entityIdentifier, session ); } } - data.concreteDescriptor.setPropertyValues( entityInstanceForNotify, resolvedEntityState ); + data.concreteDescriptor.setValues( entityInstanceForNotify, resolvedEntityState ); persistenceContext.addEntity( entityKey, entityInstanceForNotify ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/GoofyPersisterClassProvider.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/GoofyPersisterClassProvider.java index d63fa2c006b1..4fc818bb05a2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/GoofyPersisterClassProvider.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/GoofyPersisterClassProvider.java @@ -1192,10 +1192,6 @@ public boolean isManyToMany() { return false; //To change body of implemented methods use File | Settings | File Templates. } - public String getManyToManyFilterFragment(TableGroup tableGroup, Map enabledFilters) { - return null; //To change body of implemented methods use File | Settings | File Templates. - } - public boolean hasIndex() { return false; //To change body of implemented methods use File | Settings | File Templates. }