Skip to content

Remove some uses of ClassLoadingStrategy.Default.INJECTION #30367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
scwhittle merged 6 commits into from
Feb 26, 2024
Merged

Remove some uses of ClassLoadingStrategy.Default.INJECTION #30367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cefeece
Remove remaining uses of ClassLoadingStrategy.Default.INJECTION
scwhittle Feb 21, 2024
c58a434
change class in AutoValueUtils
scwhittle Feb 23, 2024
b6e54ae
spotless
scwhittle Feb 26, 2024
83dae07
switch load to use class that package is taken from
scwhittle Feb 26, 2024
68ef98e
spotless
scwhittle Feb 26, 2024
43d3aeb
rm proto changes
scwhittle Feb 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/utils/AutoValueUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -32,11 +33,10 @@
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;
Expand Down Expand Up @@ -227,7 +227,7 @@ private static boolean matchConstructor(

private static final ByteBuddy BYTE_BUDDY = new ByteBuddy();

static SchemaUserTypeCreator createBuilderCreator(
private static SchemaUserTypeCreator createBuilderCreator(
Class<?> builderClass,
List<FieldValueTypeInformation> setterMethods,
Method buildMethod,
Expand All @@ -242,9 +242,9 @@ static SchemaUserTypeCreator createBuilderCreator(
.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();
Expand Down
3 changes: 1 addition & 2 deletions sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/utils/POJOUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
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;
Expand Down Expand Up @@ -253,7 +252,7 @@ public static <T> SchemaUserTypeCreator createStaticCreator(
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();
Expand Down
5 changes: 3 additions & 2 deletions ...o/src/main/java/org/apache/beam/sdk/extensions/avro/schemas/utils/AvroByteBuddyUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -25,7 +27,6 @@
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;
Expand Down Expand Up @@ -95,7 +96,7 @@ private static <T> SchemaUserTypeCreator createCreator(Class<T> clazz, Schema sc
.make()
.load(
ReflectHelpers.findClassLoader(clazz.getClassLoader()),
ClassLoadingStrategy.Default.INJECTION)
getClassLoadingStrategy(clazz))
.getLoaded()
.getDeclaredConstructor()
.newInstance();
Expand Down
4 changes: 2 additions & 2 deletions ...mazon-web-services2/src/main/java/org/apache/beam/sdk/io/aws2/schemas/AwsSchemaUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@

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;
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;
Expand Down Expand Up @@ -65,7 +65,7 @@ AwsBuilderFactory<PojoT, BuilderT> builderFactory(Class<PojoT> clazz) {
.method(named("get"))
.intercept(MethodCall.invoke(builderMethod))
.make()
.load(ReflectHelpers.findClassLoader(), ClassLoadingStrategy.Default.INJECTION)
.load(ReflectHelpers.findClassLoader(), getClassLoadingStrategy(clazz))
.getLoaded()
.getDeclaredConstructor()
.newInstance();
Expand Down