mirror of
https://github.com/hibernate/hibernate-orm
synced 2025-02-17 00:24:57 +00:00
HHH-12296 Upgrade to Byte Buddy 1.7.10 to support JDK10
This commit is contained in:
parent
91274811b6
commit
0c17ef47b3
@ -23,7 +23,7 @@ ext {
|
||||
weldVersion = '3.0.0.Final'
|
||||
|
||||
javassistVersion = '3.22.0-GA'
|
||||
byteBuddyVersion = '1.6.14' // Improved JDK9 compatibility
|
||||
byteBuddyVersion = '1.7.10' // Now with JDK10 compatibility
|
||||
|
||||
// Wildfly version targeted by module ZIP; Arquillian/Shrinkwrap versions used for CDI testing and testing the module ZIP
|
||||
wildflyVersion = '11.0.0.Final'
|
||||
|
@ -45,7 +45,7 @@
|
||||
import net.bytebuddy.description.field.FieldDescription;
|
||||
import net.bytebuddy.description.method.MethodDescription;
|
||||
import net.bytebuddy.description.method.MethodList;
|
||||
import net.bytebuddy.description.modifier.FieldManifestation;
|
||||
import net.bytebuddy.description.modifier.FieldPersistence;
|
||||
import net.bytebuddy.description.modifier.Visibility;
|
||||
import net.bytebuddy.description.type.TypeDefinition;
|
||||
import net.bytebuddy.description.type.TypeDescription;
|
||||
@ -165,7 +165,7 @@ private DynamicType.Builder<?> doEnhance(DynamicType.Builder<?> builder, TypeDes
|
||||
if ( enhancementContext.doDirtyCheckingInline( managedCtClass ) ) {
|
||||
if ( collectCollectionFields( managedCtClass ).isEmpty() ) {
|
||||
builder = builder.implement( SelfDirtinessTracker.class )
|
||||
.defineField( EnhancerConstants.TRACKER_FIELD_NAME, DirtyTracker.class, FieldManifestation.TRANSIENT, Visibility.PRIVATE )
|
||||
.defineField( EnhancerConstants.TRACKER_FIELD_NAME, DirtyTracker.class, FieldPersistence.TRANSIENT, Visibility.PRIVATE )
|
||||
.annotateField( AnnotationDescription.Builder.ofType( Transient.class ).build() )
|
||||
.defineMethod( EnhancerConstants.TRACKER_CHANGER_NAME, void.class, Visibility.PUBLIC )
|
||||
.withParameters( String.class )
|
||||
@ -184,9 +184,9 @@ private DynamicType.Builder<?> doEnhance(DynamicType.Builder<?> builder, TypeDes
|
||||
}
|
||||
else {
|
||||
builder = builder.implement( ExtendedSelfDirtinessTracker.class )
|
||||
.defineField( EnhancerConstants.TRACKER_FIELD_NAME, DirtyTracker.class, FieldManifestation.TRANSIENT, Visibility.PRIVATE )
|
||||
.defineField( EnhancerConstants.TRACKER_FIELD_NAME, DirtyTracker.class, FieldPersistence.TRANSIENT, Visibility.PRIVATE )
|
||||
.annotateField( AnnotationDescription.Builder.ofType( Transient.class ).build() )
|
||||
.defineField( EnhancerConstants.TRACKER_COLLECTION_NAME, CollectionTracker.class, FieldManifestation.TRANSIENT, Visibility.PRIVATE )
|
||||
.defineField( EnhancerConstants.TRACKER_COLLECTION_NAME, CollectionTracker.class, FieldPersistence.TRANSIENT, Visibility.PRIVATE )
|
||||
.annotateField( AnnotationDescription.Builder.ofType( Transient.class ).build() )
|
||||
.defineMethod( EnhancerConstants.TRACKER_CHANGER_NAME, void.class, Visibility.PUBLIC )
|
||||
.withParameters( String.class )
|
||||
@ -271,7 +271,7 @@ else if ( enhancementContext.isCompositeClass( managedCtClass ) ) {
|
||||
.defineField(
|
||||
EnhancerConstants.TRACKER_COMPOSITE_FIELD_NAME,
|
||||
CompositeOwnerTracker.class,
|
||||
FieldManifestation.TRANSIENT,
|
||||
FieldPersistence.TRANSIENT,
|
||||
Visibility.PRIVATE
|
||||
)
|
||||
.annotateField( AnnotationDescription.Builder.ofType( Transient.class ).build() )
|
||||
@ -344,7 +344,7 @@ private static DynamicType.Builder<?> addFieldWithGetterAndSetter(
|
||||
String fieldName,
|
||||
String getterName,
|
||||
String setterName) {
|
||||
return builder.defineField( fieldName, type, Visibility.PRIVATE, FieldManifestation.TRANSIENT )
|
||||
return builder.defineField( fieldName, type, Visibility.PRIVATE, FieldPersistence.TRANSIENT )
|
||||
.annotateField( AnnotationDescription.Builder.ofType( Transient.class ).build() )
|
||||
.defineMethod( getterName, type, Visibility.PUBLIC )
|
||||
.intercept( FieldAccessor.ofField( fieldName ) )
|
||||
|
Loading…
x
Reference in New Issue
Block a user