Skip to content

Commit f39e7ed

Browse files
sebersolesebersole
committed
HHH-18000 : Remove XmlProcessingHelper methods for creating AnnotationUsage instances
1 parent 531048d commit f39e7ed

16 files changed

+226
-232
lines changed

‎hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/XmlAnnotationHelper.java‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1202,15 +1202,10 @@ static void applyEntityListener(
12021202
JaxbEntityListenerImpl jaxbEntityListener,
12031203
MutableClassDetails classDetails,
12041204
XmlDocumentContext xmlDocumentContext) {
1205-
final MutableAnnotationUsage<EntityListeners> applied = classDetails.applyAnnotationUsage(
1205+
final MutableAnnotationUsage<EntityListeners> listenersUsage = classDetails.applyAnnotationUsage(
12061206
JpaAnnotations.ENTITY_LISTENERS,
12071207
xmlDocumentContext.getModelBuildingContext()
12081208
);
1209-
final MutableAnnotationUsage<EntityListeners> listenersUsage = XmlProcessingHelper.getOrMakeAnnotation(
1210-
EntityListeners.class,
1211-
classDetails,
1212-
xmlDocumentContext
1213-
);
12141209

12151210
final MutableClassDetails entityListenerClass = xmlDocumentContext.resolveJavaType( jaxbEntityListener.getClazz() );
12161211
applyLifecycleCallbacks(

‎hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/XmlProcessingHelper.java‎

Lines changed: 10 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
import org.hibernate.boot.models.internal.AnnotationUsageHelper;
1616
import org.hibernate.boot.models.xml.spi.XmlDocumentContext;
1717
import org.hibernate.internal.util.StringHelper;
18-
import org.hibernate.models.internal.dynamic.DynamicAnnotationUsage;
19-
import org.hibernate.models.spi.AnnotationTarget;
2018
import org.hibernate.models.spi.AnnotationUsage;
2119
import org.hibernate.models.spi.FieldDetails;
2220
import org.hibernate.models.spi.MethodDetails;
@@ -111,70 +109,6 @@ else if ( accessType == AccessType.FIELD ) {
111109
return null;
112110
}
113111

114-
/**
115-
* Find an existing annotation, or create one.
116-
* Used when applying XML in override mode.
117-
*/
118-
public static <A extends Annotation> MutableAnnotationUsage<A> getOrMakeAnnotation(
119-
Class<A> annotationType,
120-
MutableAnnotationTarget target,
121-
XmlDocumentContext xmlDocumentContext) {
122-
final AnnotationUsage<A> existing = target.getAnnotationUsage( annotationType );
123-
if ( existing != null ) {
124-
return (MutableAnnotationUsage<A>) existing;
125-
}
126-
127-
return makeAnnotation( annotationType, target, xmlDocumentContext );
128-
}
129-
130-
public static <A extends Annotation> MutableAnnotationUsage<A> getOrMakeAnnotation(
131-
Class<A> annotationType,
132-
XmlDocumentContext xmlDocumentContext) {
133-
134-
return makeAnnotation( annotationType, xmlDocumentContext );
135-
}
136-
137-
/**
138-
* Make a nested AnnotationUsage. The usage is created with the given target,
139-
* but it is not added to the target's annotations.
140-
*/
141-
public static <A extends Annotation> MutableAnnotationUsage<A> makeNestedAnnotation(
142-
Class<A> annotationType,
143-
AnnotationTarget target,
144-
XmlDocumentContext xmlDocumentContext) {
145-
return new DynamicAnnotationUsage<>(
146-
xmlDocumentContext.getModelBuildingContext()
147-
.getAnnotationDescriptorRegistry()
148-
.getDescriptor( annotationType ),
149-
xmlDocumentContext.getModelBuildingContext()
150-
);
151-
}
152-
153-
public static <A extends Annotation> MutableAnnotationUsage<A> makeNestedAnnotation(
154-
Class<A> annotationType,
155-
XmlDocumentContext xmlDocumentContext) {
156-
return makeNestedAnnotation( annotationType, null, xmlDocumentContext );
157-
}
158-
159-
/**
160-
* Make an AnnotationUsage.
161-
* Used when applying XML in complete mode or when {@linkplain #getOrMakeAnnotation}
162-
* needs to make.
163-
*/
164-
public static <A extends Annotation> MutableAnnotationUsage<A> makeAnnotation(
165-
Class<A> annotationType,
166-
MutableAnnotationTarget target,
167-
XmlDocumentContext xmlDocumentContext) {
168-
final MutableAnnotationUsage<A> created = makeNestedAnnotation( annotationType, target, xmlDocumentContext );
169-
target.addAnnotationUsage( created );
170-
return created;
171-
}
172-
173-
public static <A extends Annotation> MutableAnnotationUsage<A> makeAnnotation(
174-
Class<A> annotationType,
175-
XmlDocumentContext xmlDocumentContext) {
176-
return makeNestedAnnotation( annotationType, xmlDocumentContext );
177-
}
178112

179113
/**
180114
* Find an existing annotation by name, or create one.
@@ -199,7 +133,11 @@ public static <A extends Annotation> MutableAnnotationUsage<A> getOrMakeNamedAnn
199133
MutableAnnotationTarget target,
200134
XmlDocumentContext xmlDocumentContext) {
201135
if ( name == null ) {
202-
return makeAnnotation( annotationType, target, xmlDocumentContext );
136+
return xmlDocumentContext
137+
.getModelBuildingContext()
138+
.getAnnotationDescriptorRegistry()
139+
.getDescriptor( annotationType )
140+
.createUsage( null, xmlDocumentContext.getModelBuildingContext() );
203141
}
204142

205143
final AnnotationUsage<A> existing = target.getNamedAnnotationUsage( annotationType, name, attributeToMatch );
@@ -221,7 +159,11 @@ public static <A extends Annotation> MutableAnnotationUsage<A> makeNamedAnnotati
221159
String nameAttributeName,
222160
MutableAnnotationTarget target,
223161
XmlDocumentContext xmlDocumentContext) {
224-
final MutableAnnotationUsage<A> created = makeNestedAnnotation( annotationType, target, xmlDocumentContext );
162+
final MutableAnnotationUsage<A> created = xmlDocumentContext
163+
.getModelBuildingContext()
164+
.getAnnotationDescriptorRegistry()
165+
.getDescriptor( annotationType )
166+
.createUsage( null, xmlDocumentContext.getModelBuildingContext() );
225167
target.addAnnotationUsage( created );
226168
created.setAttributeValue( nameAttributeName, name );
227169
return created;

‎hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/AnyMappingAttributeProcessing.java‎

Lines changed: 45 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
import org.hibernate.boot.jaxb.mapping.spi.JaxbAnyMappingImpl;
2020
import org.hibernate.boot.jaxb.mapping.spi.JaxbAnyMappingKeyImpl;
2121
import org.hibernate.boot.jaxb.mapping.spi.JaxbColumnImpl;
22+
import org.hibernate.boot.models.HibernateAnnotations;
23+
import org.hibernate.boot.models.JpaAnnotations;
2224
import org.hibernate.boot.models.xml.internal.XmlAnnotationHelper;
2325
import org.hibernate.boot.models.xml.internal.XmlProcessingHelper;
2426
import org.hibernate.boot.models.xml.internal.db.ColumnProcessing;
@@ -56,7 +58,10 @@ public static MutableMemberDetails processAnyMappingAttribute(
5658
declarer
5759
);
5860

59-
final MutableAnnotationUsage<Any> anyAnn = XmlProcessingHelper.makeAnnotation( Any.class, memberDetails, xmlDocumentContext );
61+
final MutableAnnotationUsage<Any> anyAnn = memberDetails.applyAnnotationUsage(
62+
HibernateAnnotations.ANY,
63+
xmlDocumentContext.getModelBuildingContext()
64+
);
6065

6166
CommonAttributeProcessing.applyAttributeBasics( jaxbHbmAnyMapping, memberDetails, anyAnn, accessType, xmlDocumentContext );
6267

@@ -73,7 +78,10 @@ private static void applyDiscriminator(
7378
MutableAnnotationUsage<Any> anyAnn,
7479
XmlDocumentContext xmlDocumentContext) {
7580
final JaxbAnyMappingDiscriminatorImpl jaxbDiscriminator = jaxbHbmAnyMapping.getDiscriminator();
76-
final MutableAnnotationUsage<AnyDiscriminator> anyDiscriminatorAnn = XmlProcessingHelper.makeAnnotation( AnyDiscriminator.class, memberDetails, xmlDocumentContext );
81+
final MutableAnnotationUsage<AnyDiscriminator> anyDiscriminatorAnn = memberDetails.applyAnnotationUsage(
82+
HibernateAnnotations.ANY_DISCRIMINATOR,
83+
xmlDocumentContext.getModelBuildingContext()
84+
);
7785

7886
if ( jaxbDiscriminator == null ) {
7987
return;
@@ -83,29 +91,39 @@ private static void applyDiscriminator(
8391
XmlProcessingHelper.applyAttributeIfSpecified( "value", discriminatorType, anyDiscriminatorAnn );
8492

8593
final JaxbColumnImpl jaxbColumn = jaxbDiscriminator.getColumn();
86-
final MutableAnnotationUsage<Column> columnAnn = XmlProcessingHelper.makeAnnotation( Column.class, memberDetails, xmlDocumentContext );
94+
final MutableAnnotationUsage<Column> columnAnn = memberDetails.applyAnnotationUsage(
95+
JpaAnnotations.COLUMN,
96+
xmlDocumentContext.getModelBuildingContext()
97+
);
8798
if ( jaxbColumn != null ) {
8899
ColumnProcessing.applyColumnDetails( jaxbColumn, memberDetails, columnAnn, xmlDocumentContext );
89100
}
90101

102+
final ClassDetailsRegistry classDetailsRegistry = xmlDocumentContext.getModelBuildingContext().getClassDetailsRegistry();
91103
final List<JaxbAnyDiscriminatorValueMappingImpl> valueMappings = jaxbDiscriminator.getValueMappings();
92104
if ( CollectionHelper.isNotEmpty( valueMappings ) ) {
93-
final MutableAnnotationUsage<AnyDiscriminatorValues> valuesAnn = XmlProcessingHelper.makeAnnotation( AnyDiscriminatorValues.class, memberDetails, xmlDocumentContext );
105+
final MutableAnnotationUsage<AnyDiscriminatorValues> discriminatorValuesUsage = memberDetails.applyAnnotationUsage(
106+
HibernateAnnotations.ANY_DISCRIMINATOR_VALUES,
107+
xmlDocumentContext.getModelBuildingContext()
108+
);
94109
final List<MutableAnnotationUsage<AnyDiscriminatorValue>> valueList = CollectionHelper.arrayList( valueMappings.size() );
95-
final ClassDetailsRegistry classDetailsRegistry = xmlDocumentContext.getModelBuildingContext().getClassDetailsRegistry();
96-
valuesAnn.setAttributeValue( "value", valueList );
110+
discriminatorValuesUsage.setAttributeValue( "value", valueList );
111+
97112
valueMappings.forEach( (valueMapping) -> {
98-
final MutableAnnotationUsage<AnyDiscriminatorValue> valueAnn = XmlProcessingHelper.makeNestedAnnotation( AnyDiscriminatorValue.class, memberDetails, xmlDocumentContext );
99-
valueList.add( valueAnn );
113+
final MutableAnnotationUsage<AnyDiscriminatorValue> discriminatorValueUsage = HibernateAnnotations.ANY_DISCRIMINATOR_VALUE.createUsage(
114+
null,
115+
xmlDocumentContext.getModelBuildingContext()
116+
);
117+
valueList.add( discriminatorValueUsage );
100118

101-
valueAnn.setAttributeValue( "discriminator", valueMapping.getDiscriminatorValue() );
119+
discriminatorValueUsage.setAttributeValue( "discriminator", valueMapping.getDiscriminatorValue() );
102120

103121
final String name = StringHelper.qualifyConditionally(
104122
xmlDocumentContext.getXmlDocument().getDefaults().getPackage(),
105123
valueMapping.getCorrespondingEntityName()
106124
);
107125
final ClassDetails entityClassDetails = classDetailsRegistry.resolveClassDetails( name );
108-
valueAnn.setAttributeValue( "entity", entityClassDetails );
126+
discriminatorValueUsage.setAttributeValue( "entity", entityClassDetails );
109127
} );
110128
}
111129
}
@@ -117,22 +135,31 @@ private static void applyKey(
117135
XmlDocumentContext xmlDocumentContext) {
118136
final JaxbAnyMappingKeyImpl jaxbKey = jaxbHbmAnyMapping.getKey();
119137
if ( StringHelper.isNotEmpty( jaxbKey.getType() ) ) {
120-
final MutableAnnotationUsage<AnyKeyType> keyTypeAnn = XmlProcessingHelper.makeAnnotation( AnyKeyType.class, memberDetails, xmlDocumentContext );
121-
keyTypeAnn.setAttributeValue( "value", jaxbKey.getType() );
138+
final MutableAnnotationUsage<AnyKeyType> keyTypeUsage = memberDetails.applyAnnotationUsage(
139+
HibernateAnnotations.ANY_KEY_TYPE,
140+
xmlDocumentContext.getModelBuildingContext()
141+
);
142+
keyTypeUsage.setAttributeValue( "value", jaxbKey.getType() );
122143
}
123144

124145
if ( jaxbKey.getColumns().isEmpty() ) {
125-
XmlProcessingHelper.makeAnnotation( JoinColumn.class, memberDetails, xmlDocumentContext );
146+
memberDetails.applyAnnotationUsage( JpaAnnotations.JOIN_COLUMN, xmlDocumentContext.getModelBuildingContext() );
126147
}
127148
else {
128-
final MutableAnnotationUsage<JoinColumns> columnsAnn = XmlProcessingHelper.makeAnnotation( JoinColumns.class, memberDetails, xmlDocumentContext );
149+
final MutableAnnotationUsage<JoinColumns> joinColumnsUsage = memberDetails.applyAnnotationUsage(
150+
JpaAnnotations.JOIN_COLUMNS,
151+
xmlDocumentContext.getModelBuildingContext()
152+
);
129153
final ArrayList<MutableAnnotationUsage<JoinColumn>> columnAnnList = CollectionHelper.arrayList( jaxbKey.getColumns().size() );
130-
columnsAnn.setAttributeValue( "value", columnAnnList );
154+
joinColumnsUsage.setAttributeValue( "value", columnAnnList );
131155
jaxbKey.getColumns().forEach( (jaxbColumn) -> {
132-
final MutableAnnotationUsage<JoinColumn> columnAnn = XmlProcessingHelper.makeNestedAnnotation( JoinColumn.class, memberDetails, xmlDocumentContext );
133-
columnAnnList.add( columnAnn );
156+
final MutableAnnotationUsage<JoinColumn> joinColumnUsage = JpaAnnotations.JOIN_COLUMN.createUsage(
157+
null,
158+
xmlDocumentContext.getModelBuildingContext()
159+
);
160+
columnAnnList.add( joinColumnUsage );
134161

135-
ColumnProcessing.applyColumnDetails( jaxbColumn, memberDetails, columnAnn, xmlDocumentContext );
162+
ColumnProcessing.applyColumnDetails( jaxbColumn, memberDetails, joinColumnUsage, xmlDocumentContext );
136163
} );
137164
}
138165
}

‎hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/BasicAttributeProcessing.java‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88

99
import org.hibernate.annotations.Formula;
1010
import org.hibernate.boot.jaxb.mapping.spi.JaxbBasicImpl;
11+
import org.hibernate.boot.models.HibernateAnnotations;
12+
import org.hibernate.boot.models.JpaAnnotations;
1113
import org.hibernate.boot.models.xml.internal.XmlAnnotationHelper;
1214
import org.hibernate.boot.models.xml.internal.XmlProcessingHelper;
1315
import org.hibernate.boot.models.xml.internal.db.ColumnProcessing;
@@ -40,16 +42,25 @@ public static MutableMemberDetails processBasicAttribute(
4042
declarer
4143
);
4244

43-
final MutableAnnotationUsage<Basic> basicAnn = XmlProcessingHelper.getOrMakeAnnotation( Basic.class, memberDetails, xmlDocumentContext );
45+
final MutableAnnotationUsage<Basic> basicAnn = memberDetails.applyAnnotationUsage(
46+
JpaAnnotations.BASIC,
47+
xmlDocumentContext.getModelBuildingContext()
48+
);
4449
CommonAttributeProcessing.applyAttributeBasics( jaxbBasic, memberDetails, basicAnn, accessType, xmlDocumentContext );
4550

4651
if ( StringHelper.isNotEmpty( jaxbBasic.getFormula() ) ) {
4752
assert jaxbBasic.getColumn() == null;
48-
final MutableAnnotationUsage<Formula> formulaAnn = XmlProcessingHelper.getOrMakeAnnotation( Formula.class, memberDetails, xmlDocumentContext );
53+
final MutableAnnotationUsage<Formula> formulaAnn = memberDetails.applyAnnotationUsage(
54+
HibernateAnnotations.FORMULA,
55+
xmlDocumentContext.getModelBuildingContext()
56+
);
4957
formulaAnn.setAttributeValue( "value", jaxbBasic.getFormula() );
5058
}
5159
else if ( jaxbBasic.getColumn() != null ) {
52-
final MutableAnnotationUsage<Column> columnAnn = XmlProcessingHelper.getOrMakeAnnotation( Column.class, memberDetails, xmlDocumentContext );
60+
final MutableAnnotationUsage<Column> columnAnn = memberDetails.applyAnnotationUsage(
61+
JpaAnnotations.COLUMN,
62+
xmlDocumentContext.getModelBuildingContext()
63+
);
5364
ColumnProcessing.applyColumnDetails( jaxbBasic.getColumn(), memberDetails, columnAnn, xmlDocumentContext );
5465
}
5566

‎hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/BasicIdAttributeProcessing.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@
77
package org.hibernate.boot.models.xml.internal.attr;
88

99
import org.hibernate.boot.jaxb.mapping.spi.JaxbIdImpl;
10+
import org.hibernate.boot.models.JpaAnnotations;
1011
import org.hibernate.boot.models.xml.internal.XmlAnnotationHelper;
1112
import org.hibernate.boot.models.xml.internal.XmlProcessingHelper;
1213
import org.hibernate.boot.models.xml.spi.XmlDocumentContext;
14+
import org.hibernate.models.spi.MutableAnnotationUsage;
1315
import org.hibernate.models.spi.MutableClassDetails;
1416
import org.hibernate.models.spi.MutableMemberDetails;
15-
import org.hibernate.models.spi.MutableAnnotationUsage;
1617

1718
import jakarta.persistence.AccessType;
1819
import jakarta.persistence.Basic;
19-
import jakarta.persistence.Id;
2020

2121
import static org.hibernate.internal.util.NullnessHelper.coalesce;
2222

@@ -37,8 +37,8 @@ public static MutableMemberDetails processBasicIdAttribute(
3737
declarer
3838
);
3939

40-
final MutableAnnotationUsage<Id> idAnn = XmlProcessingHelper.makeAnnotation( Id.class, memberDetails, xmlDocumentContext );
41-
final MutableAnnotationUsage<Basic> basicAnn = XmlProcessingHelper.makeAnnotation( Basic.class, memberDetails, xmlDocumentContext );
40+
memberDetails.applyAnnotationUsage( JpaAnnotations.ID, xmlDocumentContext.getModelBuildingContext() );
41+
final MutableAnnotationUsage<Basic> basicAnn = memberDetails.applyAnnotationUsage( JpaAnnotations.BASIC, xmlDocumentContext.getModelBuildingContext() );
4242

4343
CommonAttributeProcessing.applyAttributeBasics( jaxbId, memberDetails, basicAnn, accessType, xmlDocumentContext );
4444

‎hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/CommonAttributeProcessing.java‎

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
import org.hibernate.boot.jaxb.mapping.spi.JaxbSingularFetchModeImpl;
2020
import org.hibernate.boot.jaxb.mapping.spi.JaxbStandardAttribute;
2121
import org.hibernate.boot.jaxb.mapping.spi.JaxbTransientImpl;
22+
import org.hibernate.boot.models.HibernateAnnotations;
23+
import org.hibernate.boot.models.JpaAnnotations;
24+
import org.hibernate.boot.models.xml.internal.XmlAnnotationHelper;
2225
import org.hibernate.boot.models.xml.internal.XmlProcessingHelper;
2326
import org.hibernate.boot.models.xml.spi.XmlDocumentContext;
2427
import org.hibernate.models.spi.ClassDetails;
@@ -29,9 +32,6 @@
2932
import jakarta.persistence.Access;
3033
import jakarta.persistence.AccessType;
3134
import jakarta.persistence.FetchType;
32-
import jakarta.persistence.Transient;
33-
34-
import static org.hibernate.internal.util.NullnessHelper.coalesce;
3535

3636
/**
3737
* @author Steve Ebersole
@@ -61,7 +61,10 @@ public static void applyAccess(
6161
AccessType accessType,
6262
MutableMemberDetails memberDetails,
6363
XmlDocumentContext xmlDocumentContext) {
64-
final MutableAnnotationUsage<Access> accessAnn = XmlProcessingHelper.makeAnnotation( Access.class, memberDetails, xmlDocumentContext );
64+
final MutableAnnotationUsage<Access> accessAnn = memberDetails.applyAnnotationUsage(
65+
JpaAnnotations.ACCESS,
66+
xmlDocumentContext.getModelBuildingContext()
67+
);
6568
accessAnn.setAttributeValue( "value", accessType );
6669
}
6770

@@ -74,12 +77,16 @@ public static <A extends Annotation> void applyAttributeAccessor(
7477
return;
7578
}
7679

80+
final MutableAnnotationUsage<AttributeAccessor> accessorAnn = memberDetails.applyAnnotationUsage(
81+
HibernateAnnotations.ATTRIBUTE_ACCESSOR,
82+
xmlDocumentContext.getModelBuildingContext()
83+
);
84+
7785
final ClassDetails strategyClassDetails = xmlDocumentContext
7886
.getModelBuildingContext()
7987
.getClassDetailsRegistry()
8088
.getClassDetails( attributeAccessor );
81-
final MutableAnnotationUsage<AttributeAccessor> accessAnn = XmlProcessingHelper.makeAnnotation( AttributeAccessor.class, memberDetails, xmlDocumentContext );
82-
XmlProcessingHelper.applyAttributeIfSpecified( "strategy", strategyClassDetails, accessAnn );
89+
XmlAnnotationHelper.applyOptionalAttribute( accessorAnn, "strategy", strategyClassDetails );
8390
}
8491

8592
public static <A extends Annotation> void applyOptionality(
@@ -100,7 +107,10 @@ public static <A extends Annotation> void applyOptimisticLock(
100107
MutableMemberDetails memberDetails,
101108
XmlDocumentContext xmlDocumentContext) {
102109
final boolean includeInOptimisticLock = jaxbAttribute.isOptimisticLock();
103-
final MutableAnnotationUsage<OptimisticLock> optLockAnn = XmlProcessingHelper.makeAnnotation( OptimisticLock.class, memberDetails, xmlDocumentContext );
110+
final MutableAnnotationUsage<OptimisticLock> optLockAnn = memberDetails.applyAnnotationUsage(
111+
HibernateAnnotations.OPTIMISTIC_LOCK,
112+
xmlDocumentContext.getModelBuildingContext()
113+
);
104114
optLockAnn.setAttributeValue( "excluded", !includeInOptimisticLock );
105115
}
106116

@@ -128,7 +138,10 @@ private static void applyFetchMode(
128138
XmlDocumentContext xmlDocumentContext) {
129139
if ( jaxbFetchMode != null ) {
130140
final FetchMode fetchMode = FetchMode.valueOf( jaxbFetchMode.value() );
131-
final MutableAnnotationUsage<Fetch> fetchAnn = XmlProcessingHelper.makeAnnotation( Fetch.class, memberDetails, xmlDocumentContext );
141+
final MutableAnnotationUsage<Fetch> fetchAnn = memberDetails.applyAnnotationUsage(
142+
HibernateAnnotations.FETCH,
143+
xmlDocumentContext.getModelBuildingContext()
144+
);
132145
fetchAnn.setAttributeValue( "value", fetchMode );
133146
}
134147
}
@@ -143,6 +156,6 @@ public static void applyTransient(
143156
classAccessType,
144157
declarer
145158
);
146-
XmlProcessingHelper.makeAnnotation( Transient.class, memberDetails, xmlDocumentContext );
159+
memberDetails.applyAnnotationUsage( JpaAnnotations.TRANSIENT, xmlDocumentContext.getModelBuildingContext() );
147160
}
148161
}

0 commit comments

Comments
 (0)