From 708c0a27ba31f2f14dc2726ae00ae5d42fceaa50 Mon Sep 17 00:00:00 2001 From: Rafael Winterhalter Date: Tue, 14 Apr 2015 21:15:46 +0200 Subject: [PATCH] Further renaming. --- README.md | 8 +- .../bytebuddy/agent/builder/AgentBuilder.java | 2 +- .../dynamic/scaffold/InstrumentedType.java | 6 +- .../dynamic/scaffold/MethodRegistry.java | 42 +++++------ .../dynamic/scaffold/TypeWriter.java | 74 +++++++++---------- .../inline/RebaseImplementationTarget.java | 4 +- .../implementation/DefaultMethodCall.java | 4 +- .../implementation/ExceptionMethod.java | 4 +- .../implementation/FieldAccessor.java | 26 +++---- .../bytebuddy/implementation/FixedValue.java | 14 ++-- .../bytebuddy/implementation/Forwarding.java | 4 +- .../implementation/Implementation.java | 26 +++---- .../InvocationHandlerAdapter.java | 14 ++-- .../implementation/InvokeDynamic.java | 4 +- .../bytebuddy/implementation/MethodCall.java | 4 +- .../implementation/MethodDelegation.java | 4 +- .../bytebuddy/implementation/StubMethod.java | 4 +- .../implementation/SuperMethodCall.java | 4 +- .../auxiliary/MethodCallProxy.java | 14 ++-- .../implementation/auxiliary/TypeProxy.java | 32 ++++---- .../bind/MethodDelegationBinder.java | 20 ++--- .../bind/annotation/FieldProxy.java | 18 ++--- .../implementation/bind/annotation/Morph.java | 14 ++-- .../implementation/bind/annotation/Pipe.java | 14 ++-- .../bytecode/ByteCodeAppender.java | 12 +-- .../implementation/bytecode/Duplication.java | 4 +- .../implementation/bytecode/Removal.java | 4 +- .../bytecode/StackManipulation.java | 12 +-- .../implementation/bytecode/Throw.java | 2 +- .../implementation/bytecode/TypeCreation.java | 2 +- .../bytecode/assign/TypeCasting.java | 2 +- .../primitive/PrimitiveBoxingDelegate.java | 4 +- .../primitive/PrimitiveUnboxingDelegate.java | 2 +- .../primitive/PrimitiveWideningDelegate.java | 2 +- .../bytecode/collection/ArrayAccess.java | 4 +- .../bytecode/collection/ArrayFactory.java | 14 ++-- .../bytecode/constant/ClassConstant.java | 4 +- .../bytecode/constant/DefaultValue.java | 4 +- .../bytecode/constant/DoubleConstant.java | 4 +- .../bytecode/constant/FloatConstant.java | 4 +- .../bytecode/constant/IntegerConstant.java | 8 +- .../bytecode/constant/LongConstant.java | 4 +- .../bytecode/constant/MethodConstant.java | 14 ++-- .../constant/MethodHandleConstant.java | 2 +- .../bytecode/constant/MethodTypeConstant.java | 2 +- .../bytecode/constant/NullConstant.java | 2 +- .../bytecode/constant/TextConstant.java | 2 +- .../bytecode/member/FieldAccess.java | 2 +- .../bytecode/member/MethodInvocation.java | 8 +- .../bytecode/member/MethodReturn.java | 2 +- .../bytecode/member/MethodVariableAccess.java | 2 +- release-notes.md | 24 +++--- 52 files changed, 256 insertions(+), 256 deletions(-) diff --git a/README.md b/README.md index 5c4387ecec1..d43f289ee95 100644 --- a/README.md +++ b/README.md @@ -68,7 +68,7 @@ class and which can be easily composed. The creation of custom matchers is howev For implementing the `toString` method, the `FixedValue` class defines a constant return value for the overridden method. Defining a constant value is only one example of many method interceptors that ship with Byte Buddy. By -implementing the `Instrumentation` interface, a method could however even be defined by custom byte code. +implementing the `Implementation` interface, a method could however even be defined by custom byte code. Finally, the described Java class is created and then loaded into the Java virtual machine. For this purpose, a target class loader is required as well as a class loading strategy where we choose a wrapper strategy. The latter creates a @@ -84,10 +84,10 @@ In reality, a user of such a library wants to perform more complex manipulations logic to a compiled Java program. Using Byte Buddy, doing so is however not much harder and the following example gives a taste of how method calls can be intercepted. -Byte Buddy describes method implementations by instances of the `Instrumentation` interface such as `FixedValue` which +Byte Buddy describes method implementations by instances of the `Implementation` interface such as `FixedValue` which we used in the above example. By implementing this interface, a user of Byte Buddy can go to the length of defining custom byte code for a method. Normally, it is however easier to use Byte Buddy's `MethodDelegation` which allows -to implement an intercepted method in plain Java. Using this instrumentation is straight forward as it operates on any +to implement an intercepted method in plain Java. Using this implementation is straight forward as it operates on any POJO. For example, we can implement the `Comparator` interface by defining the following class which mimics the signature of the `Comparator:compare` method we want to implement later: @@ -166,7 +166,7 @@ Byte Buddy is written on top of [ASM](http://asm.ow2.org/), a mature and well-te compiled Java classes. In order to allow for advanced type manipulations, Byte Buddy is intentionally exposing the ASM API to its users. Of course, the direct use of ASM remains fully optional and most users will most likely never require it. This choice was made such that a user of Byte Buddy is not restrained to its higher-level functionality -but can implement custom instrumentations without a fuzz when it is necessary. +but can implement custom implementations without a fuzz when it is necessary. However, this imposes one possible problem when relying onto Byte Buddy as a project dependency and making use of the exposed ASM API. The authors of ASM require their users to diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/agent/builder/AgentBuilder.java b/byte-buddy-dep/src/main/java/net/bytebuddy/agent/builder/AgentBuilder.java index 626a7ee7382..21566c561ce 100644 --- a/byte-buddy-dep/src/main/java/net/bytebuddy/agent/builder/AgentBuilder.java +++ b/byte-buddy-dep/src/main/java/net/bytebuddy/agent/builder/AgentBuilder.java @@ -1112,7 +1112,7 @@ public ByteCodeAppender appender(Target implementationTarget) { } @Override - public Size apply(MethodVisitor methodVisitor, Context instrumentationContext, MethodDescription instrumentedMethod) { + public Size apply(MethodVisitor methodVisitor, Context implementationContext, MethodDescription instrumentedMethod) { throw new IllegalStateException("Initialization strategy illegally applied to " + instrumentedMethod); } diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/dynamic/scaffold/InstrumentedType.java b/byte-buddy-dep/src/main/java/net/bytebuddy/dynamic/scaffold/InstrumentedType.java index 3ff020d0fce..3c430aef141 100644 --- a/byte-buddy-dep/src/main/java/net/bytebuddy/dynamic/scaffold/InstrumentedType.java +++ b/byte-buddy-dep/src/main/java/net/bytebuddy/dynamic/scaffold/InstrumentedType.java @@ -156,7 +156,7 @@ public boolean isValid() { } @Override - public Size apply(MethodVisitor methodVisitor, Implementation.Context instrumentationContext) { + public Size apply(MethodVisitor methodVisitor, Implementation.Context implementationContext) { throw new IllegalStateException("Cannot apply non-defined type initializer"); } @@ -207,8 +207,8 @@ public boolean isValid() { } @Override - public Size apply(MethodVisitor methodVisitor, Implementation.Context instrumentationContext) { - return stackManipulation.apply(methodVisitor, instrumentationContext); + public Size apply(MethodVisitor methodVisitor, Implementation.Context implementationContext) { + return stackManipulation.apply(methodVisitor, implementationContext); } @Override diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/dynamic/scaffold/MethodRegistry.java b/byte-buddy-dep/src/main/java/net/bytebuddy/dynamic/scaffold/MethodRegistry.java index 84f8611f07d..82423052959 100644 --- a/byte-buddy-dep/src/main/java/net/bytebuddy/dynamic/scaffold/MethodRegistry.java +++ b/byte-buddy-dep/src/main/java/net/bytebuddy/dynamic/scaffold/MethodRegistry.java @@ -545,7 +545,7 @@ protected static class Prepared implements MethodRegistry.Prepared { /** * A map of all method descriptions mapped to their handling entires. */ - private final Map instrumentations; + private final Map implementations; /** * The loaded type initializer of the instrumented type. @@ -565,16 +565,16 @@ protected static class Prepared implements MethodRegistry.Prepared { /** * Creates a prepared version of a default method registry. * - * @param instrumentations A map of all method descriptions mapped to their handling entires. + * @param implementations A map of all method descriptions mapped to their handling entires. * @param loadedTypeInitializer The loaded type initializer of the instrumented type. * @param typeInitializer The type intiailizer of the instrumented type. * @param finding The analyzed instrumented type. */ - public Prepared(Map instrumentations, + public Prepared(Map implementations, LoadedTypeInitializer loadedTypeInitializer, InstrumentedType.TypeInitializer typeInitializer, MethodLookupEngine.Finding finding) { - this.instrumentations = instrumentations; + this.implementations = implementations; this.loadedTypeInitializer = loadedTypeInitializer; this.typeInitializer = typeInitializer; this.finding = finding; @@ -597,16 +597,16 @@ public InstrumentedType.TypeInitializer getTypeInitializer() { @Override public MethodList getInstrumentedMethods() { - return new MethodList.Explicit(new ArrayList(instrumentations.keySet())).filter(not(isTypeInitializer())); + return new MethodList.Explicit(new ArrayList(implementations.keySet())).filter(not(isTypeInitializer())); } @Override public MethodRegistry.Compiled compile(Implementation.Target.Factory implementationTargetFactory) { - Map compilationCache = new HashMap(instrumentations.size()); - Map attributeAppenderCache = new HashMap(instrumentations.size()); - Map entries = new HashMap(instrumentations.size()); + Map compilationCache = new HashMap(implementations.size()); + Map attributeAppenderCache = new HashMap(implementations.size()); + Map entries = new HashMap(implementations.size()); Implementation.Target implementationTarget = implementationTargetFactory.make(finding, getInstrumentedMethods()); - for (Map.Entry entry : instrumentations.entrySet()) { + for (Map.Entry entry : implementations.entrySet()) { Handler.Compiled cachedEntry = compilationCache.get(entry.getValue().getHandler()); if (cachedEntry == null) { cachedEntry = entry.getValue().getHandler().compile(implementationTarget); @@ -627,7 +627,7 @@ public boolean equals(Object other) { if (this == other) return true; if (other == null || getClass() != other.getClass()) return false; Prepared prepared = (Prepared) other; - return instrumentations.equals(prepared.instrumentations) + return implementations.equals(prepared.implementations) && loadedTypeInitializer.equals(prepared.loadedTypeInitializer) && typeInitializer.equals(prepared.typeInitializer) && finding.equals(prepared.finding); @@ -635,7 +635,7 @@ public boolean equals(Object other) { @Override public int hashCode() { - int result = instrumentations.hashCode(); + int result = implementations.hashCode(); result = 31 * result + loadedTypeInitializer.hashCode(); result = 31 * result + typeInitializer.hashCode(); result = 31 * result + finding.hashCode(); @@ -645,7 +645,7 @@ public int hashCode() { @Override public String toString() { return "MethodRegistry.Default.Prepared{" + - "instrumentations=" + instrumentations + + "implementations=" + implementations + ", loadedTypeInitializer=" + loadedTypeInitializer + ", typeInitializer=" + typeInitializer + ", finding=" + finding + @@ -676,7 +676,7 @@ protected static class Compiled implements MethodRegistry.Compiled { /** * A map of all method descriptions mapped to their handling entries. */ - private final Map instrumentations; + private final Map implementations; /** * Creates a new compiled version of a default method registry. @@ -684,16 +684,16 @@ protected static class Compiled implements MethodRegistry.Compiled { * @param instrumentedType The instrumented type. * @param loadedTypeInitializer The loaded type initializer of the instrumented type. * @param typeInitializer The type initializer of the instrumented type. - * @param instrumentations A map of all method descriptions mapped to their handling entries. + * @param implementations A map of all method descriptions mapped to their handling entries. */ public Compiled(TypeDescription instrumentedType, LoadedTypeInitializer loadedTypeInitializer, InstrumentedType.TypeInitializer typeInitializer, - Map instrumentations) { + Map implementations) { this.instrumentedType = instrumentedType; this.loadedTypeInitializer = loadedTypeInitializer; this.typeInitializer = typeInitializer; - this.instrumentations = instrumentations; + this.implementations = implementations; } @Override @@ -713,12 +713,12 @@ public InstrumentedType.TypeInitializer getTypeInitializer() { @Override public MethodList getInstrumentedMethods() { - return new MethodList.Explicit(new ArrayList(instrumentations.keySet())).filter(not(isTypeInitializer())); + return new MethodList.Explicit(new ArrayList(implementations.keySet())).filter(not(isTypeInitializer())); } @Override public Entry target(MethodDescription methodDescription) { - Entry entry = instrumentations.get(methodDescription); + Entry entry = implementations.get(methodDescription); return entry == null ? Entry.ForSkippedMethod.INSTANCE : entry; @@ -732,7 +732,7 @@ public boolean equals(Object other) { return instrumentedType.equals(compiled.instrumentedType) && loadedTypeInitializer.equals(compiled.loadedTypeInitializer) && typeInitializer.equals(compiled.typeInitializer) - && instrumentations.equals(compiled.instrumentations); + && implementations.equals(compiled.implementations); } @Override @@ -740,7 +740,7 @@ public int hashCode() { int result = instrumentedType.hashCode(); result = 31 * result + loadedTypeInitializer.hashCode(); result = 31 * result + typeInitializer.hashCode(); - result = 31 * result + instrumentations.hashCode(); + result = 31 * result + implementations.hashCode(); return result; } @@ -750,7 +750,7 @@ public String toString() { "instrumentedType=" + instrumentedType + ", loadedTypeInitializer=" + loadedTypeInitializer + ", typeInitializer=" + typeInitializer + - ", instrumentations=" + instrumentations + + ", implementations=" + implementations + '}'; } } diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/dynamic/scaffold/TypeWriter.java b/byte-buddy-dep/src/main/java/net/bytebuddy/dynamic/scaffold/TypeWriter.java index db9a322afff..2e4909ff85f 100644 --- a/byte-buddy-dep/src/main/java/net/bytebuddy/dynamic/scaffold/TypeWriter.java +++ b/byte-buddy-dep/src/main/java/net/bytebuddy/dynamic/scaffold/TypeWriter.java @@ -249,10 +249,10 @@ interface Entry { * Applies this method entry. This method can always be called and might be a no-op. * * @param classVisitor The class visitor to which this entry should be applied. - * @param instrumentationContext The instrumentation context to which this entry should be applied. + * @param implementationContext The instrumentation context to which this entry should be applied. * @param methodDescription The method description of the instrumented method. */ - void apply(ClassVisitor classVisitor, Implementation.Context instrumentationContext, MethodDescription methodDescription); + void apply(ClassVisitor classVisitor, Implementation.Context implementationContext, MethodDescription methodDescription); /** * Applies the head of this entry. Applying an entry is only possible if a method is defined, i.e. the sort of this entry is not @@ -268,10 +268,10 @@ interface Entry { * entry is {@link net.bytebuddy.dynamic.scaffold.TypeWriter.MethodPool.Entry.Sort#IMPLEMENT}. * * @param methodVisitor The method visitor to which this entry should be applied. - * @param instrumentationContext The instrumentation context to which this entry should be applied. + * @param implementationContext The instrumentation context to which this entry should be applied. * @param methodDescription The method description of the instrumented method. */ - void applyBody(MethodVisitor methodVisitor, Implementation.Context instrumentationContext, MethodDescription methodDescription); + void applyBody(MethodVisitor methodVisitor, Implementation.Context implementationContext, MethodDescription methodDescription); /** * The sort of an entry. @@ -344,7 +344,7 @@ public String toString() { abstract class AbstractDefiningEntry implements Entry { @Override - public void apply(ClassVisitor classVisitor, Implementation.Context instrumentationContext, MethodDescription methodDescription) { + public void apply(ClassVisitor classVisitor, Implementation.Context implementationContext, MethodDescription methodDescription) { MethodVisitor methodVisitor = classVisitor.visitMethod(methodDescription.getAdjustedModifiers(getSort().isImplemented()), methodDescription.getInternalName(), methodDescription.getDescriptor(), @@ -357,7 +357,7 @@ public void apply(ClassVisitor classVisitor, Implementation.Context instrumentat } } applyHead(methodVisitor, methodDescription); - applyBody(methodVisitor, instrumentationContext, methodDescription); + applyBody(methodVisitor, implementationContext, methodDescription); methodVisitor.visitEnd(); } } @@ -374,14 +374,14 @@ enum ForSkippedMethod implements Entry { @Override public void apply(ClassVisitor classVisitor, - Implementation.Context instrumentationContext, + Implementation.Context implementationContext, MethodDescription methodDescription) { /* do nothing */ } @Override public void applyBody(MethodVisitor methodVisitor, - Implementation.Context instrumentationContext, + Implementation.Context implementationContext, MethodDescription methodDescription) { throw new IllegalStateException("Cannot apply headless implementation for method that should be skipped"); } @@ -439,10 +439,10 @@ public void applyHead(MethodVisitor methodVisitor, MethodDescription methodDescr } @Override - public void applyBody(MethodVisitor methodVisitor, Implementation.Context instrumentationContext, MethodDescription methodDescription) { + public void applyBody(MethodVisitor methodVisitor, Implementation.Context implementationContext, MethodDescription methodDescription) { methodAttributeAppender.apply(methodVisitor, methodDescription); methodVisitor.visitCode(); - ByteCodeAppender.Size size = byteCodeAppender.apply(methodVisitor, instrumentationContext, methodDescription); + ByteCodeAppender.Size size = byteCodeAppender.apply(methodVisitor, implementationContext, methodDescription); methodVisitor.visitMaxs(size.getOperandStackSize(), size.getLocalVariableSize()); } @@ -506,7 +506,7 @@ public void applyHead(MethodVisitor methodVisitor, MethodDescription methodDescr } @Override - public void applyBody(MethodVisitor methodVisitor, Implementation.Context instrumentationContext, MethodDescription methodDescription) { + public void applyBody(MethodVisitor methodVisitor, Implementation.Context implementationContext, MethodDescription methodDescription) { methodAttributeAppender.apply(methodVisitor, methodDescription); } @@ -576,7 +576,7 @@ public void applyHead(MethodVisitor methodVisitor, MethodDescription methodDescr @Override public void applyBody(MethodVisitor methodVisitor, - Implementation.Context instrumentationContext, + Implementation.Context implementationContext, MethodDescription methodDescription) { methodAttributeAppender.apply(methodVisitor, methodDescription); } @@ -835,14 +835,14 @@ protected Default(TypeDescription instrumentedType, @Override public DynamicType.Unloaded make() { - Implementation.Context.ExtractableView instrumentationContext = new Implementation.Context.Default(instrumentedType, + Implementation.Context.ExtractableView implementationContext = new Implementation.Context.Default(instrumentedType, auxiliaryTypeNamingStrategy, typeInitializer, classFileVersion); return new DynamicType.Default.Unloaded(instrumentedType, - create(instrumentationContext), + create(implementationContext), loadedTypeInitializer, - join(explicitAuxiliaryTypes, instrumentationContext.getRegisteredAuxiliaryTypes())); + join(explicitAuxiliaryTypes, implementationContext.getRegisteredAuxiliaryTypes())); } @Override @@ -882,10 +882,10 @@ public int hashCode() { /** * Creates the instrumented type. * - * @param instrumentationContext The instrumentation context to use. + * @param implementationContext The instrumentation context to use. * @return A byte array that represents the instrumented type. */ - protected abstract byte[] create(Implementation.Context.ExtractableView instrumentationContext); + protected abstract byte[] create(Implementation.Context.ExtractableView implementationContext); /** * A type writer that inlines the created type into an existing class file. @@ -978,13 +978,13 @@ protected ForInlining(TypeDescription instrumentedType, } @Override - public byte[] create(Implementation.Context.ExtractableView instrumentationContext) { + public byte[] create(Implementation.Context.ExtractableView implementationContext) { try { ClassFileLocator.Resolution resolution = classFileLocator.locate(targetType.getName()); if (!resolution.isResolved()) { throw new IllegalArgumentException("Cannot locate the class file for " + targetType + " using " + classFileLocator); } - return doCreate(instrumentationContext, resolution.resolve()); + return doCreate(implementationContext, resolution.resolve()); } catch (IOException e) { throw new RuntimeException("The class file could not be written", e); } @@ -993,14 +993,14 @@ public byte[] create(Implementation.Context.ExtractableView instrumentationConte /** * Performs the actual creation of a class file. * - * @param instrumentationContext The instrumentation context to use for implementing the class file. + * @param implementationContext The instrumentation context to use for implementing the class file. * @param binaryRepresentation The binary representation of the class file. * @return The byte array representing the created class. */ - private byte[] doCreate(Implementation.Context.ExtractableView instrumentationContext, byte[] binaryRepresentation) { + private byte[] doCreate(Implementation.Context.ExtractableView implementationContext, byte[] binaryRepresentation) { ClassReader classReader = new ClassReader(binaryRepresentation); ClassWriter classWriter = new ClassWriter(classReader, ASM_MANUAL_FLAG); - classReader.accept(writeTo(classVisitorWrapper.wrap(classWriter), instrumentationContext), ASM_MANUAL_FLAG); + classReader.accept(writeTo(classVisitorWrapper.wrap(classWriter), implementationContext), ASM_MANUAL_FLAG); return classWriter.toByteArray(); } @@ -1008,13 +1008,13 @@ private byte[] doCreate(Implementation.Context.ExtractableView instrumentationCo * Creates a class visitor which weaves all changes and additions on the fly. * * @param classVisitor The class visitor to which this entry is to be written to. - * @param instrumentationContext The instrumentation context to use for implementing the class file. + * @param implementationContext The instrumentation context to use for implementing the class file. * @return A class visitor which is capable of applying the changes. */ - private ClassVisitor writeTo(ClassVisitor classVisitor, Implementation.Context.ExtractableView instrumentationContext) { + private ClassVisitor writeTo(ClassVisitor classVisitor, Implementation.Context.ExtractableView implementationContext) { String originalName = targetType.getInternalName(); String targetName = instrumentedType.getInternalName(); - ClassVisitor targetClassVisitor = new RedefinitionClassVisitor(classVisitor, instrumentationContext); + ClassVisitor targetClassVisitor = new RedefinitionClassVisitor(classVisitor, implementationContext); return originalName.equals(targetName) ? targetClassVisitor : new RemappingClassAdapter(targetClassVisitor, new SimpleRemapper(originalName, targetName)); @@ -1068,7 +1068,7 @@ protected class RedefinitionClassVisitor extends ClassVisitor { /** * The instrumentation context for this class creation. */ - private final Implementation.Context.ExtractableView instrumentationContext; + private final Implementation.Context.ExtractableView implementationContext; /** * A mutable map of all declared fields of the instrumented type by their names. @@ -1091,11 +1091,11 @@ protected class RedefinitionClassVisitor extends ClassVisitor { * Creates a class visitor which is capable of redefining an existent class on the fly. * * @param classVisitor The underlying class visitor to which writes are delegated. - * @param instrumentationContext The instrumentation context to use for implementing the class file. + * @param implementationContext The instrumentation context to use for implementing the class file. */ - protected RedefinitionClassVisitor(ClassVisitor classVisitor, Implementation.Context.ExtractableView instrumentationContext) { + protected RedefinitionClassVisitor(ClassVisitor classVisitor, Implementation.Context.ExtractableView implementationContext) { super(ASM_API_VERSION, classVisitor); - this.instrumentationContext = instrumentationContext; + this.implementationContext = implementationContext; List fieldDescriptions = instrumentedType.getDeclaredFields(); declaredFields = new HashMap(fieldDescriptions.size()); for (FieldDescription fieldDescription : fieldDescriptions) { @@ -1195,9 +1195,9 @@ public void visitEnd() { fieldPool.target(fieldDescription).apply(cv, fieldDescription); } for (MethodDescription methodDescription : declarableMethods.values()) { - methodPool.target(methodDescription).apply(cv, instrumentationContext, methodDescription); + methodPool.target(methodDescription).apply(cv, implementationContext, methodDescription); } - instrumentationContext.drain(cv, methodPool, injectedCode); + implementationContext.drain(cv, methodPool, injectedCode); super.visitEnd(); } @@ -1205,7 +1205,7 @@ public void visitEnd() { public String toString() { return "TypeWriter.Default.ForInlining.RedefinitionClassVisitor{" + "typeWriter=" + TypeWriter.Default.ForInlining.this + - ", instrumentationContext=" + instrumentationContext + + ", implementationContext=" + implementationContext + ", declaredFields=" + declaredFields + ", declarableMethods=" + declarableMethods + ", injectedCode=" + injectedCode + @@ -1263,7 +1263,7 @@ public AnnotationVisitor visitAnnotationDefault() { @Override public void visitCode() { - entry.applyBody(actualMethodVisitor, instrumentationContext, methodDescription); + entry.applyBody(actualMethodVisitor, implementationContext, methodDescription); actualMethodVisitor.visitEnd(); mv = resolution.isRebased() ? cv.visitMethod(resolution.getResolvedMethod().getModifiers(), @@ -1342,7 +1342,7 @@ public void visitCode() { @Override public void visitEnd() { - entry.applyBody(actualMethodVisitor, instrumentationContext, methodDescription); + entry.applyBody(actualMethodVisitor, implementationContext, methodDescription); actualMethodVisitor.visitEnd(); } @@ -1468,7 +1468,7 @@ protected ForCreation(TypeDescription instrumentedType, } @Override - public byte[] create(Implementation.Context.ExtractableView instrumentationContext) { + public byte[] create(Implementation.Context.ExtractableView implementationContext) { ClassWriter classWriter = new ClassWriter(ASM_MANUAL_FLAG); ClassVisitor classVisitor = classVisitorWrapper.wrap(classWriter); classVisitor.visit(classFileVersion.getVersionNumber(), @@ -1484,9 +1484,9 @@ public byte[] create(Implementation.Context.ExtractableView instrumentationConte fieldPool.target(fieldDescription).apply(classVisitor, fieldDescription); } for (MethodDescription methodDescription : instrumentedMethods) { - methodPool.target(methodDescription).apply(classVisitor, instrumentationContext, methodDescription); + methodPool.target(methodDescription).apply(classVisitor, implementationContext, methodDescription); } - instrumentationContext.drain(classVisitor, methodPool, Implementation.Context.ExtractableView.InjectedCode.None.INSTANCE); + implementationContext.drain(classVisitor, methodPool, Implementation.Context.ExtractableView.InjectedCode.None.INSTANCE); classVisitor.visitEnd(); return classWriter.toByteArray(); } diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/dynamic/scaffold/inline/RebaseImplementationTarget.java b/byte-buddy-dep/src/main/java/net/bytebuddy/dynamic/scaffold/inline/RebaseImplementationTarget.java index aab4db74cf1..9858784e4c5 100644 --- a/byte-buddy-dep/src/main/java/net/bytebuddy/dynamic/scaffold/inline/RebaseImplementationTarget.java +++ b/byte-buddy-dep/src/main/java/net/bytebuddy/dynamic/scaffold/inline/RebaseImplementationTarget.java @@ -158,8 +158,8 @@ public boolean isValid() { } @Override - public Size apply(MethodVisitor methodVisitor, Implementation.Context instrumentationContext) { - return stackManipulation.apply(methodVisitor, instrumentationContext); + public Size apply(MethodVisitor methodVisitor, Implementation.Context implementationContext) { + return stackManipulation.apply(methodVisitor, implementationContext); } @Override diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/DefaultMethodCall.java b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/DefaultMethodCall.java index 0915e4c1344..5a2d1309703 100644 --- a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/DefaultMethodCall.java +++ b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/DefaultMethodCall.java @@ -174,7 +174,7 @@ protected Appender(Target implementationTarget, List prioritize } @Override - public Size apply(MethodVisitor methodVisitor, Context instrumentationContext, MethodDescription instrumentedMethod) { + public Size apply(MethodVisitor methodVisitor, Context implementationContext, MethodDescription instrumentedMethod) { StackManipulation defaultMethodInvocation = locateDefault(instrumentedMethod); if (!defaultMethodInvocation.isValid()) { throw new IllegalStateException("Cannot invoke default method on " + instrumentedMethod); @@ -183,7 +183,7 @@ public Size apply(MethodVisitor methodVisitor, Context instrumentationContext, M MethodVariableAccess.loadThisReferenceAndArguments(instrumentedMethod), defaultMethodInvocation, MethodReturn.returning(instrumentedMethod.getReturnType()) - ).apply(methodVisitor, instrumentationContext); + ).apply(methodVisitor, implementationContext); return new Size(stackSize.getMaximalSize(), instrumentedMethod.getStackSize()); } diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/ExceptionMethod.java b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/ExceptionMethod.java index 8021d9b4cfd..4aeb0108869 100644 --- a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/ExceptionMethod.java +++ b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/ExceptionMethod.java @@ -117,12 +117,12 @@ public ByteCodeAppender appender(Target implementationTarget) { @Override public Size apply(MethodVisitor methodVisitor, - Context instrumentationContext, + Context implementationContext, MethodDescription instrumentedMethod) { StackManipulation.Size stackSize = new StackManipulation.Compound( constructionDelegate.make(), Throw.INSTANCE - ).apply(methodVisitor, instrumentationContext); + ).apply(methodVisitor, implementationContext); return new Size(stackSize.getMaximalSize(), instrumentedMethod.getStackSize()); } diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/FieldAccessor.java b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/FieldAccessor.java index 039e340cc55..3573f4cee84 100644 --- a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/FieldAccessor.java +++ b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/FieldAccessor.java @@ -110,13 +110,13 @@ private static boolean defaultConsiderRuntimeType() { * Applies a field getter instrumentation. * * @param methodVisitor The method visitor to write any instructions to. - * @param instrumentationContext The instrumentation context of the current instrumentation. + * @param implementationContext The instrumentation context of the current instrumentation. * @param fieldDescription The description of the field to read. * @param methodDescription The method that is target of the instrumentation. * @return The required size of the operand stack and local variable array for this instrumentation. */ protected ByteCodeAppender.Size applyGetter(MethodVisitor methodVisitor, - Implementation.Context instrumentationContext, + Implementation.Context implementationContext, FieldDescription fieldDescription, MethodDescription methodDescription) { StackManipulation stackManipulation = assigner.assign(fieldDescription.getFieldType(), @@ -126,7 +126,7 @@ protected ByteCodeAppender.Size applyGetter(MethodVisitor methodVisitor, throw new IllegalStateException("Getter type of " + methodDescription + " is not compatible with " + fieldDescription); } return apply(methodVisitor, - instrumentationContext, + implementationContext, fieldDescription, methodDescription, new StackManipulation.Compound( @@ -140,13 +140,13 @@ protected ByteCodeAppender.Size applyGetter(MethodVisitor methodVisitor, * Applies a field setter instrumentation. * * @param methodVisitor The method visitor to write any instructions to. - * @param instrumentationContext The instrumentation context of the current instrumentation. + * @param implementationContext The instrumentation context of the current instrumentation. * @param fieldDescription The description of the field to write to. * @param methodDescription The method that is target of the instrumentation. * @return The required size of the operand stack and local variable array for this instrumentation. */ protected ByteCodeAppender.Size applySetter(MethodVisitor methodVisitor, - Implementation.Context instrumentationContext, + Implementation.Context implementationContext, FieldDescription fieldDescription, MethodDescription methodDescription) { StackManipulation stackManipulation = assigner.assign(methodDescription.getParameters().get(0).getTypeDescription(), @@ -158,7 +158,7 @@ protected ByteCodeAppender.Size applySetter(MethodVisitor methodVisitor, throw new IllegalArgumentException("Cannot apply setter on final field " + fieldDescription); } return apply(methodVisitor, - instrumentationContext, + implementationContext, fieldDescription, methodDescription, new StackManipulation.Compound( @@ -174,14 +174,14 @@ protected ByteCodeAppender.Size applySetter(MethodVisitor methodVisitor, * A generic implementation of the application of a {@link net.bytebuddy.implementation.bytecode.ByteCodeAppender}. * * @param methodVisitor The method visitor to write any instructions to. - * @param instrumentationContext The instrumentation context of the current instrumentation. + * @param implementationContext The instrumentation context of the current instrumentation. * @param fieldDescription The description of the field to access. * @param methodDescription The method that is target of the instrumentation. * @param fieldAccess The manipulation that represents the field access. * @return A suitable {@link net.bytebuddy.implementation.bytecode.ByteCodeAppender}. */ private ByteCodeAppender.Size apply(MethodVisitor methodVisitor, - Implementation.Context instrumentationContext, + Implementation.Context implementationContext, FieldDescription fieldDescription, MethodDescription methodDescription, StackManipulation fieldAccess) { @@ -195,7 +195,7 @@ private ByteCodeAppender.Size apply(MethodVisitor methodVisitor, : MethodVariableAccess.REFERENCE.loadOffset(0), fieldAccess, MethodReturn.returning(methodDescription.getReturnType()) - ).apply(methodVisitor, instrumentationContext); + ).apply(methodVisitor, implementationContext); return new ByteCodeAppender.Size(stackSize.getMaximalSize(), methodDescription.getStackSize()); } @@ -954,23 +954,23 @@ protected Appender(FieldLocator fieldLocator) { @Override public Size apply(MethodVisitor methodVisitor, - Implementation.Context instrumentationContext, + Implementation.Context implementationContext, MethodDescription instrumentedMethod) { if (isConstructor().matches(instrumentedMethod)) { throw new IllegalArgumentException("Constructors cannot define beans: " + instrumentedMethod); } if (takesArguments(0).and(not(returns(void.class))).matches(instrumentedMethod)) { return applyGetter(methodVisitor, - instrumentationContext, + implementationContext, fieldLocator.locate(getFieldName(instrumentedMethod)), instrumentedMethod); } else if (takesArguments(1).and(returns(void.class)).matches(instrumentedMethod)) { return applySetter(methodVisitor, - instrumentationContext, + implementationContext, fieldLocator.locate(getFieldName(instrumentedMethod)), instrumentedMethod); } else { - throw new IllegalArgumentException("Method " + instrumentationContext + " is no bean property"); + throw new IllegalArgumentException("Method " + implementationContext + " is no bean property"); } } diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/FixedValue.java b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/FixedValue.java index 5e33bf8f564..6f14cf07adb 100644 --- a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/FixedValue.java +++ b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/FixedValue.java @@ -248,7 +248,7 @@ private static boolean defaultConsiderRuntimeType() { * Blueprint method that for applying the actual instrumentation. * * @param methodVisitor The method visitor to which the instrumentation is applied to. - * @param instrumentationContext The instrumentation context for the given instrumentation. + * @param implementationContext The instrumentation context for the given instrumentation. * @param instrumentedMethod The instrumented method that is target of the instrumentation. * @param fixedValueType A description of the type of the fixed value that is loaded by the * {@code valueLoadingInstruction}. @@ -257,7 +257,7 @@ private static boolean defaultConsiderRuntimeType() { * @return A representation of the stack and variable array sized that are required for this instrumentation. */ protected ByteCodeAppender.Size apply(MethodVisitor methodVisitor, - Context instrumentationContext, + Context implementationContext, MethodDescription instrumentedMethod, TypeDescription fixedValueType, StackManipulation valueLoadingInstruction) { @@ -270,7 +270,7 @@ protected ByteCodeAppender.Size apply(MethodVisitor methodVisitor, valueLoadingInstruction, assignment, MethodReturn.returning(instrumentedMethod.getReturnType()) - ).apply(methodVisitor, instrumentationContext); + ).apply(methodVisitor, implementationContext); return new ByteCodeAppender.Size(stackSize.getMaximalSize(), instrumentedMethod.getStackSize()); } @@ -356,8 +356,8 @@ public ByteCodeAppender appender(Target implementationTarget) { } @Override - public Size apply(MethodVisitor methodVisitor, Context instrumentationContext, MethodDescription instrumentedMethod) { - return apply(methodVisitor, instrumentationContext, instrumentedMethod, loadedType, valueLoadInstruction); + public Size apply(MethodVisitor methodVisitor, Context implementationContext, MethodDescription instrumentedMethod) { + return apply(methodVisitor, implementationContext, instrumentedMethod, loadedType, valueLoadInstruction); } @Override @@ -504,8 +504,8 @@ private StaticFieldByteCodeAppender(TypeDescription instrumentedType) { } @Override - public Size apply(MethodVisitor methodVisitor, Context instrumentationContext, MethodDescription instrumentedMethod) { - return ForStaticField.this.apply(methodVisitor, instrumentationContext, instrumentedMethod, fieldType, fieldGetAccess); + public Size apply(MethodVisitor methodVisitor, Context implementationContext, MethodDescription instrumentedMethod) { + return ForStaticField.this.apply(methodVisitor, implementationContext, instrumentedMethod, fieldType, fieldGetAccess); } @Override diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/Forwarding.java b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/Forwarding.java index 2803bcb93bb..ac920a27213 100644 --- a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/Forwarding.java +++ b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/Forwarding.java @@ -325,7 +325,7 @@ private Appender(StackManipulation delegateLoadingInstruction) { @Override public Size apply(MethodVisitor methodVisitor, - Context instrumentationContext, + Context implementationContext, MethodDescription instrumentedMethod) { if (!instrumentedMethod.isInvokableOn(fieldType)) { throw new IllegalArgumentException("Cannot forward " + instrumentedMethod + " to " + fieldType); @@ -337,7 +337,7 @@ public Size apply(MethodVisitor methodVisitor, MethodVariableAccess.loadArguments(instrumentedMethod), MethodInvocation.invoke(instrumentedMethod).virtual(fieldType), MethodReturn.returning(instrumentedMethod.getReturnType()) - ).apply(methodVisitor, instrumentationContext); + ).apply(methodVisitor, implementationContext); return new Size(stackSize.getMaximalSize(), instrumentedMethod.getStackSize()); } diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/Implementation.java b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/Implementation.java index 478a47cb7d3..aaa53bf7994 100644 --- a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/Implementation.java +++ b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/Implementation.java @@ -105,7 +105,7 @@ public boolean isValid() { } @Override - public Size apply(MethodVisitor methodVisitor, Context instrumentationContext) { + public Size apply(MethodVisitor methodVisitor, Context implementationContext) { throw new IllegalStateException("Cannot implement an undefined method"); } @@ -194,8 +194,8 @@ public boolean isValid() { } @Override - public Size apply(MethodVisitor methodVisitor, Context instrumentationContext) { - return stackManipulation.apply(methodVisitor, instrumentationContext); + public Size apply(MethodVisitor methodVisitor, Context implementationContext) { + return stackManipulation.apply(methodVisitor, implementationContext); } @Override @@ -912,8 +912,8 @@ public boolean isValid() { } @Override - public Size apply(MethodVisitor methodVisitor, Context instrumentationContext) { - return fieldValue.apply(methodVisitor, instrumentationContext); + public Size apply(MethodVisitor methodVisitor, Context implementationContext) { + return fieldValue.apply(methodVisitor, implementationContext); } @Override @@ -953,9 +953,9 @@ public void applyHead(MethodVisitor methodVisitor, MethodDescription methodDescr } @Override - public void applyBody(MethodVisitor methodVisitor, Context instrumentationContext, MethodDescription methodDescription) { + public void applyBody(MethodVisitor methodVisitor, Context implementationContext, MethodDescription methodDescription) { methodVisitor.visitCode(); - Size size = apply(methodVisitor, instrumentationContext, methodDescription); + Size size = apply(methodVisitor, implementationContext, methodDescription); methodVisitor.visitMaxs(size.getOperandStackSize(), size.getLocalVariableSize()); } @@ -988,13 +988,13 @@ protected AccessorMethodDelegation(StackManipulation accessorMethodInvocation) { @Override public Size apply(MethodVisitor methodVisitor, - Implementation.Context instrumentationContext, + Implementation.Context implementationContext, MethodDescription instrumentedMethod) { StackManipulation.Size stackSize = new StackManipulation.Compound( MethodVariableAccess.loadThisReferenceAndArguments(instrumentedMethod), accessorMethodInvocation, MethodReturn.returning(instrumentedMethod.getReturnType()) - ).apply(methodVisitor, instrumentationContext); + ).apply(methodVisitor, implementationContext); return new Size(stackSize.getMaximalSize(), instrumentedMethod.getStackSize()); } @@ -1035,14 +1035,14 @@ protected FieldGetter(FieldDescription fieldDescription) { } @Override - public Size apply(MethodVisitor methodVisitor, Context instrumentationContext, MethodDescription instrumentedMethod) { + public Size apply(MethodVisitor methodVisitor, Context implementationContext, MethodDescription instrumentedMethod) { StackManipulation.Size stackSize = new StackManipulation.Compound( fieldDescription.isStatic() ? StackManipulation.LegalTrivial.INSTANCE : MethodVariableAccess.REFERENCE.loadOffset(0), FieldAccess.forField(fieldDescription).getter(), MethodReturn.returning(fieldDescription.getFieldType()) - ).apply(methodVisitor, instrumentationContext); + ).apply(methodVisitor, implementationContext); return new Size(stackSize.getMaximalSize(), instrumentedMethod.getStackSize()); } @@ -1085,12 +1085,12 @@ protected FieldSetter(FieldDescription fieldDescription) { } @Override - public Size apply(MethodVisitor methodVisitor, Context instrumentationContext, MethodDescription instrumentedMethod) { + public Size apply(MethodVisitor methodVisitor, Context implementationContext, MethodDescription instrumentedMethod) { StackManipulation.Size stackSize = new StackManipulation.Compound( MethodVariableAccess.loadThisReferenceAndArguments(instrumentedMethod), FieldAccess.forField(fieldDescription).putter(), MethodReturn.VOID - ).apply(methodVisitor, instrumentationContext); + ).apply(methodVisitor, implementationContext); return new Size(stackSize.getMaximalSize(), instrumentedMethod.getStackSize()); } diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/InvocationHandlerAdapter.java b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/InvocationHandlerAdapter.java index 84df141d056..31565fc46e0 100644 --- a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/InvocationHandlerAdapter.java +++ b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/InvocationHandlerAdapter.java @@ -154,14 +154,14 @@ private List argumentValuesOf(MethodDescription instrumentedM * Applies an instrumentation that delegates to a invocation handler. * * @param methodVisitor The method visitor for writing the byte code to. - * @param instrumentationContext The instrumentation context for the current instrumentation. + * @param implementationContext The instrumentation context for the current instrumentation. * @param instrumentedMethod The method that is instrumented. * @param instrumentedType The type that is instrumented. * @param preparingManipulation A stack manipulation that applies any preparation to the operand stack. * @return The size of the applied assignment. */ protected ByteCodeAppender.Size apply(MethodVisitor methodVisitor, - Context instrumentationContext, + Context implementationContext, MethodDescription instrumentedMethod, TypeDescription instrumentedType, StackManipulation preparingManipulation) { @@ -178,7 +178,7 @@ protected ByteCodeAppender.Size apply(MethodVisitor methodVisitor, MethodInvocation.invoke(invocationHandlerType.getDeclaredMethods().getOnly()), assigner.assign(TypeDescription.OBJECT, instrumentedMethod.getReturnType(), true), MethodReturn.returning(instrumentedMethod.getReturnType()) - ).apply(methodVisitor, instrumentationContext); + ).apply(methodVisitor, implementationContext); return new ByteCodeAppender.Size(stackSize.getMaximalSize(), instrumentedMethod.getStackSize()); } @@ -308,10 +308,10 @@ protected Appender(TypeDescription instrumentedType) { @Override public Size apply(MethodVisitor methodVisitor, - Context instrumentationContext, + Context implementationContext, MethodDescription instrumentedMethod) { return ForStaticDelegation.this.apply(methodVisitor, - instrumentationContext, + implementationContext, instrumentedMethod, instrumentedType, StackManipulation.LegalTrivial.INSTANCE); @@ -417,9 +417,9 @@ protected Appender(TypeDescription instrumentedType) { } @Override - public Size apply(MethodVisitor methodVisitor, Context instrumentationContext, MethodDescription instrumentedMethod) { + public Size apply(MethodVisitor methodVisitor, Context implementationContext, MethodDescription instrumentedMethod) { return ForInstanceDelegation.this.apply(methodVisitor, - instrumentationContext, + implementationContext, instrumentedMethod, instrumentedType, MethodVariableAccess.forType(instrumentedType).loadOffset(0)); diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/InvokeDynamic.java b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/InvokeDynamic.java index 1d2c8a385bd..b38b8709b8a 100644 --- a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/InvokeDynamic.java +++ b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/InvokeDynamic.java @@ -3494,7 +3494,7 @@ public Appender(TypeDescription instrumentedType) { @Override public Size apply(MethodVisitor methodVisitor, - Context instrumentationContext, + Context implementationContext, MethodDescription instrumentedMethod) { InvocationProvider.Target.Resolved target = invocationProvider.make(instrumentedMethod) .resolve(instrumentedType, assigner, dynamicallyTyped); @@ -3506,7 +3506,7 @@ public Size apply(MethodVisitor methodVisitor, target.getParameterTypes(), handleArguments), terminationHandler.resolve(instrumentedMethod, target.getReturnType(), assigner, dynamicallyTyped) - ).apply(methodVisitor, instrumentationContext); + ).apply(methodVisitor, implementationContext); return new Size(size.getMaximalSize(), instrumentedMethod.getStackSize()); } diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/MethodCall.java b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/MethodCall.java index 0ebbf4eaf6b..b7953fc6a4e 100644 --- a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/MethodCall.java +++ b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/MethodCall.java @@ -2165,7 +2165,7 @@ protected Appender(Target implementationTarget) { @Override public Size apply(MethodVisitor methodVisitor, - Context instrumentationContext, + Context implementationContext, MethodDescription instrumentedMethod) { MethodDescription invokedMethod = methodLocator.resolve(instrumentedMethod); TypeList methodParameters = invokedMethod.getParameters().asTypeList(); @@ -2186,7 +2186,7 @@ public Size apply(MethodVisitor methodVisitor, new StackManipulation.Compound(argumentInstruction), methodInvoker.invoke(invokedMethod, implementationTarget), terminationHandler.resolve(invokedMethod, instrumentedMethod, assigner, dynamicallyTyped) - ).apply(methodVisitor, instrumentationContext); + ).apply(methodVisitor, implementationContext); return new Size(size.getMaximalSize(), instrumentedMethod.getStackSize()); } diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/MethodDelegation.java b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/MethodDelegation.java index 0c56dbe16c5..5603984d4da 100644 --- a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/MethodDelegation.java +++ b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/MethodDelegation.java @@ -993,12 +993,12 @@ protected Appender(StackManipulation preparingStackAssignment, @Override public Size apply(MethodVisitor methodVisitor, - Context instrumentationContext, + Context implementationContext, MethodDescription instrumentedMethod) { StackManipulation.Size stackSize = new StackManipulation.Compound( preparingStackAssignment, processor.process(implementationTarget, instrumentedMethod, targetMethods) - ).apply(methodVisitor, instrumentationContext); + ).apply(methodVisitor, implementationContext); return new Size(stackSize.getMaximalSize(), instrumentedMethod.getStackSize()); } diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/StubMethod.java b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/StubMethod.java index 6ea78cb6cd2..a368fa6cf01 100644 --- a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/StubMethod.java +++ b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/StubMethod.java @@ -38,12 +38,12 @@ public ByteCodeAppender appender(Target implementationTarget) { @Override public Size apply(MethodVisitor methodVisitor, - Context instrumentationContext, + Context implementationContext, MethodDescription instrumentedMethod) { StackManipulation.Size stackSize = new StackManipulation.Compound( DefaultValue.of(instrumentedMethod.getReturnType()), MethodReturn.returning(instrumentedMethod.getReturnType()) - ).apply(methodVisitor, instrumentationContext); + ).apply(methodVisitor, implementationContext); return new Size(stackSize.getMaximalSize(), instrumentedMethod.getStackSize()); } diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/SuperMethodCall.java b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/SuperMethodCall.java index 56263b3289c..7f8fc5716dc 100644 --- a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/SuperMethodCall.java +++ b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/SuperMethodCall.java @@ -108,7 +108,7 @@ protected Appender(Target implementationTarget, TerminationHandler terminationHa @Override public Size apply(MethodVisitor methodVisitor, - Implementation.Context instrumentationContext, + Implementation.Context implementationContext, MethodDescription instrumentedMethod) { StackManipulation superMethodCall = instrumentedMethod.isDefaultMethod() && implementationTarget.getTypeDescription().getInterfaces().contains(instrumentedMethod.getDeclaringType()) @@ -121,7 +121,7 @@ public Size apply(MethodVisitor methodVisitor, MethodVariableAccess.loadThisReferenceAndArguments(instrumentedMethod), superMethodCall, terminationHandler.of(instrumentedMethod) - ).apply(methodVisitor, instrumentationContext); + ).apply(methodVisitor, implementationContext); return new Size(stackSize.getMaximalSize(), instrumentedMethod.getStackSize()); } diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/auxiliary/MethodCallProxy.java b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/auxiliary/MethodCallProxy.java index ccc382396e0..6595735cc82 100644 --- a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/auxiliary/MethodCallProxy.java +++ b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/auxiliary/MethodCallProxy.java @@ -286,7 +286,7 @@ private Appender(TypeDescription instrumentedType) { } @Override - public Size apply(MethodVisitor methodVisitor, Context instrumentationContext, MethodDescription instrumentedMethod) { + public Size apply(MethodVisitor methodVisitor, Context implementationContext, MethodDescription instrumentedMethod) { StackManipulation thisReference = MethodVariableAccess.REFERENCE.loadOffset(0); FieldList fieldList = instrumentedType.getDeclaredFields(); StackManipulation[] fieldLoading = new StackManipulation[fieldList.size()]; @@ -305,7 +305,7 @@ public Size apply(MethodVisitor methodVisitor, Context instrumentationContext, M MethodInvocation.invoke(ConstructorCall.INSTANCE.objectTypeDefaultConstructor), new StackManipulation.Compound(fieldLoading), MethodReturn.VOID - ).apply(methodVisitor, instrumentationContext); + ).apply(methodVisitor, implementationContext); return new Size(stackSize.getMaximalSize(), instrumentedMethod.getStackSize()); } @@ -404,7 +404,7 @@ private Appender(TypeDescription instrumentedType) { @Override public Size apply(MethodVisitor methodVisitor, - Context instrumentationContext, + Context implementationContext, MethodDescription instrumentedMethod) { StackManipulation thisReference = MethodVariableAccess.forType(instrumentedType).loadOffset(0); FieldList fieldList = instrumentedType.getDeclaredFields(); @@ -418,7 +418,7 @@ public Size apply(MethodVisitor methodVisitor, MethodInvocation.invoke(accessorMethod), assigner.assign(accessorMethod.getReturnType(), instrumentedMethod.getReturnType(), true), MethodReturn.returning(instrumentedMethod.getReturnType()) - ).apply(methodVisitor, instrumentationContext); + ).apply(methodVisitor, implementationContext); return new Size(stackSize.getMaximalSize(), instrumentedMethod.getStackSize()); } @@ -492,15 +492,15 @@ public boolean isValid() { } @Override - public Size apply(MethodVisitor methodVisitor, Implementation.Context instrumentationContext) { - TypeDescription auxiliaryType = instrumentationContext + public Size apply(MethodVisitor methodVisitor, Implementation.Context implementationContext) { + TypeDescription auxiliaryType = implementationContext .register(new MethodCallProxy(specialMethodInvocation, serializable)); return new Compound( TypeCreation.forType(auxiliaryType), Duplication.SINGLE, MethodVariableAccess.loadThisReferenceAndArguments(specialMethodInvocation.getMethodDescription()), MethodInvocation.invoke(auxiliaryType.getDeclaredMethods().filter(isConstructor()).getOnly()) - ).apply(methodVisitor, instrumentationContext); + ).apply(methodVisitor, implementationContext); } @Override diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/auxiliary/TypeProxy.java b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/auxiliary/TypeProxy.java index 7b473efda11..ef9b5766e49 100644 --- a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/auxiliary/TypeProxy.java +++ b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/auxiliary/TypeProxy.java @@ -185,8 +185,8 @@ public boolean isValid() { } @Override - public Size apply(MethodVisitor methodVisitor, Implementation.Context instrumentationContext) { - return implementation.apply(methodVisitor, instrumentationContext); + public Size apply(MethodVisitor methodVisitor, Implementation.Context implementationContext) { + return implementation.apply(methodVisitor, implementationContext); } @Override @@ -309,7 +309,7 @@ private Appender(TypeDescription instrumentedType) { } @Override - public Size apply(MethodVisitor methodVisitor, Context instrumentationContext, MethodDescription instrumentedMethod) { + public Size apply(MethodVisitor methodVisitor, Context implementationContext, MethodDescription instrumentedMethod) { methodVisitor.visitMethodInsn(Opcodes.INVOKESTATIC, REFLECTION_FACTORY_INTERNAL_NAME, GET_REFLECTION_FACTORY_METHOD_NAME, @@ -477,8 +477,8 @@ public boolean isValid() { } @Override - public Size apply(MethodVisitor methodVisitor, Implementation.Context instrumentationContext) { - TypeDescription proxyType = instrumentationContext + public Size apply(MethodVisitor methodVisitor, Implementation.Context implementationContext) { + TypeDescription proxyType = implementationContext .register(new TypeProxy(proxiedType, implementationTarget, InvocationFactory.Default.SUPER_METHOD, @@ -499,7 +499,7 @@ public Size apply(MethodVisitor methodVisitor, Implementation.Context instrument MethodVariableAccess.forType(implementationTarget.getTypeDescription()).loadOffset(0), FieldAccess.forField(proxyType.getDeclaredFields() .filter((ElementMatchers.named(INSTANCE_FIELD))).getOnly()).putter() - ).apply(methodVisitor, instrumentationContext); + ).apply(methodVisitor, implementationContext); } @Override @@ -588,8 +588,8 @@ public boolean isValid() { } @Override - public Size apply(MethodVisitor methodVisitor, Implementation.Context instrumentationContext) { - TypeDescription proxyType = instrumentationContext + public Size apply(MethodVisitor methodVisitor, Implementation.Context implementationContext) { + TypeDescription proxyType = implementationContext .register(new TypeProxy(proxiedType, implementationTarget, InvocationFactory.Default.SUPER_METHOD, @@ -602,7 +602,7 @@ public Size apply(MethodVisitor methodVisitor, Implementation.Context instrument MethodVariableAccess.forType(implementationTarget.getTypeDescription()).loadOffset(0), FieldAccess.forField(proxyType.getDeclaredFields() .filter((named(INSTANCE_FIELD))).getOnly()).putter() - ).apply(methodVisitor, instrumentationContext); + ).apply(methodVisitor, implementationContext); } @Override @@ -678,8 +678,8 @@ public boolean isValid() { } @Override - public Size apply(MethodVisitor methodVisitor, Implementation.Context instrumentationContext) { - TypeDescription proxyType = instrumentationContext + public Size apply(MethodVisitor methodVisitor, Implementation.Context implementationContext) { + TypeDescription proxyType = implementationContext .register(new TypeProxy(proxiedType, implementationTarget, InvocationFactory.Default.DEFAULT_METHOD, @@ -693,7 +693,7 @@ public Size apply(MethodVisitor methodVisitor, Implementation.Context instrument MethodVariableAccess.forType(implementationTarget.getTypeDescription()).loadOffset(0), FieldAccess.forField(proxyType.getDeclaredFields() .filter((named(INSTANCE_FIELD))).getOnly()).putter() - ).apply(methodVisitor, instrumentationContext); + ).apply(methodVisitor, implementationContext); } @Override @@ -806,11 +806,11 @@ protected Appender(TypeDescription instrumentedType) { @Override public Size apply(MethodVisitor methodVisitor, - Context instrumentationContext, + Context implementationContext, MethodDescription instrumentedMethod) { StackManipulation.Size stackSize = implement(instrumentedMethod, invocationFactory.invoke(implementationTarget, proxiedType, instrumentedMethod)) - .apply(methodVisitor, instrumentationContext); + .apply(methodVisitor, implementationContext); return new Size(stackSize.getMaximalSize(), instrumentedMethod.getStackSize()); } @@ -891,7 +891,7 @@ public boolean isValid() { } @Override - public Size apply(MethodVisitor methodVisitor, Implementation.Context instrumentationContext) { + public Size apply(MethodVisitor methodVisitor, Implementation.Context implementationContext) { MethodDescription proxyMethod = methodAccessorFactory.registerAccessorFor(specialMethodInvocation); return new StackManipulation.Compound( MethodVariableAccess.REFERENCE.loadOffset(0), @@ -899,7 +899,7 @@ public Size apply(MethodVisitor methodVisitor, Implementation.Context instrument MethodVariableAccess.forBridgeMethodInvocation(instrumentedMethod, proxyMethod), MethodInvocation.invoke(proxyMethod), MethodReturn.returning(instrumentedMethod.getReturnType()) - ).apply(methodVisitor, instrumentationContext); + ).apply(methodVisitor, implementationContext); } /** diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bind/MethodDelegationBinder.java b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bind/MethodDelegationBinder.java index ceb1859e357..69af80f4d49 100644 --- a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bind/MethodDelegationBinder.java +++ b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bind/MethodDelegationBinder.java @@ -151,7 +151,7 @@ public boolean isValid() { } @Override - public Size apply(MethodVisitor methodVisitor, Implementation.Context instrumentationContext) { + public Size apply(MethodVisitor methodVisitor, Implementation.Context implementationContext) { throw new IllegalStateException("An illegal parameter binding must not be applied"); } @@ -198,8 +198,8 @@ public boolean isValid() { } @Override - public Size apply(MethodVisitor methodVisitor, Implementation.Context instrumentationContext) { - return delegate.apply(methodVisitor, instrumentationContext); + public Size apply(MethodVisitor methodVisitor, Implementation.Context implementationContext) { + return delegate.apply(methodVisitor, implementationContext); } @Override @@ -276,8 +276,8 @@ public boolean isValid() { } @Override - public Size apply(MethodVisitor methodVisitor, Implementation.Context instrumentationContext) { - return delegate.apply(methodVisitor, instrumentationContext); + public Size apply(MethodVisitor methodVisitor, Implementation.Context implementationContext) { + return delegate.apply(methodVisitor, implementationContext); } @Override @@ -363,7 +363,7 @@ public boolean isValid() { } @Override - public Size apply(MethodVisitor methodVisitor, Implementation.Context instrumentationContext) { + public Size apply(MethodVisitor methodVisitor, Implementation.Context implementationContext) { throw new IllegalStateException("Cannot delegate to an unbound method"); } @@ -545,13 +545,13 @@ public MethodDescription getTarget() { } @Override - public Size apply(MethodVisitor methodVisitor, Implementation.Context instrumentationContext) { + public Size apply(MethodVisitor methodVisitor, Implementation.Context implementationContext) { Size size = new Size(0, 0); for (StackManipulation stackManipulation : parameterStackManipulations) { - size = size.aggregate(stackManipulation.apply(methodVisitor, instrumentationContext)); + size = size.aggregate(stackManipulation.apply(methodVisitor, implementationContext)); } - size = size.aggregate(methodInvocation.apply(methodVisitor, instrumentationContext)); - return size.aggregate(terminatingStackManipulation.apply(methodVisitor, instrumentationContext)); + size = size.aggregate(methodInvocation.apply(methodVisitor, implementationContext)); + return size.aggregate(terminatingStackManipulation.apply(methodVisitor, implementationContext)); } @Override diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bind/annotation/FieldProxy.java b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bind/annotation/FieldProxy.java index 21d8d734d51..d047e1818a5 100644 --- a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bind/annotation/FieldProxy.java +++ b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bind/annotation/FieldProxy.java @@ -461,7 +461,7 @@ protected Appender(Target implementationTarget) { @Override public Size apply(MethodVisitor methodVisitor, - Context instrumentationContext, + Context implementationContext, MethodDescription instrumentedMethod) { MethodDescription getterMethod = methodAccessorFactory.registerGetterFor(accessedField); StackManipulation.Size stackSize = new StackManipulation.Compound( @@ -474,7 +474,7 @@ public Size apply(MethodVisitor methodVisitor, MethodInvocation.invoke(getterMethod), assigner.assign(getterMethod.getReturnType(), instrumentedMethod.getReturnType(), true), MethodReturn.returning(instrumentedMethod.getReturnType()) - ).apply(methodVisitor, instrumentationContext); + ).apply(methodVisitor, implementationContext); return new Size(stackSize.getMaximalSize(), instrumentedMethod.getStackSize()); } @@ -602,7 +602,7 @@ protected Appender(Target implementationTarget) { @Override public Size apply(MethodVisitor methodVisitor, - Context instrumentationContext, + Context implementationContext, MethodDescription instrumentedMethod) { TypeDescription parameterType = instrumentedMethod.getParameters().get(0).getTypeDescription(); MethodDescription setterMethod = methodAccessorFactory.registerSetterFor(accessedField); @@ -617,7 +617,7 @@ public Size apply(MethodVisitor methodVisitor, assigner.assign(parameterType, setterMethod.getParameters().get(0).getTypeDescription(), true), MethodInvocation.invoke(setterMethod), MethodReturn.VOID - ).apply(methodVisitor, instrumentationContext); + ).apply(methodVisitor, implementationContext); return new Size(stackSize.getMaximalSize(), instrumentedMethod.getStackSize()); } @@ -728,7 +728,7 @@ protected Appender(Target implementationTarget) { @Override public Size apply(MethodVisitor methodVisitor, - Context instrumentationContext, + Context implementationContext, MethodDescription instrumentedMethod) { StackManipulation.Size stackSize = new StackManipulation.Compound( MethodVariableAccess.REFERENCE.loadOffset(0), @@ -736,7 +736,7 @@ public Size apply(MethodVisitor methodVisitor, MethodVariableAccess.loadThisReferenceAndArguments(instrumentedMethod), FieldAccess.forField(fieldDescription).putter(), MethodReturn.VOID - ).apply(methodVisitor, instrumentationContext); + ).apply(methodVisitor, implementationContext); return new Size(stackSize.getMaximalSize(), instrumentedMethod.getStackSize()); } @@ -1210,8 +1210,8 @@ public boolean isValid() { } @Override - public Size apply(MethodVisitor methodVisitor, Implementation.Context instrumentationContext) { - TypeDescription auxiliaryType = instrumentationContext.register(this); + public Size apply(MethodVisitor methodVisitor, Implementation.Context implementationContext) { + TypeDescription auxiliaryType = implementationContext.register(this); return new Compound( TypeCreation.forType(auxiliaryType), Duplication.SINGLE, @@ -1219,7 +1219,7 @@ public Size apply(MethodVisitor methodVisitor, Implementation.Context instrument ? LegalTrivial.INSTANCE : MethodVariableAccess.REFERENCE.loadOffset(0), MethodInvocation.invoke(auxiliaryType.getDeclaredMethods().filter(isConstructor()).getOnly()) - ).apply(methodVisitor, instrumentationContext); + ).apply(methodVisitor, implementationContext); } /** diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bind/annotation/Morph.java b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bind/annotation/Morph.java index 99a63521b50..6903a35614d 100644 --- a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bind/annotation/Morph.java +++ b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bind/annotation/Morph.java @@ -424,8 +424,8 @@ public boolean isValid() { } @Override - public Size apply(MethodVisitor methodVisitor, Implementation.Context instrumentationContext) { - TypeDescription forwardingType = instrumentationContext.register(this); + public Size apply(MethodVisitor methodVisitor, Implementation.Context implementationContext) { + TypeDescription forwardingType = implementationContext.register(this); return new Compound( TypeCreation.forType(forwardingType), Duplication.SINGLE, @@ -433,7 +433,7 @@ public Size apply(MethodVisitor methodVisitor, Implementation.Context instrument ? LegalTrivial.INSTANCE : MethodVariableAccess.REFERENCE.loadOffset(0), MethodInvocation.invoke(forwardingType.getDeclaredMethods().filter(isConstructor()).getOnly()) - ).apply(methodVisitor, instrumentationContext); + ).apply(methodVisitor, implementationContext); } @Override @@ -587,7 +587,7 @@ protected Appender(Target implementationTarget) { @Override public Size apply(MethodVisitor methodVisitor, - Context instrumentationContext, + Context implementationContext, MethodDescription instrumentedMethod) { StackManipulation.Size stackSize = new StackManipulation.Compound( MethodVariableAccess.REFERENCE.loadOffset(0), @@ -595,7 +595,7 @@ public Size apply(MethodVisitor methodVisitor, MethodVariableAccess.loadThisReferenceAndArguments(instrumentedMethod), FieldAccess.forField(fieldDescription).putter(), MethodReturn.VOID - ).apply(methodVisitor, instrumentationContext); + ).apply(methodVisitor, implementationContext); return new Size(stackSize.getMaximalSize(), instrumentedMethod.getStackSize()); } @@ -696,7 +696,7 @@ protected Appender(Target implementationTarget) { @Override public Size apply(MethodVisitor methodVisitor, - Context instrumentationContext, + Context implementationContext, MethodDescription instrumentedMethod) { StackManipulation arrayReference = MethodVariableAccess.REFERENCE.loadOffset(1); StackManipulation[] parameterLoading = new StackManipulation[accessorMethod.getParameters().size()]; @@ -720,7 +720,7 @@ public Size apply(MethodVisitor methodVisitor, MethodInvocation.invoke(accessorMethod), assigner.assign(accessorMethod.getReturnType(), instrumentedMethod.getReturnType(), true), MethodReturn.REFERENCE - ).apply(methodVisitor, instrumentationContext); + ).apply(methodVisitor, implementationContext); return new Size(stackSize.getMaximalSize(), instrumentedMethod.getStackSize()); } diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bind/annotation/Pipe.java b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bind/annotation/Pipe.java index 8ae868ad25c..7a00d4239df 100644 --- a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bind/annotation/Pipe.java +++ b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bind/annotation/Pipe.java @@ -335,14 +335,14 @@ public boolean isValid() { } @Override - public Size apply(MethodVisitor methodVisitor, Implementation.Context instrumentationContext) { - TypeDescription forwardingType = instrumentationContext.register(this); + public Size apply(MethodVisitor methodVisitor, Implementation.Context implementationContext) { + TypeDescription forwardingType = implementationContext.register(this); return new Compound( TypeCreation.forType(forwardingType), Duplication.SINGLE, MethodVariableAccess.loadArguments(sourceMethod), MethodInvocation.invoke(forwardingType.getDeclaredMethods().filter(isConstructor()).getOnly()) - ).apply(methodVisitor, instrumentationContext); + ).apply(methodVisitor, implementationContext); } @Override @@ -440,7 +440,7 @@ private Appender(TypeDescription instrumentedType) { } @Override - public Size apply(MethodVisitor methodVisitor, Context instrumentationContext, MethodDescription instrumentedMethod) { + public Size apply(MethodVisitor methodVisitor, Context implementationContext, MethodDescription instrumentedMethod) { StackManipulation thisReference = MethodVariableAccess.forType(instrumentedMethod.getDeclaringType()).loadOffset(0); FieldList fieldList = instrumentedType.getDeclaredFields(); StackManipulation[] fieldLoading = new StackManipulation[fieldList.size()]; @@ -459,7 +459,7 @@ public Size apply(MethodVisitor methodVisitor, Context instrumentationContext, M MethodInvocation.invoke(ConstructorCall.INSTANCE.objectTypeDefaultConstructor), new StackManipulation.Compound(fieldLoading), MethodReturn.VOID - ).apply(methodVisitor, instrumentationContext); + ).apply(methodVisitor, implementationContext); return new Size(stackSize.getMaximalSize(), instrumentedMethod.getStackSize()); } @@ -561,7 +561,7 @@ private Appender(TypeDescription instrumentedType) { @Override public Size apply(MethodVisitor methodVisitor, - Context instrumentationContext, + Context implementationContext, MethodDescription instrumentedMethod) { StackManipulation thisReference = MethodVariableAccess.forType(instrumentedType).loadOffset(0); FieldList fieldList = instrumentedType.getDeclaredFields(); @@ -577,7 +577,7 @@ public Size apply(MethodVisitor methodVisitor, MethodInvocation.invoke(redirectedMethod), assigner.assign(redirectedMethod.getReturnType(), instrumentedMethod.getReturnType(), true), MethodReturn.REFERENCE - ).apply(methodVisitor, instrumentationContext); + ).apply(methodVisitor, implementationContext); return new Size(stackSize.getMaximalSize(), instrumentedMethod.getStackSize()); } diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/ByteCodeAppender.java b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/ByteCodeAppender.java index b2ceaefd536..50c4d4d64b2 100644 --- a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/ByteCodeAppender.java +++ b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/ByteCodeAppender.java @@ -23,12 +23,12 @@ public interface ByteCodeAppender { * Applies this byte code appender to a type creation process. * * @param methodVisitor The method visitor to which the byte code appender writes its code to. - * @param instrumentationContext The instrumentation context of the current type creation process. + * @param implementationContext The instrumentation context of the current type creation process. * @param instrumentedMethod The method that is the target of the instrumentation. * @return The required size for the applied byte code to run. */ Size apply(MethodVisitor methodVisitor, - Implementation.Context instrumentationContext, + Implementation.Context implementationContext, MethodDescription instrumentedMethod); /** @@ -123,11 +123,11 @@ public Compound(ByteCodeAppender... byteCodeAppender) { @Override public Size apply(MethodVisitor methodVisitor, - Implementation.Context instrumentationContext, + Implementation.Context implementationContext, MethodDescription instrumentedMethod) { Size size = new Size(0, instrumentedMethod.getStackSize()); for (ByteCodeAppender byteCodeAppender : this.byteCodeAppender) { - size = size.merge(byteCodeAppender.apply(methodVisitor, instrumentationContext, instrumentedMethod)); + size = size.merge(byteCodeAppender.apply(methodVisitor, implementationContext, instrumentedMethod)); } return size; } @@ -172,9 +172,9 @@ public Simple(StackManipulation... stackManipulation) { @Override public Size apply(MethodVisitor methodVisitor, - Implementation.Context instrumentationContext, + Implementation.Context implementationContext, MethodDescription instrumentedMethod) { - return new Size(stackManipulation.apply(methodVisitor, instrumentationContext).getMaximalSize(), + return new Size(stackManipulation.apply(methodVisitor, implementationContext).getMaximalSize(), instrumentedMethod.getStackSize()); } diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/Duplication.java b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/Duplication.java index 56ca842923b..b18663077ef 100644 --- a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/Duplication.java +++ b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/Duplication.java @@ -15,7 +15,7 @@ public enum Duplication implements StackManipulation { */ ZERO(StackSize.ZERO, Opcodes.NOP) { @Override - public Size apply(MethodVisitor methodVisitor, Implementation.Context instrumentationContext) { + public Size apply(MethodVisitor methodVisitor, Implementation.Context implementationContext) { return new Size(0, 0); } }, @@ -76,7 +76,7 @@ public boolean isValid() { } @Override - public Size apply(MethodVisitor methodVisitor, Implementation.Context instrumentationContext) { + public Size apply(MethodVisitor methodVisitor, Implementation.Context implementationContext) { methodVisitor.visitInsn(opcode); return size; } diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/Removal.java b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/Removal.java index 8991eb745a9..b111236a694 100644 --- a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/Removal.java +++ b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/Removal.java @@ -15,7 +15,7 @@ public enum Removal implements StackManipulation { */ ZERO(StackSize.ZERO, Opcodes.NOP) { @Override - public Size apply(MethodVisitor methodVisitor, Implementation.Context instrumentationContext) { + public Size apply(MethodVisitor methodVisitor, Implementation.Context implementationContext) { return new Size(0, 0); } }, @@ -76,7 +76,7 @@ public boolean isValid() { } @Override - public Size apply(MethodVisitor methodVisitor, Implementation.Context instrumentationContext) { + public Size apply(MethodVisitor methodVisitor, Implementation.Context implementationContext) { methodVisitor.visitInsn(opcode); return size; } diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/StackManipulation.java b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/StackManipulation.java index 1a13aeb90cb..4d5abfe8e2d 100644 --- a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/StackManipulation.java +++ b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/StackManipulation.java @@ -21,10 +21,10 @@ public interface StackManipulation { * Applies the stack manipulation that is described by this instance. * * @param methodVisitor The method visitor used to write the method implementation to. - * @param instrumentationContext The context of the current instrumentation. + * @param implementationContext The context of the current instrumentation. * @return The changes to the size of the operand stack that are implied by this stack manipulation. */ - Size apply(MethodVisitor methodVisitor, Implementation.Context instrumentationContext); + Size apply(MethodVisitor methodVisitor, Implementation.Context implementationContext); /** * Canonical representation of an illegal stack manipulation. @@ -42,7 +42,7 @@ public boolean isValid() { } @Override - public Size apply(MethodVisitor methodVisitor, Implementation.Context instrumentationContext) { + public Size apply(MethodVisitor methodVisitor, Implementation.Context implementationContext) { throw new IllegalStateException("An illegal stack manipulation must not be applied"); } @@ -68,7 +68,7 @@ public boolean isValid() { } @Override - public Size apply(MethodVisitor methodVisitor, Implementation.Context instrumentationContext) { + public Size apply(MethodVisitor methodVisitor, Implementation.Context implementationContext) { return StackSize.ZERO.toIncreasingSize(); } @@ -198,10 +198,10 @@ public boolean isValid() { } @Override - public Size apply(MethodVisitor methodVisitor, Implementation.Context instrumentationContext) { + public Size apply(MethodVisitor methodVisitor, Implementation.Context implementationContext) { Size size = new Size(0, 0); for (StackManipulation stackManipulation : this.stackManipulation) { - size = size.aggregate(stackManipulation.apply(methodVisitor, instrumentationContext)); + size = size.aggregate(stackManipulation.apply(methodVisitor, implementationContext)); } return size; } diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/Throw.java b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/Throw.java index 113eb79470c..48179d36fab 100644 --- a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/Throw.java +++ b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/Throw.java @@ -20,7 +20,7 @@ public boolean isValid() { } @Override - public Size apply(MethodVisitor methodVisitor, Implementation.Context instrumentationContext) { + public Size apply(MethodVisitor methodVisitor, Implementation.Context implementationContext) { methodVisitor.visitInsn(Opcodes.ATHROW); return StackSize.SINGLE.toDecreasingSize(); } diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/TypeCreation.java b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/TypeCreation.java index f0f2426442c..81eb2cd6932 100644 --- a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/TypeCreation.java +++ b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/TypeCreation.java @@ -43,7 +43,7 @@ public boolean isValid() { } @Override - public Size apply(MethodVisitor methodVisitor, Implementation.Context instrumentationContext) { + public Size apply(MethodVisitor methodVisitor, Implementation.Context implementationContext) { methodVisitor.visitTypeInsn(Opcodes.NEW, typeDescription.getInternalName()); return new Size(1, 1); } diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/assign/TypeCasting.java b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/assign/TypeCasting.java index 51e7e6d1be3..f3da005750c 100644 --- a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/assign/TypeCasting.java +++ b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/assign/TypeCasting.java @@ -36,7 +36,7 @@ public boolean isValid() { } @Override - public Size apply(MethodVisitor methodVisitor, Implementation.Context instrumentationContext) { + public Size apply(MethodVisitor methodVisitor, Implementation.Context implementationContext) { methodVisitor.visitTypeInsn(Opcodes.CHECKCAST, targetTypeInternalName); return StackSize.ZERO.toIncreasingSize(); } diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/assign/primitive/PrimitiveBoxingDelegate.java b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/assign/primitive/PrimitiveBoxingDelegate.java index e94a3c93015..37ba563165b 100644 --- a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/assign/primitive/PrimitiveBoxingDelegate.java +++ b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/assign/primitive/PrimitiveBoxingDelegate.java @@ -163,13 +163,13 @@ public boolean isValid() { } @Override - public Size apply(MethodVisitor methodVisitor, Implementation.Context instrumentationContext) { + public Size apply(MethodVisitor methodVisitor, Implementation.Context implementationContext) { methodVisitor.visitMethodInsn(Opcodes.INVOKESTATIC, wrapperType.getInternalName(), boxingMethodName, boxingMethodDescriptor, false); - return size.aggregate(stackManipulation.apply(methodVisitor, instrumentationContext)); + return size.aggregate(stackManipulation.apply(methodVisitor, implementationContext)); } } } diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/assign/primitive/PrimitiveUnboxingDelegate.java b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/assign/primitive/PrimitiveUnboxingDelegate.java index 6ae9fd86f76..10c253a9b1d 100644 --- a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/assign/primitive/PrimitiveUnboxingDelegate.java +++ b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/assign/primitive/PrimitiveUnboxingDelegate.java @@ -171,7 +171,7 @@ public boolean isValid() { } @Override - public Size apply(MethodVisitor methodVisitor, Implementation.Context instrumentationContext) { + public Size apply(MethodVisitor methodVisitor, Implementation.Context implementationContext) { methodVisitor.visitMethodInsn(Opcodes.INVOKEVIRTUAL, wrapperType.getInternalName(), unboxingMethodName, diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/assign/primitive/PrimitiveWideningDelegate.java b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/assign/primitive/PrimitiveWideningDelegate.java index 6f866d96cbd..47940fa830f 100644 --- a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/assign/primitive/PrimitiveWideningDelegate.java +++ b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/assign/primitive/PrimitiveWideningDelegate.java @@ -280,7 +280,7 @@ public boolean isValid() { } @Override - public Size apply(MethodVisitor methodVisitor, Implementation.Context instrumentationContext) { + public Size apply(MethodVisitor methodVisitor, Implementation.Context implementationContext) { methodVisitor.visitInsn(conversionOpcode); return size; } diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/collection/ArrayAccess.java b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/collection/ArrayAccess.java index af95a4d2752..898f8f15175 100644 --- a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/collection/ArrayAccess.java +++ b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/collection/ArrayAccess.java @@ -142,7 +142,7 @@ public boolean isValid() { } @Override - public Size apply(MethodVisitor methodVisitor, Implementation.Context instrumentationContext) { + public Size apply(MethodVisitor methodVisitor, Implementation.Context implementationContext) { methodVisitor.visitInsn(loadOpcode); return stackSize.toIncreasingSize().aggregate(new Size(-2, 0)); } @@ -184,7 +184,7 @@ public boolean isValid() { } @Override - public Size apply(MethodVisitor methodVisitor, Implementation.Context instrumentationContext) { + public Size apply(MethodVisitor methodVisitor, Implementation.Context implementationContext) { methodVisitor.visitInsn(storeOpcode); return stackSize.toDecreasingSize().aggregate(new Size(-2, 0)); } diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/collection/ArrayFactory.java b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/collection/ArrayFactory.java index 2b94b6bdbb3..fe39a2c6f7a 100644 --- a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/collection/ArrayFactory.java +++ b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/collection/ArrayFactory.java @@ -213,7 +213,7 @@ public boolean isValid() { } @Override - public Size apply(MethodVisitor methodVisitor, Implementation.Context instrumentationContext) { + public Size apply(MethodVisitor methodVisitor, Implementation.Context implementationContext) { methodVisitor.visitIntInsn(Opcodes.NEWARRAY, creationOpcode); return ARRAY_CREATION_SIZE_CHANGE; } @@ -254,7 +254,7 @@ public boolean isValid() { } @Override - public Size apply(MethodVisitor methodVisitor, Implementation.Context instrumentationContext) { + public Size apply(MethodVisitor methodVisitor, Implementation.Context implementationContext) { methodVisitor.visitTypeInsn(Opcodes.ANEWARRAY, internalTypeName); return ARRAY_CREATION_SIZE_CHANGE; } @@ -314,16 +314,16 @@ public boolean isValid() { } @Override - public Size apply(MethodVisitor methodVisitor, Implementation.Context instrumentationContext) { - Size size = IntegerConstant.forValue(stackManipulations.size()).apply(methodVisitor, instrumentationContext); + public Size apply(MethodVisitor methodVisitor, Implementation.Context implementationContext) { + Size size = IntegerConstant.forValue(stackManipulations.size()).apply(methodVisitor, implementationContext); // The array's construction does not alter the stack's size. - size = size.aggregate(arrayCreator.apply(methodVisitor, instrumentationContext)); + size = size.aggregate(arrayCreator.apply(methodVisitor, implementationContext)); int index = 0; for (StackManipulation stackManipulation : stackManipulations) { methodVisitor.visitInsn(Opcodes.DUP); size = size.aggregate(StackSize.SINGLE.toIncreasingSize()); - size = size.aggregate(IntegerConstant.forValue(index++).apply(methodVisitor, instrumentationContext)); - size = size.aggregate(stackManipulation.apply(methodVisitor, instrumentationContext)); + size = size.aggregate(IntegerConstant.forValue(index++).apply(methodVisitor, implementationContext)); + size = size.aggregate(stackManipulation.apply(methodVisitor, implementationContext)); methodVisitor.visitInsn(arrayCreator.getStorageOpcode()); size = size.aggregate(sizeDecrease); } diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/constant/ClassConstant.java b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/constant/ClassConstant.java index 1b1b792fb69..66c49423e0e 100644 --- a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/constant/ClassConstant.java +++ b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/constant/ClassConstant.java @@ -124,7 +124,7 @@ public boolean isValid() { } @Override - public Size apply(MethodVisitor methodVisitor, Implementation.Context instrumentationContext) { + public Size apply(MethodVisitor methodVisitor, Implementation.Context implementationContext) { methodVisitor.visitFieldInsn(Opcodes.GETSTATIC, fieldOwnerInternalName, PRIMITIVE_TYPE_FIELD, CLASS_TYPE_INTERNAL_NAME); return SIZE; } @@ -159,7 +159,7 @@ public boolean isValid() { } @Override - public Size apply(MethodVisitor methodVisitor, Implementation.Context instrumentationContext) { + public Size apply(MethodVisitor methodVisitor, Implementation.Context implementationContext) { methodVisitor.visitLdcInsn(Type.getType(typeDescription.getDescriptor())); return SIZE; } diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/constant/DefaultValue.java b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/constant/DefaultValue.java index 18b9b94d9d2..046b2cf5540 100644 --- a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/constant/DefaultValue.java +++ b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/constant/DefaultValue.java @@ -86,8 +86,8 @@ public boolean isValid() { } @Override - public Size apply(MethodVisitor methodVisitor, Implementation.Context instrumentationContext) { - return stackManipulation.apply(methodVisitor, instrumentationContext); + public Size apply(MethodVisitor methodVisitor, Implementation.Context implementationContext) { + return stackManipulation.apply(methodVisitor, implementationContext); } @Override diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/constant/DoubleConstant.java b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/constant/DoubleConstant.java index 423ef905c27..c4942ae4148 100644 --- a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/constant/DoubleConstant.java +++ b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/constant/DoubleConstant.java @@ -64,7 +64,7 @@ public boolean isValid() { } @Override - public StackManipulation.Size apply(MethodVisitor methodVisitor, Implementation.Context instrumentationContext) { + public StackManipulation.Size apply(MethodVisitor methodVisitor, Implementation.Context implementationContext) { methodVisitor.visitInsn(opcode); return SIZE; } @@ -99,7 +99,7 @@ public boolean isValid() { } @Override - public Size apply(MethodVisitor methodVisitor, Implementation.Context instrumentationContext) { + public Size apply(MethodVisitor methodVisitor, Implementation.Context implementationContext) { methodVisitor.visitLdcInsn(value); return SIZE; } diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/constant/FloatConstant.java b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/constant/FloatConstant.java index fc917d41511..dcbf8d0c55b 100644 --- a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/constant/FloatConstant.java +++ b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/constant/FloatConstant.java @@ -71,7 +71,7 @@ public boolean isValid() { } @Override - public Size apply(MethodVisitor methodVisitor, Implementation.Context instrumentationContext) { + public Size apply(MethodVisitor methodVisitor, Implementation.Context implementationContext) { methodVisitor.visitInsn(opcode); return SIZE; } @@ -106,7 +106,7 @@ public boolean isValid() { } @Override - public Size apply(MethodVisitor methodVisitor, Implementation.Context instrumentationContext) { + public Size apply(MethodVisitor methodVisitor, Implementation.Context implementationContext) { methodVisitor.visitLdcInsn(value); return SIZE; } diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/constant/IntegerConstant.java b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/constant/IntegerConstant.java index e007c240dfa..cf5c9d6d5cb 100644 --- a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/constant/IntegerConstant.java +++ b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/constant/IntegerConstant.java @@ -119,7 +119,7 @@ public boolean isValid() { } @Override - public Size apply(MethodVisitor methodVisitor, Implementation.Context instrumentationContext) { + public Size apply(MethodVisitor methodVisitor, Implementation.Context implementationContext) { methodVisitor.visitInsn(opcode); return SIZE; } @@ -155,7 +155,7 @@ public boolean isValid() { } @Override - public Size apply(MethodVisitor methodVisitor, Implementation.Context instrumentationContext) { + public Size apply(MethodVisitor methodVisitor, Implementation.Context implementationContext) { methodVisitor.visitIntInsn(Opcodes.BIPUSH, value); return SIZE; } @@ -203,7 +203,7 @@ public boolean isValid() { } @Override - public Size apply(MethodVisitor methodVisitor, Implementation.Context instrumentationContext) { + public Size apply(MethodVisitor methodVisitor, Implementation.Context implementationContext) { methodVisitor.visitIntInsn(Opcodes.SIPUSH, value); return SIZE; } @@ -250,7 +250,7 @@ public boolean isValid() { } @Override - public Size apply(MethodVisitor methodVisitor, Implementation.Context instrumentationContext) { + public Size apply(MethodVisitor methodVisitor, Implementation.Context implementationContext) { methodVisitor.visitLdcInsn(value); return SIZE; } diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/constant/LongConstant.java b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/constant/LongConstant.java index 40a58a146a6..3b7052ab0f5 100644 --- a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/constant/LongConstant.java +++ b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/constant/LongConstant.java @@ -64,7 +64,7 @@ public boolean isValid() { } @Override - public Size apply(MethodVisitor methodVisitor, Implementation.Context instrumentationContext) { + public Size apply(MethodVisitor methodVisitor, Implementation.Context implementationContext) { methodVisitor.visitInsn(opcode); return SIZE; } @@ -99,7 +99,7 @@ public boolean isValid() { } @Override - public Size apply(MethodVisitor methodVisitor, Implementation.Context instrumentationContext) { + public Size apply(MethodVisitor methodVisitor, Implementation.Context implementationContext) { methodVisitor.visitLdcInsn(value); return SIZE; } diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/constant/MethodConstant.java b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/constant/MethodConstant.java index d8ea3b5a5b5..2464a3bae39 100644 --- a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/constant/MethodConstant.java +++ b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/constant/MethodConstant.java @@ -77,11 +77,11 @@ public boolean isValid() { } @Override - public Size apply(MethodVisitor methodVisitor, Implementation.Context instrumentationContext) { + public Size apply(MethodVisitor methodVisitor, Implementation.Context implementationContext) { Size argumentSize = prepare(methodVisitor) .aggregate(ArrayFactory.targeting(TypeDescription.CLASS) .withValues(typeConstantsFor(methodDescription.getParameters().asTypeList())) - .apply(methodVisitor, instrumentationContext)); + .apply(methodVisitor, implementationContext)); methodVisitor.visitMethodInsn(Opcodes.INVOKEVIRTUAL, CLASS_TYPE_INTERNAL_NAME, getMethodName(), @@ -154,8 +154,8 @@ public boolean isValid() { } @Override - public Size apply(MethodVisitor methodVisitor, Implementation.Context instrumentationContext) { - return Illegal.INSTANCE.apply(methodVisitor, instrumentationContext); + public Size apply(MethodVisitor methodVisitor, Implementation.Context implementationContext) { + return Illegal.INSTANCE.apply(methodVisitor, implementationContext); } @Override @@ -310,9 +310,9 @@ public boolean isValid() { } @Override - public Size apply(MethodVisitor methodVisitor, Implementation.Context instrumentationContext) { - return FieldAccess.forField(instrumentationContext.cache(methodConstant, METHOD_TYPE)).getter() - .apply(methodVisitor, instrumentationContext); + public Size apply(MethodVisitor methodVisitor, Implementation.Context implementationContext) { + return FieldAccess.forField(implementationContext.cache(methodConstant, METHOD_TYPE)).getter() + .apply(methodVisitor, implementationContext); } @Override diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/constant/MethodHandleConstant.java b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/constant/MethodHandleConstant.java index ddf98975d92..f0ba45ed466 100644 --- a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/constant/MethodHandleConstant.java +++ b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/constant/MethodHandleConstant.java @@ -129,7 +129,7 @@ public boolean isValid() { } @Override - public Size apply(MethodVisitor methodVisitor, Implementation.Context instrumentationContext) { + public Size apply(MethodVisitor methodVisitor, Implementation.Context implementationContext) { methodVisitor.visitLdcInsn(handle); return SIZE; } diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/constant/MethodTypeConstant.java b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/constant/MethodTypeConstant.java index c237f8a0e4e..76ee1c7144b 100644 --- a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/constant/MethodTypeConstant.java +++ b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/constant/MethodTypeConstant.java @@ -64,7 +64,7 @@ public boolean isValid() { } @Override - public Size apply(MethodVisitor methodVisitor, Implementation.Context instrumentationContext) { + public Size apply(MethodVisitor methodVisitor, Implementation.Context implementationContext) { methodVisitor.visitLdcInsn(methodType); return SIZE; } diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/constant/NullConstant.java b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/constant/NullConstant.java index fe999a1230e..a7742b7f270 100644 --- a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/constant/NullConstant.java +++ b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/constant/NullConstant.java @@ -36,7 +36,7 @@ public boolean isValid() { } @Override - public Size apply(MethodVisitor methodVisitor, Implementation.Context instrumentationContext) { + public Size apply(MethodVisitor methodVisitor, Implementation.Context implementationContext) { methodVisitor.visitInsn(Opcodes.ACONST_NULL); return size; } diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/constant/TextConstant.java b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/constant/TextConstant.java index 7d11e4bcad5..b2c42aa001a 100644 --- a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/constant/TextConstant.java +++ b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/constant/TextConstant.java @@ -35,7 +35,7 @@ public boolean isValid() { } @Override - public Size apply(MethodVisitor methodVisitor, Implementation.Context instrumentationContext) { + public Size apply(MethodVisitor methodVisitor, Implementation.Context implementationContext) { methodVisitor.visitLdcInsn(text); return SIZE; } diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/member/FieldAccess.java b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/member/FieldAccess.java index 98a4c41f11a..d40b13eef17 100644 --- a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/member/FieldAccess.java +++ b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/member/FieldAccess.java @@ -172,7 +172,7 @@ public boolean isValid() { } @Override - public Size apply(MethodVisitor methodVisitor, Implementation.Context instrumentationContext) { + public Size apply(MethodVisitor methodVisitor, Implementation.Context implementationContext) { methodVisitor.visitFieldInsn(getOpcode(), fieldDescription.getDeclaringType().getInternalName(), fieldDescription.getInternalName(), diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/member/MethodInvocation.java b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/member/MethodInvocation.java index 151a6292da2..98ee054a2cd 100644 --- a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/member/MethodInvocation.java +++ b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/member/MethodInvocation.java @@ -123,8 +123,8 @@ public boolean isValid() { } @Override - public Size apply(MethodVisitor methodVisitor, Implementation.Context instrumentationContext) { - return Illegal.INSTANCE.apply(methodVisitor, instrumentationContext); + public Size apply(MethodVisitor methodVisitor, Implementation.Context implementationContext) { + return Illegal.INSTANCE.apply(methodVisitor, implementationContext); } @Override @@ -213,7 +213,7 @@ public boolean isValid() { } @Override - public Size apply(MethodVisitor methodVisitor, Implementation.Context instrumentationContext) { + public Size apply(MethodVisitor methodVisitor, Implementation.Context implementationContext) { methodVisitor.visitMethodInsn(invocationOpcode, typeDescription.getInternalName(), methodDescription.getInternalName(), @@ -350,7 +350,7 @@ public boolean isValid() { } @Override - public Size apply(MethodVisitor methodVisitor, Implementation.Context instrumentationContext) { + public Size apply(MethodVisitor methodVisitor, Implementation.Context implementationContext) { StringBuilder stringBuilder = new StringBuilder("("); for (TypeDescription parameterType : parameterTypes) { stringBuilder.append(parameterType.getDescriptor()); diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/member/MethodReturn.java b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/member/MethodReturn.java index 2441c2a5b9c..4c2292d0e4f 100644 --- a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/member/MethodReturn.java +++ b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/member/MethodReturn.java @@ -93,7 +93,7 @@ public boolean isValid() { } @Override - public Size apply(MethodVisitor methodVisitor, Implementation.Context instrumentationContext) { + public Size apply(MethodVisitor methodVisitor, Implementation.Context implementationContext) { methodVisitor.visitInsn(returnOpcode); return size; } diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/member/MethodVariableAccess.java b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/member/MethodVariableAccess.java index 4fa8795bba3..d713437bc83 100644 --- a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/member/MethodVariableAccess.java +++ b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/bytecode/member/MethodVariableAccess.java @@ -282,7 +282,7 @@ public boolean isValid() { } @Override - public Size apply(MethodVisitor methodVisitor, Implementation.Context instrumentationContext) { + public Size apply(MethodVisitor methodVisitor, Implementation.Context implementationContext) { switch (variableIndex) { case 0: methodVisitor.visitInsn(loadOpcode + loadOpcodeShortcutOffset); diff --git a/release-notes.md b/release-notes.md index eda7739e6fa..9d2d15a2889 100644 --- a/release-notes.md +++ b/release-notes.md @@ -13,13 +13,13 @@ Added several bug fixes for existing features. Beyond that the following feature exception was thrown if only a non-existent or abstract super method was found. - Added features for the interaction with Java 8 default methods. Refactored method lookup to extract invokable default methods. - - Refactored the invocation of super methods to be created by an `Instrumentation.Target`. For a future release, + - Refactored the invocation of super methods to be created by an `Implementation.Target`. For a future release, this hopefully allows for class redefinitions using today's API for creating subclasses. - Upgraded to ASM 5.0.3. ### 20. June 2014: Version 0.2.1 -Added proper support for defining class initializers. Added support for field caching from method instrumentations, +Added proper support for defining class initializers. Added support for field caching from method implementations, mainly for allowing the reuse of `Method` instances for the `@Origin` annotation and the `InvocationHandlerAdapter`. ### 15. September 2014: Version 0.3 @@ -37,11 +37,11 @@ mainly for allowing the reuse of `Method` instances for the `@Origin` annotation ### 18. November 2014: Version 0.4 -- Extended `Instrumentation.Context` to support field accessors. +- Extended `Implementation.Context` to support field accessors. - Added the `TypePool` abstraction and added a default implementation. - Refactored annotations to have an intermediate form as `AnnotationDescription` which does not need to represent loaded values. -- Refactored several built-in `Instrumentation`, among others, all implementations now support `TypeDescription` +- Refactored several built-in `Implementation`, among others, all implementations now support `TypeDescription` in addition to loaded `Class` as their arguments - Added several annotations that apply to the `MethodDelegation`. @@ -55,14 +55,14 @@ mainly for allowing the reuse of `Method` instances for the `@Origin` annotation - Added the `DeclaringTypeResolver` as a component in the default chain which selects the most specific method out of two. This is mainly meant to avoid the accidental matching of the methods that are declared by the `Object` type. -- Added `TypeInitializer`s in order to allow `Instrumentation`s to define type initializer blocks. +- Added `TypeInitializer`s in order to allow `Implementation`s to define type initializer blocks. - Replaced the `MethodMatcher` API with the `ElementMatcher` API which allows for a more sophisticated matching DSL. - Added a `ClassLoadingStrategy` for Android in its own module. - Introduced an `AgentBuilder` API and implementation. ### 5. December 2014: Version 0.5.1 -Added the `andThen` method to the `SuperMethodCall` instrumentation in order to allow for a more convenient +Added the `andThen` method to the `SuperMethodCall` implementation in order to allow for a more convenient constructor interception where a hard-coded super method call is required by the Java verifier. ### 18. January 2015: Version 0.5.2 @@ -72,18 +72,18 @@ constructor interception where a hard-coded super method call is required by the ### 24. February 2015: Version 0.5.3 -- Changed the `SuperMethodCall` instrumentation to fall back to a default method call if required. A different - behavior was found to surprise users and would introduce subtle bugs in user code as the super method instrumentation +- Changed the `SuperMethodCall` implementation to fall back to a default method call if required. A different + behavior was found to surprise users and would introduce subtle bugs in user code as the super method implementation would always work with subclassing due to Java super method call semantics. -- Added a `MethodCall` instrumentation that allows hard-coding a method call. -- Added an `InvokeDynamic` instrumentation that allows runtime dispatching by bootstrap methods. +- Added a `MethodCall` implementation that allows hard-coding a method call. +- Added an `InvokeDynamic` implementation that allows runtime dispatching by bootstrap methods. - Fixed the default `TypePool` to retain generic signatures in order to avoid that agents delete such signatures. - Fixed a bug in all of the the default `ConstructorStrategy` that effectively prevented intercepting of constructors. ### 15. March 2015: Version 0.5.4 -- Fixed missing retention of method annotations of instrumented types. -- Allowed dynamic lookup of methods for the `MethodCall` instrumentation. +- Fixed missing retention of method annotations of implementation types. +- Allowed dynamic lookup of methods for the `MethodCall` implementation. ### 20. March 2015: Version 0.5.5