Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-18139 remove IdentifierGeneratorFactory from javadoc 

+ a couple of other minor things

Signed-off-by: Gavin King <gavin@hibernate.org>
This commit is contained in:
Gavin King 2024-05-21 10:39:18 +02:00 committed by Steve Ebersole
parent 29f205dea2
commit dfed5a9d25
4 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hibernate-core/src/main/java/org/hibernate/id/IdentifierGenerator.java
View File

@ -51,8 +51,6 @@ import static org.hibernate.generator.EventTypeSets.INSERT_ONLY;
* using {@link org.hibernate.annotations.GenericGenerator#parameters()}. * using {@link org.hibernate.annotations.GenericGenerator#parameters()}.
* </ul> * </ul>
* <p> * <p>
* Instances of {@code IdentifierGenerator} are usually created and configured
* by the {@link org.hibernate.id.factory.IdentifierGeneratorFactory} service.
* It's not usually correct to use an {@code IdentifierGenerator} with the * It's not usually correct to use an {@code IdentifierGenerator} with the
* {@link org.hibernate.annotations.IdGeneratorType} meta-annotation. * {@link org.hibernate.annotations.IdGeneratorType} meta-annotation.
* *
@ -150,7 +148,7 @@ public interface IdentifierGenerator extends BeforeExecutionGenerator, Exportabl
* *
* @deprecated this method is no longer called * @deprecated this method is no longer called
*/ */
@Deprecated(since="6.2") @Deprecated(since="6.2", forRemoval = true)
default boolean supportsJdbcBatchInserts() { default boolean supportsJdbcBatchInserts() {
return true; return true;
} }

1
hibernate-core/src/main/java/org/hibernate/id/enhanced/SequenceStyleGenerator.java
View File

@ -557,7 +557,6 @@ public class SequenceStyleGenerator
private String determineContributor(Properties params) { private String determineContributor(Properties params) {
final String contributor = params.getProperty( IdentifierGenerator.CONTRIBUTOR_NAME ); final String contributor = params.getProperty( IdentifierGenerator.CONTRIBUTOR_NAME );
return contributor == null ? "orm" : contributor; return contributor == null ? "orm" : contributor;
} }

2
hibernate-core/src/main/java/org/hibernate/id/enhanced/TableGenerator.java
View File

@ -555,7 +555,6 @@ public class TableGenerator implements PersistentIdentifierGenerator {
getFactory().getJdbcServices() getFactory().getJdbcServices()
.getSqlStatementLogger(); .getSqlStatementLogger();
final SessionEventListenerManager statsCollector = session.getEventListenerManager(); final SessionEventListenerManager statsCollector = session.getEventListenerManager();
return optimizer.generate( return optimizer.generate(
new AccessCallback() { new AccessCallback() {
@Override @Override
@ -570,7 +569,6 @@ public class TableGenerator implements PersistentIdentifierGenerator {
true true
); );
} }
@Override @Override
public String getTenantIdentifier() { public String getTenantIdentifier() {
return session.getTenantIdentifier(); return session.getTenantIdentifier();

3
hibernate-core/src/main/java/org/hibernate/query/sqm/sql/BaseSqmToSqlAstConverter.java
View File

@ -1364,9 +1364,8 @@ public abstract class BaseSqmToSqlAstConverter<T extends Statement> extends Base
Expression discriminatorExpression = null; Expression discriminatorExpression = null;
BasicEntityIdentifierMapping identifierMapping = null; BasicEntityIdentifierMapping identifierMapping = null;
// We use the id property name to null the identifier generator variable if the target paths contain the id // We use the id property name to null the identifier generator variable if the target paths contain the id
final String identifierPropertyName;
Generator identifierGenerator = entityDescriptor.getGenerator(); Generator identifierGenerator = entityDescriptor.getGenerator();
identifierPropertyName = identifierGenerator != null ? entityDescriptor.getIdentifierPropertyName() : null; final String identifierPropertyName = identifierGenerator != null ? entityDescriptor.getIdentifierPropertyName() : null;
final String versionAttributeName; final String versionAttributeName;
boolean needsVersionInsert; boolean needsVersionInsert;
if ( entityDescriptor.isVersioned() ) { if ( entityDescriptor.isVersioned() ) {