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

HHH-13680 Upgrade to Byte-buddy 1.10.2

This commit is contained in:
Yoann Rodière 2019-10-21 09:26:01 +02:00
parent f39d96f9fa
commit cacef1f466
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gradle/libraries.gradle
View File

@ -23,7 +23,7 @@ ext {
weldVersion = '3.0.0.Final' weldVersion = '3.0.0.Final'
javassistVersion = '3.24.0-GA' javassistVersion = '3.24.0-GA'
byteBuddyVersion = '1.9.11' byteBuddyVersion = '1.10.2'
geolatteVersion = '1.4.0' geolatteVersion = '1.4.0'

2
hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/BiDirectionalAssociationHandler.java
View File

@ -163,7 +163,7 @@ final class BiDirectionalAssociationHandler implements Implementation {
private static TypeDescription.Generic target(AnnotatedFieldDescription persistentField) { private static TypeDescription.Generic target(AnnotatedFieldDescription persistentField) {
AnnotationDescription.Loadable<Access> access = persistentField.getDeclaringType().asErasure().getDeclaredAnnotations().ofType( Access.class ); AnnotationDescription.Loadable<Access> access = persistentField.getDeclaringType().asErasure().getDeclaredAnnotations().ofType( Access.class );
if ( access != null && access.loadSilent().value() == AccessType.FIELD ) { if ( access != null && access.load().value() == AccessType.FIELD ) {
return persistentField.getType(); return persistentField.getType();
} }
else { else {

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

@ -514,7 +514,7 @@ public class EnhancerImpl implements Enhancer {
private AnnotationList doGetAnnotations() { private AnnotationList doGetAnnotations() {
AnnotationDescription.Loadable<Access> access = fieldDescription.getDeclaringType().asErasure() AnnotationDescription.Loadable<Access> access = fieldDescription.getDeclaringType().asErasure()
.getDeclaredAnnotations().ofType( Access.class ); .getDeclaredAnnotations().ofType( Access.class );
if ( access != null && access.loadSilent().value() == AccessType.PROPERTY ) { if ( access != null && access.load().value() == AccessType.PROPERTY ) {
Optional<MethodDescription> getter = getGetter(); Optional<MethodDescription> getter = getGetter();
if ( getter.isPresent() ) { if ( getter.isPresent() ) {
return getter.get().getDeclaredAnnotations(); return getter.get().getDeclaredAnnotations();
@ -523,7 +523,7 @@ public class EnhancerImpl implements Enhancer {
return fieldDescription.getDeclaredAnnotations(); return fieldDescription.getDeclaredAnnotations();
} }
} }
else if ( access != null && access.loadSilent().value() == AccessType.FIELD ) { else if ( access != null && access.load().value() == AccessType.FIELD ) {
return fieldDescription.getDeclaredAnnotations(); return fieldDescription.getDeclaredAnnotations();
} }
else { else {