This is an automated email from the ASF dual-hosted git repository. scwhittle pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/beam.git
The following commit(s) were added to refs/heads/master by this push: new 6406cfe3c9b Remove some uses of ClassLoadingStrategy.Default.INJECTION (#30367) 6406cfe3c9b is described below commit 6406cfe3c9b613e3a5aef334c458d7e20c5502c2 Author: Sam Whittle <scwhit...@users.noreply.github.com> AuthorDate: Mon Feb 26 21:34:27 2024 +0100 Remove some uses of ClassLoadingStrategy.Default.INJECTION (#30367) --- .../java/org/apache/beam/sdk/schemas/utils/AutoValueUtils.java | 10 +++++----- .../main/java/org/apache/beam/sdk/schemas/utils/POJOUtils.java | 3 +-- .../sdk/extensions/avro/schemas/utils/AvroByteBuddyUtils.java | 5 +++-- .../org/apache/beam/sdk/io/aws2/schemas/AwsSchemaUtils.java | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/utils/AutoValueUtils.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/utils/AutoValueUtils.java index 769b2287941..dcbbf70888d 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/utils/AutoValueUtils.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/utils/AutoValueUtils.java @@ -17,6 +17,7 @@ */ package org.apache.beam.sdk.schemas.utils; +import static org.apache.beam.sdk.util.ByteBuddyUtils.getClassLoadingStrategy; import static org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Preconditions.checkNotNull; import java.lang.reflect.Constructor; @@ -32,11 +33,10 @@ import java.util.Optional; import java.util.function.Function; import java.util.stream.Collectors; import net.bytebuddy.ByteBuddy; -import net.bytebuddy.asm.AsmVisitorWrapper; +import net.bytebuddy.asm.AsmVisitorWrapper.ForDeclaredMethods; import net.bytebuddy.description.method.MethodDescription.ForLoadedMethod; import net.bytebuddy.description.type.TypeDescription.ForLoadedType; import net.bytebuddy.dynamic.DynamicType; -import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; import net.bytebuddy.dynamic.scaffold.InstrumentedType; import net.bytebuddy.implementation.Implementation; import net.bytebuddy.implementation.bytecode.ByteCodeAppender; @@ -227,7 +227,7 @@ public class AutoValueUtils { private static final ByteBuddy BYTE_BUDDY = new ByteBuddy(); - static SchemaUserTypeCreator createBuilderCreator( + private static SchemaUserTypeCreator createBuilderCreator( Class<?> builderClass, List<FieldValueTypeInformation> setterMethods, Method buildMethod, @@ -242,9 +242,9 @@ public class AutoValueUtils { .intercept( new BuilderCreateInstruction(types, setterMethods, builderClass, buildMethod)); return builder - .visit(new AsmVisitorWrapper.ForDeclaredMethods().writerFlags(ClassWriter.COMPUTE_FRAMES)) + .visit(new ForDeclaredMethods().writerFlags(ClassWriter.COMPUTE_FRAMES)) .make() - .load(ReflectHelpers.findClassLoader(), ClassLoadingStrategy.Default.INJECTION) + .load(ReflectHelpers.findClassLoader(), getClassLoadingStrategy(builderClass)) .getLoaded() .getDeclaredConstructor() .newInstance(); diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/utils/POJOUtils.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/utils/POJOUtils.java index 66b0a591057..93875a20707 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/utils/POJOUtils.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/utils/POJOUtils.java @@ -32,7 +32,6 @@ import net.bytebuddy.asm.AsmVisitorWrapper; import net.bytebuddy.description.field.FieldDescription.ForLoadedField; import net.bytebuddy.description.type.TypeDescription.ForLoadedType; import net.bytebuddy.dynamic.DynamicType; -import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; import net.bytebuddy.dynamic.scaffold.InstrumentedType; import net.bytebuddy.implementation.FixedValue; import net.bytebuddy.implementation.Implementation; @@ -253,7 +252,7 @@ public class POJOUtils { return builder .visit(new AsmVisitorWrapper.ForDeclaredMethods().writerFlags(ClassWriter.COMPUTE_FRAMES)) .make() - .load(ReflectHelpers.findClassLoader(), ClassLoadingStrategy.Default.INJECTION) + .load(ReflectHelpers.findClassLoader(), getClassLoadingStrategy(clazz)) .getLoaded() .getDeclaredConstructor() .newInstance(); diff --git a/sdks/java/extensions/avro/src/main/java/org/apache/beam/sdk/extensions/avro/schemas/utils/AvroByteBuddyUtils.java b/sdks/java/extensions/avro/src/main/java/org/apache/beam/sdk/extensions/avro/schemas/utils/AvroByteBuddyUtils.java index e07f6ffb468..0a82663c177 100644 --- a/sdks/java/extensions/avro/src/main/java/org/apache/beam/sdk/extensions/avro/schemas/utils/AvroByteBuddyUtils.java +++ b/sdks/java/extensions/avro/src/main/java/org/apache/beam/sdk/extensions/avro/schemas/utils/AvroByteBuddyUtils.java @@ -17,6 +17,8 @@ */ package org.apache.beam.sdk.extensions.avro.schemas.utils; +import static org.apache.beam.sdk.util.ByteBuddyUtils.getClassLoadingStrategy; + import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Type; @@ -25,7 +27,6 @@ import net.bytebuddy.ByteBuddy; import net.bytebuddy.asm.AsmVisitorWrapper; import net.bytebuddy.description.type.TypeDescription.ForLoadedType; import net.bytebuddy.dynamic.DynamicType; -import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; import net.bytebuddy.implementation.MethodCall; import net.bytebuddy.implementation.bytecode.StackManipulation; import net.bytebuddy.implementation.bytecode.assign.TypeCasting; @@ -95,7 +96,7 @@ class AvroByteBuddyUtils { .make() .load( ReflectHelpers.findClassLoader(clazz.getClassLoader()), - ClassLoadingStrategy.Default.INJECTION) + getClassLoadingStrategy(clazz)) .getLoaded() .getDeclaredConstructor() .newInstance(); diff --git a/sdks/java/io/amazon-web-services2/src/main/java/org/apache/beam/sdk/io/aws2/schemas/AwsSchemaUtils.java b/sdks/java/io/amazon-web-services2/src/main/java/org/apache/beam/sdk/io/aws2/schemas/AwsSchemaUtils.java index 7aa23335b58..d36c197d80a 100644 --- a/sdks/java/io/amazon-web-services2/src/main/java/org/apache/beam/sdk/io/aws2/schemas/AwsSchemaUtils.java +++ b/sdks/java/io/amazon-web-services2/src/main/java/org/apache/beam/sdk/io/aws2/schemas/AwsSchemaUtils.java @@ -19,6 +19,7 @@ package org.apache.beam.sdk.io.aws2.schemas; import static net.bytebuddy.matcher.ElementMatchers.isStatic; import static net.bytebuddy.matcher.ElementMatchers.named; +import static org.apache.beam.sdk.util.ByteBuddyUtils.getClassLoadingStrategy; import java.util.function.BiConsumer; import net.bytebuddy.ByteBuddy; @@ -26,7 +27,6 @@ import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.description.type.TypeDescription; import net.bytebuddy.description.type.TypeDescription.ForLoadedType; import net.bytebuddy.description.type.TypeDescription.Generic; -import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; import net.bytebuddy.implementation.MethodCall; import org.apache.beam.sdk.schemas.FieldValueGetter; import org.apache.beam.sdk.schemas.FieldValueSetter; @@ -65,7 +65,7 @@ class AwsSchemaUtils { .method(named("get")) .intercept(MethodCall.invoke(builderMethod)) .make() - .load(ReflectHelpers.findClassLoader(), ClassLoadingStrategy.Default.INJECTION) + .load(ReflectHelpers.findClassLoader(), getClassLoadingStrategy(clazz)) .getLoaded() .getDeclaredConstructor() .newInstance();