Skip to content

Replace ClassLoadingStrategy with custom loading strategy #38906

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
Abacn merged 6 commits into from
Jun 11, 2026
Merged

Replace ClassLoadingStrategy with custom loading strategy #38906

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e0f1c7b
Replace ClassLoadingStrategy with custom loading strategy
cushon Jun 10, 2026
fed6eb2
Update findClassLoader calls to match
cushon Jun 10, 2026
6e2e31f
spotless
cushon Jun 10, 2026
3f3a772
Merge remote-tracking branch 'origin/master' into patch-1
cushon Jun 11, 2026
08a6e3a
Generate subclasses in beam's package and loade them in the same clas…
cushon Jun 11, 2026
154c9ad
Resolve classloader visibility issues in ProtoByteBuddyUtils
cushon Jun 11, 2026
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
49 changes: 38 additions & 11 deletions ...s/protobuf/src/main/java/org/apache/beam/sdk/extensions/protobuf/ProtoByteBuddyUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package org.apache.beam.sdk.extensions.protobuf;

import static org.apache.beam.sdk.extensions.protobuf.ProtoSchemaTranslator.getFieldNumber;
import static org.apache.beam.sdk.util.ByteBuddyUtils.getClassLoadingStrategy;

import com.google.protobuf.BoolValue;
import com.google.protobuf.ByteString;
Expand Down Expand Up @@ -55,7 +56,6 @@
import net.bytebuddy.description.type.TypeDescription;
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 @@ -88,7 +88,6 @@
import org.apache.beam.sdk.schemas.SchemaUserTypeCreator;
import org.apache.beam.sdk.schemas.logicaltypes.EnumerationType;
import org.apache.beam.sdk.schemas.logicaltypes.OneOfType;
import org.apache.beam.sdk.schemas.utils.ByteBuddyUtils;
import org.apache.beam.sdk.schemas.utils.ByteBuddyUtils.ConvertType;
import org.apache.beam.sdk.schemas.utils.ByteBuddyUtils.ConvertValueForGetter;
import org.apache.beam.sdk.schemas.utils.ByteBuddyUtils.ConvertValueForSetter;
Expand Down Expand Up @@ -511,8 +510,16 @@ public TypeConversion<StackManipulation> createSetterConversions(StackManipulati

int[] keys = getterMethodMap.keySet().stream().mapToInt(Integer::intValue).toArray();

Class<?> targetClass = getLoadingTarget(protoClass);
@SuppressWarnings("unchecked")
DynamicType.Builder<FieldValueGetter<@NonNull ProtoT, OneOfType.Value>> builder =
ByteBuddyUtils.subclassGetterInterface(BYTE_BUDDY, protoClass, OneOfType.Value.class);
(DynamicType.Builder<FieldValueGetter<@NonNull ProtoT, OneOfType.Value>>)
BYTE_BUDDY
.with(new InjectPackageStrategy(targetClass))
.subclass(
TypeDescription.Generic.Builder.parameterizedType(
FieldValueGetter.class, protoClass, OneOfType.Value.class)
.build());
Comment thread
cushon marked this conversation as resolved.
builder =
builder
.method(ElementMatchers.named("name"))
Expand Down Expand Up @@ -546,7 +553,7 @@ public TypeConversion<StackManipulation> createSetterConversions(StackManipulati
return builder
.visit(new AsmVisitorWrapper.ForDeclaredMethods().writerFlags(ClassWriter.COMPUTE_FRAMES))
.make()
.load(ReflectHelpers.findClassLoader(), ClassLoadingStrategy.Default.INJECTION)
.load(targetClass.getClassLoader(), getClassLoadingStrategy(targetClass))
.getLoaded()
.getDeclaredConstructor(List.class, OneOfType.class)
.newInstance(getters, oneOfType);
Expand All @@ -568,9 +575,16 @@ FieldValueSetter<ProtoBuilderT, Object> createOneOfSetter(
boolean contiguous = isContiguous(indices);
int[] keys = setterMethodMap.keySet().stream().mapToInt(Integer::intValue).toArray();

Class<?> targetClass = getLoadingTarget(protoBuilderClass);
@SuppressWarnings("unchecked")
DynamicType.Builder<FieldValueSetter<ProtoBuilderT, Object>> builder =
ByteBuddyUtils.subclassSetterInterface(
BYTE_BUDDY, protoBuilderClass, OneOfType.Value.class);
(DynamicType.Builder<FieldValueSetter<ProtoBuilderT, Object>>)
BYTE_BUDDY
.with(new InjectPackageStrategy(targetClass))
.subclass(
TypeDescription.Generic.Builder.parameterizedType(
FieldValueSetter.class, protoBuilderClass, OneOfType.Value.class)
.build());
Comment thread
cushon marked this conversation as resolved.
builder =
builder
.method(ElementMatchers.named("name"))
Expand Down Expand Up @@ -598,7 +612,7 @@ FieldValueSetter<ProtoBuilderT, Object> createOneOfSetter(
return builder
.visit(new AsmVisitorWrapper.ForDeclaredMethods().writerFlags(ClassWriter.COMPUTE_FRAMES))
.make()
.load(ReflectHelpers.findClassLoader(), ClassLoadingStrategy.Default.INJECTION)
.load(targetClass.getClassLoader(), getClassLoadingStrategy(targetClass))
.getLoaded()
.getDeclaredConstructor(List.class)
.newInstance(setters);
Expand Down Expand Up @@ -1103,11 +1117,16 @@ static <ProtoBuilderT extends MessageLite.Builder> SchemaUserTypeCreator createB
List<FieldValueSetter<ProtoBuilderT, Object>> setters,
Schema schema) {
try {
Class<?> targetClass = getLoadingTarget(builderClass);
@SuppressWarnings("unchecked")
DynamicType.Builder<Supplier<ProtoBuilderT>> builder =
(DynamicType.Builder)
(DynamicType.Builder<Supplier<ProtoBuilderT>>)
BYTE_BUDDY
.with(new InjectPackageStrategy(builderClass))
.subclass(Supplier.class)
.with(new InjectPackageStrategy(targetClass))
.subclass(
TypeDescription.Generic.Builder.parameterizedType(
Supplier.class, builderClass)
.build())
Comment thread
cushon marked this conversation as resolved.
.method(ElementMatchers.named("get"))
.intercept(new BuilderSupplier(protoClass));
Supplier<ProtoBuilderT> supplier =
Expand All @@ -1116,7 +1135,7 @@ static <ProtoBuilderT extends MessageLite.Builder> SchemaUserTypeCreator createB
new AsmVisitorWrapper.ForDeclaredMethods()
.writerFlags(ClassWriter.COMPUTE_FRAMES))
.make()
.load(ReflectHelpers.findClassLoader(), ClassLoadingStrategy.Default.INJECTION)
.load(targetClass.getClassLoader(), getClassLoadingStrategy(targetClass))
.getLoaded()
.getDeclaredConstructor()
.newInstance();
Expand Down Expand Up @@ -1190,4 +1209,12 @@ public ByteCodeAppender appender(final Target implementationTarget) {
};
}
}

private static Class<?> getLoadingTarget(Class<?> protoClass) {
ClassLoader loader = ReflectHelpers.findClassLoader(ProtoByteBuddyUtils.class, protoClass);
if (loader == ProtoByteBuddyUtils.class.getClassLoader()) {
return ProtoByteBuddyUtils.class;
}
return protoClass;
}
Comment thread
Abacn marked this conversation as resolved.
}
Loading