Skip to content

Commit 6708cd5

Browse files
committed
rebase fixups : main -> 7.0
1 parent 16088f7 commit 6708cd5

File tree

5 files changed

+14
-13
lines changed

5 files changed

+14
-13
lines changed

hibernate-core/src/main/java/org/hibernate/boot/model/internal/ClassPropertyHolder.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -271,9 +271,13 @@ private void addPropertyToPersistentClass(Property property, MemberDetails membe
271271
}
272272
}
273273

274-
private void addPropertyToMappedSuperclass(Property prop, MemberDetails memberDetails, ClassDetails declaringClass) {
275-
final MappedSuperclass superclass = getContext().getMetadataCollector().getMappedSuperclass( declaringClass.toJavaClass() );
276-
prepareActualProperty( prop, memberDetails, true, getContext(), superclass::addDeclaredProperty );
274+
public static void addPropertyToMappedSuperclass(
275+
Property prop,
276+
MemberDetails memberDetails,
277+
ClassDetails declaringClass,
278+
MetadataBuildingContext context) {
279+
final MappedSuperclass superclass = context.getMetadataCollector().getMappedSuperclass( declaringClass.toJavaClass() );
280+
prepareActualProperty( prop, memberDetails, true, context, superclass::addDeclaredProperty );
277281
}
278282

279283
static void prepareActualProperty(

hibernate-core/src/main/java/org/hibernate/boot/model/internal/ComponentPropertyHolder.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@
3232

3333
import static org.hibernate.boot.model.internal.ClassPropertyHolder.addPropertyToMappedSuperclass;
3434
import static org.hibernate.boot.model.internal.ClassPropertyHolder.handleGenericComponentProperty;
35-
import static org.hibernate.boot.model.internal.HCANNHelper.hasAnnotation;
36-
import static org.hibernate.internal.util.NullnessUtil.castNonNull;
3735
import static org.hibernate.internal.util.StringHelper.isEmpty;
3836
import static org.hibernate.internal.util.StringHelper.qualifyConditionally;
3937
import static org.hibernate.spi.NavigablePath.IDENTIFIER_MAPPER_PROPERTY;
@@ -70,7 +68,7 @@ public class ComponentPropertyHolder extends AbstractPropertyHolder {
7068
private final Component component;
7169
private final boolean isOrWithinEmbeddedId;
7270
private final boolean isWithinElementCollection;
73-
private final Map<XClass, InheritanceState> inheritanceStatePerClass;
71+
private final Map<ClassDetails, InheritanceState> inheritanceStatePerClass;
7472

7573
private final String embeddedAttributeName;
7674
private final Map<String,AttributeConversionInfo> attributeConversionInfoMap;
@@ -81,7 +79,7 @@ public ComponentPropertyHolder(
8179
PropertyData inferredData,
8280
PropertyHolder parent,
8381
MetadataBuildingContext context,
84-
Map<XClass, InheritanceState> inheritanceStatePerClass) {
82+
Map<ClassDetails, InheritanceState> inheritanceStatePerClass) {
8583
super( path, parent, inferredData.getPropertyType().determineRawClass(), context );
8684
final MemberDetails embeddedMemberDetails = inferredData.getAttributeMember();
8785
setCurrentProperty( embeddedMemberDetails );
@@ -292,11 +290,11 @@ public Table getTable() {
292290

293291
@Override
294292
public void addProperty(Property prop, MemberDetails attributeMemberDetails, ClassDetails declaringClass) {
295-
handleGenericComponentProperty( prop, getContext() );
293+
handleGenericComponentProperty( prop, attributeMemberDetails, getContext() );
296294
if ( declaringClass != null ) {
297295
final InheritanceState inheritanceState = inheritanceStatePerClass.get( declaringClass );
298296
if ( inheritanceState != null && inheritanceState.isEmbeddableSuperclass() ) {
299-
addPropertyToMappedSuperclass( prop, declaringClass, getContext() );
297+
addPropertyToMappedSuperclass( prop, attributeMemberDetails, declaringClass, getContext() );
300298
}
301299
}
302300
component.addProperty( prop, declaringClass );

hibernate-core/src/main/java/org/hibernate/boot/model/internal/InheritanceState.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import org.hibernate.mapping.Component;
1818
import org.hibernate.mapping.PersistentClass;
1919
import org.hibernate.mapping.Table;
20-
import org.hibernate.models.spi.AnnotationUsage;
2120
import org.hibernate.models.spi.ClassDetails;
2221
import org.hibernate.models.spi.FieldDetails;
2322
import org.hibernate.models.spi.MethodDetails;

hibernate-core/src/main/java/org/hibernate/boot/model/internal/PropertyHolderBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public static PropertyHolder buildPropertyHolder(
5555
PropertyData inferredData,
5656
PropertyHolder parent,
5757
MetadataBuildingContext context,
58-
Map<XClass, InheritanceState> inheritanceStatePerClass) {
58+
Map<ClassDetails, InheritanceState> inheritanceStatePerClass) {
5959
return new ComponentPropertyHolder( component, path, inferredData, parent, context, inheritanceStatePerClass );
6060
}
6161

hibernate-core/src/main/java/org/hibernate/query/sqm/internal/AbstractSqmSelectionQuery.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -280,8 +280,8 @@ private <T> SelectQueryPlan<T> buildConcreteQueryPlan(SqmSelectStatement<T> sqmS
280280
return buildConcreteQueryPlan( sqmStatement, null, null, options );
281281
}
282282

283-
protected void applyOptions(NamedSqmQueryMemento memento) {
284-
applyOptions( (NamedQueryMemento) memento );
283+
protected void applyOptions(NamedSqmQueryMemento<?> memento) {
284+
applyOptions( (NamedQueryMemento<?>) memento );
285285

286286
if ( memento.getFirstResult() != null ) {
287287
setFirstResult( memento.getFirstResult() );

0 commit comments

Comments
 (0)