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

minor

This commit is contained in:
Gavin 2023-05-03 21:07:17 +03:00 committed by Gavin King
parent d29fdbb8d5
commit 84a3233267
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
hibernate-core/src/main/java/org/hibernate/mapping/Component.java
View File

@ -46,6 +46,7 @@ import org.hibernate.type.ComponentType;
import org.hibernate.type.CompositeType;
import org.hibernate.type.EmbeddedComponentType;
import static java.util.stream.Collectors.toList;
import static org.hibernate.generator.EventType.INSERT;
import static org.hibernate.id.IdentifierGeneratorHelper.POST_INSERT_INDICATOR;
@ -122,7 +123,7 @@ public class Component extends SimpleValue implements MetaAttributable, Sortable
this.parentProperty = original.parentProperty;
this.owner = original.owner;
this.dynamic = original.dynamic;
this.metaAttributes = original.metaAttributes == null ? null : new HashMap<>(original.metaAttributes);
this.metaAttributes = original.metaAttributes == null ? null : new HashMap<>( original.metaAttributes );
this.isKey = original.isKey;
this.roleName = original.roleName;
this.customInstantiator = original.customInstantiator;
@ -182,8 +183,8 @@ public class Component extends SimpleValue implements MetaAttributable, Sortable
public List<Selectable> getSelectables() {
if ( cachedSelectables == null ) {
cachedSelectables = properties.stream()
.flatMap(p -> p.getSelectables().stream())
.collect(Collectors.toList());
.flatMap( p -> p.getSelectables().stream() )
.collect( toList() );
}
return cachedSelectables;
}
@ -196,7 +197,7 @@ public class Component extends SimpleValue implements MetaAttributable, Sortable
else {
this.cachedColumns = properties.stream()
.flatMap( p -> p.getValue().getColumns().stream() )
.collect( Collectors.toList() );
.collect( toList() );
return cachedColumns;
}
}
@ -429,14 +430,14 @@ public class Component extends SimpleValue implements MetaAttributable, Sortable
public boolean isSame(Component other) {
return super.isSame( other )
&& Objects.equals( properties, other.properties )
&& Objects.equals( componentClassName, other.componentClassName )
&& embedded == other.embedded
&& Objects.equals( aggregateColumn, other.aggregateColumn )
&& Objects.equals( parentAggregateColumn, other.parentAggregateColumn )
&& Objects.equals( structName, other.structName )
&& Objects.equals( parentProperty, other.parentProperty )
&& Objects.equals( metaAttributes, other.metaAttributes );
&& Objects.equals( properties, other.properties )
&& Objects.equals( componentClassName, other.componentClassName )
&& embedded == other.embedded
&& Objects.equals( aggregateColumn, other.aggregateColumn )
&& Objects.equals( parentAggregateColumn, other.parentAggregateColumn )
&& Objects.equals( structName, other.structName )
&& Objects.equals( parentProperty, other.parentProperty )
&& Objects.equals( metaAttributes, other.metaAttributes );
}
@Override

2
hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/UnknownBasicJavaType.java
View File

@ -34,7 +34,7 @@ public final class UnknownBasicJavaType<T> extends AbstractJavaType<T> {
@Override
public JdbcType getRecommendedJdbcType(JdbcTypeIndicators context) {
throw new JdbcTypeRecommendationException(
"Could not determine recommended JdbcType for `" + getJavaType().getTypeName() + "`"
"Could not determine recommended JdbcType for Java type '" + getJavaType().getTypeName() + "'"
);
}