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

HHH-15782 cleaner impl of <timestamp source="db"/>

This commit is contained in:
Gavin 2022-12-03 15:03:43 +01:00 committed by Gavin King
parent 075b268280
commit b40d15e528
2 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,6 @@
*/
package org.hibernate.boot.model.source.internal.hbm;
import java.lang.annotation.Annotation;
import java.sql.Types;
import java.util.ArrayList;
import java.util.HashMap;
@ -18,7 +17,6 @@ import java.util.Properties;
import org.hibernate.AssertionFailure;
import org.hibernate.FetchMode;
import org.hibernate.annotations.Source;
import org.hibernate.generator.internal.SourceGeneration;
import org.hibernate.annotations.SourceType;
import org.hibernate.boot.MappingException;
@ -171,17 +169,6 @@ import static org.hibernate.mapping.SimpleValue.DEFAULT_ID_GEN_STRATEGY;
public class ModelBinder {
private static final CoreMessageLogger log = CoreLogging.messageLogger( ModelBinder.class );
private static final Source DB_SOURCE = new Source() {
@Override
public SourceType value() {
return SourceType.DB;
}
@Override
public Class<? extends Annotation> annotationType() {
return Source.class;
}
};
private final MetadataBuildingContext metadataBuildingContext;
private final Database database;
@ -1016,7 +1003,7 @@ public class ModelBinder {
}
if ( versionAttributeSource.getSource().equals("db") ) {
property.setValueGeneratorCreator(
context -> new SourceGeneration( DB_SOURCE, property.getType().getReturnedClass() ) );
context -> new SourceGeneration( SourceType.DB, property.getType().getReturnedClass() ) );
}
rootEntityDescriptor.setVersion( property );

13
hibernate-core/src/main/java/org/hibernate/generator/internal/SourceGeneration.java
View File

@ -10,6 +10,7 @@ import org.hibernate.AssertionFailure;
import org.hibernate.Internal;
import org.hibernate.Session;
import org.hibernate.annotations.Source;
import org.hibernate.annotations.SourceType;
import org.hibernate.dialect.Dialect;
import org.hibernate.engine.jdbc.spi.JdbcCoordinator;
import org.hibernate.engine.spi.SharedSessionContractImplementor;
@ -33,13 +34,17 @@ import static java.sql.Types.TIMESTAMP;
* Value generation strategy using the query {@link Dialect#getCurrentTimestampSelectString()}.
* This is a {@code select} that occurs <em>before</em> the {@code insert} or {@code update},
* whereas with {@link CurrentTimestampGeneration} the {@code select} happens afterward.
* <p>
* Underlies the {@link Source @Source} annotation, and {@code <timestamp source="db"/>} in
* {@code hbm.xml} mapping documents.
*
* @see Source
* @see CurrentTimestampGeneration
*
* @author Gavin King
*
* @deprecated because {@link Source} is deprecated, though this implementation is instructive
* @deprecated because both {@link Source} and {@code hbm.xml} are deprecated, though this
* implementation is instructive
*/
@Deprecated(since = "6.2")
@Internal
@ -54,12 +59,12 @@ public class SourceGeneration implements InMemoryGenerator {
private final ValueGenerator<?> valueGenerator;
public SourceGeneration(Source annotation, Member member, GeneratorCreationContext context) {
this( annotation, context.getProperty().getType().getReturnedClass() );
this( annotation.value(), context.getProperty().getType().getReturnedClass() );
}
public SourceGeneration(Source annotation, Class<?> propertyType) {
public SourceGeneration(SourceType sourceType, Class<?> propertyType) {
this.propertyType = propertyType;
switch ( annotation.value() ) {
switch ( sourceType ) {
case DB:
valueGenerator = this::generateValue;
break;