Hibernate/hibernate-orm
1
0
Fork 0
mirror of https://github.com/hibernate/hibernate-orm synced 2025-02-27 22:39:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

HHH-13833 Replace references to Opcodes.ASM7 with OpenedClassReader.ASM_API

Browse Source
This commit is contained in:
Sanne Grinovero 2020-01-30 09:02:43 +00:00
parent 3eb49972f3
commit f7aba3ea17
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,6 +18,7 @@
import javax.persistence.OneToMany; import javax.persistence.OneToMany;
import javax.persistence.OneToOne; import javax.persistence.OneToOne;
import net.bytebuddy.utility.OpenedClassReader;
import org.hibernate.bytecode.enhance.internal.bytebuddy.EnhancerImpl.AnnotatedFieldDescription; import org.hibernate.bytecode.enhance.internal.bytebuddy.EnhancerImpl.AnnotatedFieldDescription;
import org.hibernate.bytecode.enhance.spi.EnhancementException; import org.hibernate.bytecode.enhance.spi.EnhancementException;
import org.hibernate.bytecode.enhance.spi.EnhancerConstants; import org.hibernate.bytecode.enhance.spi.EnhancerConstants;
@ -296,7 +297,7 @@ private WrappingAppender(ByteCodeAppender delegate) {
@Override @Override
public Size apply( public Size apply(
MethodVisitor methodVisitor, Context implementationContext, MethodDescription instrumentedMethod) { MethodVisitor methodVisitor, Context implementationContext, MethodDescription instrumentedMethod) {
return delegate.apply( new MethodVisitor( Opcodes.ASM7, methodVisitor ) { return delegate.apply( new MethodVisitor( OpenedClassReader.ASM_API, methodVisitor ) {
@Override @Override
public void visitMethodInsn(int opcode, String owner, String name, String desc, boolean itf) { public void visitMethodInsn(int opcode, String owner, String name, String desc, boolean itf) {

3
hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/FieldAccessEnhancer.java
View File

@ -11,6 +11,7 @@
import javax.persistence.Id; import javax.persistence.Id;
import net.bytebuddy.utility.OpenedClassReader;
import org.hibernate.bytecode.enhance.internal.bytebuddy.EnhancerImpl.AnnotatedFieldDescription; import org.hibernate.bytecode.enhance.internal.bytebuddy.EnhancerImpl.AnnotatedFieldDescription;
import org.hibernate.bytecode.enhance.spi.EnhancementException; import org.hibernate.bytecode.enhance.spi.EnhancementException;
import org.hibernate.bytecode.enhance.spi.EnhancerConstants; import org.hibernate.bytecode.enhance.spi.EnhancerConstants;
@ -54,7 +55,7 @@ public MethodVisitor wrap(
TypePool typePool, TypePool typePool,
int writerFlags, int writerFlags,
int readerFlags) { int readerFlags) {
return new MethodVisitor( Opcodes.ASM7, methodVisitor ) { return new MethodVisitor( OpenedClassReader.ASM_API, methodVisitor ) {
@Override @Override
public void visitFieldInsn(int opcode, String owner, String name, String desc) { public void visitFieldInsn(int opcode, String owner, String name, String desc) {
if ( opcode != Opcodes.GETFIELD && opcode != Opcodes.PUTFIELD ) { if ( opcode != Opcodes.GETFIELD && opcode != Opcodes.PUTFIELD ) {

3
hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/PersistentAttributeTransformer.java
View File

@ -18,6 +18,7 @@
import javax.persistence.Embedded; import javax.persistence.Embedded;
import net.bytebuddy.utility.OpenedClassReader;
import org.hibernate.bytecode.enhance.internal.bytebuddy.EnhancerImpl.AnnotatedFieldDescription; import org.hibernate.bytecode.enhance.internal.bytebuddy.EnhancerImpl.AnnotatedFieldDescription;
import org.hibernate.bytecode.enhance.spi.EnhancerConstants; import org.hibernate.bytecode.enhance.spi.EnhancerConstants;
import org.hibernate.engine.spi.CompositeOwner; import org.hibernate.engine.spi.CompositeOwner;
@ -134,7 +135,7 @@ public MethodVisitor wrap(
TypePool typePool, TypePool typePool,
int writerFlags, int writerFlags,
int readerFlags) { int readerFlags) {
return new MethodVisitor( Opcodes.ASM7, methodVisitor ) { return new MethodVisitor( OpenedClassReader.ASM_API, methodVisitor ) {
@Override @Override
public void visitFieldInsn(int opcode, String owner, String name, String desc) { public void visitFieldInsn(int opcode, String owner, String name, String desc) {
if ( isEnhanced( owner, name, desc ) ) { if ( isEnhanced( owner, name, desc ) ) {