Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
@Deprecated
public final class MutableAttributeMappingList implements AttributeMappingsList {

private final List list;
private final List<AttributeMapping> list;

public MutableAttributeMappingList(final int length) {
this.list = new ArrayList<>( length );
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public final class EntityPersisterConcurrentMap {
private volatile String[] keys = new String[0];

public EntityPersister get(final String name) {
final EntityPersisterHolder entityPersisterHolder = map.get( name );
final var entityPersisterHolder = map.get( name );
if ( entityPersisterHolder != null ) {
return entityPersisterHolder.entityPersister;
}
Expand Down Expand Up @@ -60,13 +60,13 @@ private void recomputeValues() {
final EntityPersister[] newValues = new EntityPersister[size];
final String[] newKeys = new String[size];
int i = 0;
for ( Map.Entry<String, EntityPersisterHolder> e : map.entrySet() ) {
newValues[i] = e.getValue().entityPersister;
newKeys[i] = e.getKey();
for ( var entry : map.entrySet() ) {
newValues[i] = entry.getValue().entityPersister;
newKeys[i] = entry.getKey();
i++;
}
this.values = newValues;
this.keys = newKeys;
values = newValues;
keys = newKeys;
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,7 @@ public interface RuntimeModelCreationContext {

MappingMetamodelImplementor getDomainModel();

default TypeConfiguration getTypeConfiguration() {
return getBootstrapContext() == null ? getSessionFactory().getTypeConfiguration()
: getBootstrapContext().getTypeConfiguration();
}
TypeConfiguration getTypeConfiguration();

default JavaTypeRegistry getJavaTypeRegistry() {
return getTypeConfiguration().getJavaTypeRegistry();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public interface BasicJavaType<T> extends JavaType<T> {
*/
default JdbcType getRecommendedJdbcType(JdbcTypeIndicators indicators) {
// match legacy behavior
int jdbcTypeCode = JdbcTypeJavaClassMappings.INSTANCE.determineJdbcTypeCodeForJavaClass( getJavaTypeClass() );
final int jdbcTypeCode = JdbcTypeJavaClassMappings.INSTANCE.determineJdbcTypeCodeForJavaClass( getJavaTypeClass() );
final var descriptor = indicators.getJdbcType( indicators.resolveJdbcTypeCode( jdbcTypeCode ) );
return descriptor instanceof AdjustableJdbcType adjustableJdbcType
? adjustableJdbcType.resolveIndicatedType( indicators, this )
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import org.hibernate.testing.orm.junit.SessionFactory;
import org.hibernate.testing.orm.junit.SessionFactoryScope;
import org.hibernate.type.descriptor.jdbc.JdbcType;
import org.hibernate.type.spi.TypeConfiguration;
import org.junit.jupiter.api.Test;

import java.util.Map;
Expand Down Expand Up @@ -136,6 +137,11 @@ public BootstrapContext getBootstrapContext() {
return null;
}

@Override
public TypeConfiguration getTypeConfiguration() {
return sessionFactory.getTypeConfiguration();
}

@Override
public MetadataImplementor getBootModel() {
return scope.getMetadataImplementor();
Expand Down
Loading