Skip to content

Commit 0c17ef4

Browse files
committed
HHH-12296 Upgrade to Byte Buddy 1.7.10 to support JDK10
1 parent 9127481 commit 0c17ef4

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

gradle/libraries.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ ext {
2323
weldVersion = '3.0.0.Final'
2424

2525
javassistVersion = '3.22.0-GA'
26-
byteBuddyVersion = '1.6.14' // Improved JDK9 compatibility
26+
byteBuddyVersion = '1.7.10' // Now with JDK10 compatibility
2727

2828
// Wildfly version targeted by module ZIP; Arquillian/Shrinkwrap versions used for CDI testing and testing the module ZIP
2929
wildflyVersion = '11.0.0.Final'

hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/EnhancerImpl.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
import net.bytebuddy.description.field.FieldDescription;
4646
import net.bytebuddy.description.method.MethodDescription;
4747
import net.bytebuddy.description.method.MethodList;
48-
import net.bytebuddy.description.modifier.FieldManifestation;
48+
import net.bytebuddy.description.modifier.FieldPersistence;
4949
import net.bytebuddy.description.modifier.Visibility;
5050
import net.bytebuddy.description.type.TypeDefinition;
5151
import net.bytebuddy.description.type.TypeDescription;
@@ -165,7 +165,7 @@ private DynamicType.Builder<?> doEnhance(DynamicType.Builder<?> builder, TypeDes
165165
if ( enhancementContext.doDirtyCheckingInline( managedCtClass ) ) {
166166
if ( collectCollectionFields( managedCtClass ).isEmpty() ) {
167167
builder = builder.implement( SelfDirtinessTracker.class )
168-
.defineField( EnhancerConstants.TRACKER_FIELD_NAME, DirtyTracker.class, FieldManifestation.TRANSIENT, Visibility.PRIVATE )
168+
.defineField( EnhancerConstants.TRACKER_FIELD_NAME, DirtyTracker.class, FieldPersistence.TRANSIENT, Visibility.PRIVATE )
169169
.annotateField( AnnotationDescription.Builder.ofType( Transient.class ).build() )
170170
.defineMethod( EnhancerConstants.TRACKER_CHANGER_NAME, void.class, Visibility.PUBLIC )
171171
.withParameters( String.class )
@@ -184,9 +184,9 @@ private DynamicType.Builder<?> doEnhance(DynamicType.Builder<?> builder, TypeDes
184184
}
185185
else {
186186
builder = builder.implement( ExtendedSelfDirtinessTracker.class )
187-
.defineField( EnhancerConstants.TRACKER_FIELD_NAME, DirtyTracker.class, FieldManifestation.TRANSIENT, Visibility.PRIVATE )
187+
.defineField( EnhancerConstants.TRACKER_FIELD_NAME, DirtyTracker.class, FieldPersistence.TRANSIENT, Visibility.PRIVATE )
188188
.annotateField( AnnotationDescription.Builder.ofType( Transient.class ).build() )
189-
.defineField( EnhancerConstants.TRACKER_COLLECTION_NAME, CollectionTracker.class, FieldManifestation.TRANSIENT, Visibility.PRIVATE )
189+
.defineField( EnhancerConstants.TRACKER_COLLECTION_NAME, CollectionTracker.class, FieldPersistence.TRANSIENT, Visibility.PRIVATE )
190190
.annotateField( AnnotationDescription.Builder.ofType( Transient.class ).build() )
191191
.defineMethod( EnhancerConstants.TRACKER_CHANGER_NAME, void.class, Visibility.PUBLIC )
192192
.withParameters( String.class )
@@ -271,7 +271,7 @@ else if ( enhancementContext.isCompositeClass( managedCtClass ) ) {
271271
.defineField(
272272
EnhancerConstants.TRACKER_COMPOSITE_FIELD_NAME,
273273
CompositeOwnerTracker.class,
274-
FieldManifestation.TRANSIENT,
274+
FieldPersistence.TRANSIENT,
275275
Visibility.PRIVATE
276276
)
277277
.annotateField( AnnotationDescription.Builder.ofType( Transient.class ).build() )
@@ -344,7 +344,7 @@ private static DynamicType.Builder<?> addFieldWithGetterAndSetter(
344344
String fieldName,
345345
String getterName,
346346
String setterName) {
347-
return builder.defineField( fieldName, type, Visibility.PRIVATE, FieldManifestation.TRANSIENT )
347+
return builder.defineField( fieldName, type, Visibility.PRIVATE, FieldPersistence.TRANSIENT )
348348
.annotateField( AnnotationDescription.Builder.ofType( Transient.class ).build() )
349349
.defineMethod( getterName, type, Visibility.PUBLIC )
350350
.intercept( FieldAccessor.ofField( fieldName ) )

0 commit comments

Comments
 (0)