This is an automated email from the ASF dual-hosted git repository.
lcwik 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 2b6291250f9 Replace more uses of
`ClassLoadingStrategy.Default.INJECTION` (#23210)
2b6291250f9 is described below
commit 2b6291250f9b57bc3ce5f8e9407d234a6c89cd61
Author: Liam Miller-Cushon <cus...@google.com>
AuthorDate: Fri Feb 17 15:20:45 2023 -0800
Replace more uses of `ClassLoadingStrategy.Default.INJECTION` (#23210)
* Replace more uses of `ClassLoadingStrategy.Default.INJECTION`
in preparation for Java 17+. Follow-up to:
https://github.com/apache/beam/commit/98f1f75459ee300baa5574042149a65063239705.
* Move helper method to a shared ByteBuddyUtils class
* spotlessApply
* Apply suggestions from code review
Co-authored-by: Lukasz Cwik <lc...@google.com>
* Fix nullness issues, add an overload that takes a custom classloader
* spotless apply
* Fix imports
* Update
sdks/java/core/src/main/java/org/apache/beam/sdk/util/ByteBuddyUtils.java
Co-authored-by: Lukasz Cwik <lc...@google.com>
* Use ISE instead of LinkageError
* Add a missing import
* s/getClassLoader/findClassLoader
* fix Checker Framework error
---------
Co-authored-by: Lukasz Cwik <lc...@google.com>
---
.../apache/beam/sdk/coders/RowCoderGenerator.java | 7 ++-
.../beam/sdk/schemas/utils/AvroByteBuddyUtils.java | 5 +-
.../beam/sdk/schemas/utils/ByteBuddyUtils.java | 4 +-
.../beam/sdk/schemas/utils/JavaBeanUtils.java | 11 +++--
.../apache/beam/sdk/schemas/utils/POJOUtils.java | 10 ++--
.../sdk/schemas/utils/SelectByteBuddyHelpers.java | 7 ++-
.../reflect/ByteBuddyOnTimerInvokerFactory.java | 10 ++--
.../org/apache/beam/sdk/util/ByteBuddyUtils.java | 57 ++++++++++++++++++++++
8 files changed, 87 insertions(+), 24 deletions(-)
diff --git
a/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/RowCoderGenerator.java
b/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/RowCoderGenerator.java
index 5ce7358d882..5a37a22e22d 100644
---
a/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/RowCoderGenerator.java
+++
b/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/RowCoderGenerator.java
@@ -17,6 +17,7 @@
*/
package org.apache.beam.sdk.coders;
+import static org.apache.beam.sdk.util.ByteBuddyUtils.getClassLoadingStrategy;
import static
org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Preconditions.checkState;
import java.io.IOException;
@@ -36,7 +37,6 @@ import net.bytebuddy.description.modifier.Visibility;
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;
@@ -55,6 +55,7 @@ import org.apache.beam.sdk.schemas.Schema;
import org.apache.beam.sdk.schemas.Schema.Field;
import org.apache.beam.sdk.schemas.Schema.FieldType;
import org.apache.beam.sdk.schemas.SchemaCoder;
+import org.apache.beam.sdk.util.common.ReflectHelpers;
import org.apache.beam.sdk.values.Row;
import
org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Preconditions;
import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.Maps;
@@ -172,7 +173,9 @@ public abstract class RowCoderGenerator {
rowCoder =
builder
.make()
- .load(Coder.class.getClassLoader(),
ClassLoadingStrategy.Default.INJECTION)
+ .load(
+
ReflectHelpers.findClassLoader(schema.getClass().getClassLoader()),
+ getClassLoadingStrategy(schema.getClass()))
.getLoaded()
.getDeclaredConstructor(Coder[].class, int[].class)
.newInstance((Object) componentCoders, (Object)
encodingPosToRowIndex);
diff --git
a/sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/utils/AvroByteBuddyUtils.java
b/sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/utils/AvroByteBuddyUtils.java
index eb01b83c94f..4c9055ba245 100644
---
a/sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/utils/AvroByteBuddyUtils.java
+++
b/sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/utils/AvroByteBuddyUtils.java
@@ -17,6 +17,8 @@
*/
package org.apache.beam.sdk.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;
@@ -99,7 +100,7 @@ class AvroByteBuddyUtils {
.make()
.load(
ReflectHelpers.findClassLoader(clazz.getClassLoader()),
- ClassLoadingStrategy.Default.INJECTION)
+ getClassLoadingStrategy(clazz))
.getLoaded()
.getDeclaredConstructor()
.newInstance();
diff --git
a/sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/utils/ByteBuddyUtils.java
b/sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/utils/ByteBuddyUtils.java
index bb0003c4d4d..65eaffb9318 100644
---
a/sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/utils/ByteBuddyUtils.java
+++
b/sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/utils/ByteBuddyUtils.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.v26_0_jre.com.google.common.base.Preconditions.checkNotNull;
import java.lang.reflect.Constructor;
@@ -43,7 +44,6 @@ import
net.bytebuddy.description.method.MethodDescription.ForLoadedMethod;
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.Implementation;
import net.bytebuddy.implementation.Implementation.Context;
@@ -459,7 +459,7 @@ public class ByteBuddyUtils {
.make()
.load(
ReflectHelpers.findClassLoader(((Class)
fromType).getClassLoader()),
- ClassLoadingStrategy.Default.INJECTION)
+ getClassLoadingStrategy((Class) fromType))
.getLoaded();
}
diff --git
a/sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/utils/JavaBeanUtils.java
b/sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/utils/JavaBeanUtils.java
index ec0dba2c942..49d30f0e345 100644
---
a/sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/utils/JavaBeanUtils.java
+++
b/sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/utils/JavaBeanUtils.java
@@ -17,6 +17,8 @@
*/
package org.apache.beam.sdk.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.Method;
@@ -28,7 +30,6 @@ import net.bytebuddy.ByteBuddy;
import net.bytebuddy.asm.AsmVisitorWrapper;
import net.bytebuddy.description.method.MethodDescription.ForLoadedMethod;
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;
@@ -162,7 +163,7 @@ public class JavaBeanUtils {
.load(
ReflectHelpers.findClassLoader(
typeInformation.getMethod().getDeclaringClass().getClassLoader()),
- ClassLoadingStrategy.Default.INJECTION)
+
getClassLoadingStrategy(typeInformation.getMethod().getDeclaringClass()))
.getLoaded()
.getDeclaredConstructor()
.newInstance();
@@ -226,7 +227,7 @@ public class JavaBeanUtils {
.load(
ReflectHelpers.findClassLoader(
typeInformation.getMethod().getDeclaringClass().getClassLoader()),
- ClassLoadingStrategy.Default.INJECTION)
+
getClassLoadingStrategy(typeInformation.getMethod().getDeclaringClass()))
.getLoaded()
.getDeclaredConstructor()
.newInstance();
@@ -290,7 +291,7 @@ public class JavaBeanUtils {
.make()
.load(
ReflectHelpers.findClassLoader(clazz.getClassLoader()),
- ClassLoadingStrategy.Default.INJECTION)
+ getClassLoadingStrategy(clazz))
.getLoaded()
.getDeclaredConstructor()
.newInstance();
@@ -338,7 +339,7 @@ public class JavaBeanUtils {
.make()
.load(
ReflectHelpers.findClassLoader(clazz.getClassLoader()),
- ClassLoadingStrategy.Default.INJECTION)
+ getClassLoadingStrategy(clazz))
.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 46970c6bc4f..47e2b4eec5f 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
@@ -17,6 +17,8 @@
*/
package org.apache.beam.sdk.schemas.utils;
+import static org.apache.beam.sdk.util.ByteBuddyUtils.getClassLoadingStrategy;
+
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
@@ -156,7 +158,7 @@ public class POJOUtils {
.make()
.load(
ReflectHelpers.findClassLoader(clazz.getClassLoader()),
- ClassLoadingStrategy.Default.INJECTION)
+ getClassLoadingStrategy(clazz))
.getLoaded()
.getDeclaredConstructor()
.newInstance();
@@ -208,7 +210,7 @@ public class POJOUtils {
.make()
.load(
ReflectHelpers.findClassLoader(clazz.getClassLoader()),
- ClassLoadingStrategy.Default.INJECTION)
+ getClassLoadingStrategy(clazz))
.getLoaded()
.getDeclaredConstructor()
.newInstance();
@@ -299,7 +301,7 @@ public class POJOUtils {
.make()
.load(
ReflectHelpers.findClassLoader(field.getDeclaringClass().getClassLoader()),
- ClassLoadingStrategy.Default.INJECTION)
+ getClassLoadingStrategy(field.getDeclaringClass()))
.getLoaded()
.getDeclaredConstructor()
.newInstance();
@@ -379,7 +381,7 @@ public class POJOUtils {
.make()
.load(
ReflectHelpers.findClassLoader(field.getDeclaringClass().getClassLoader()),
- ClassLoadingStrategy.Default.INJECTION)
+ getClassLoadingStrategy(field.getDeclaringClass()))
.getLoaded()
.getDeclaredConstructor()
.newInstance();
diff --git
a/sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/utils/SelectByteBuddyHelpers.java
b/sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/utils/SelectByteBuddyHelpers.java
index fd3b3735ee5..ec3db9b3cce 100644
---
a/sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/utils/SelectByteBuddyHelpers.java
+++
b/sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/utils/SelectByteBuddyHelpers.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.v26_0_jre.com.google.common.base.Preconditions.checkNotNull;
import com.google.auto.value.AutoValue;
@@ -36,7 +37,6 @@ import net.bytebuddy.description.modifier.Visibility;
import net.bytebuddy.description.type.TypeDescription.ForLoadedType;
import net.bytebuddy.description.type.TypeDescription.Generic;
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.Implementation.Context;
@@ -66,6 +66,7 @@ import org.apache.beam.sdk.schemas.Schema;
import org.apache.beam.sdk.schemas.Schema.FieldType;
import org.apache.beam.sdk.schemas.utils.ByteBuddyUtils.IfNullElse;
import org.apache.beam.sdk.schemas.utils.ByteBuddyUtils.ShortCircuitReturnNull;
+import org.apache.beam.sdk.util.common.ReflectHelpers;
import org.apache.beam.sdk.values.Row;
import
org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Preconditions;
import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.Lists;
@@ -177,7 +178,9 @@ class SelectByteBuddyHelpers {
return builder
.visit(new
AsmVisitorWrapper.ForDeclaredMethods().writerFlags(ClassWriter.COMPUTE_FRAMES))
.make()
- .load(Row.class.getClassLoader(),
ClassLoadingStrategy.Default.INJECTION)
+ .load(
+
ReflectHelpers.findClassLoader(schemaAndDescriptor.getClass().getClassLoader()),
+ getClassLoadingStrategy(schemaAndDescriptor.getClass()))
.getLoaded()
.getDeclaredConstructor(Schema.class)
.newInstance(outputSchema);
diff --git
a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/reflect/ByteBuddyOnTimerInvokerFactory.java
b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/reflect/ByteBuddyOnTimerInvokerFactory.java
index 49affe696e4..09e6212fa66 100644
---
a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/reflect/ByteBuddyOnTimerInvokerFactory.java
+++
b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/reflect/ByteBuddyOnTimerInvokerFactory.java
@@ -17,6 +17,7 @@
*/
package org.apache.beam.sdk.transforms.reflect;
+import static org.apache.beam.sdk.util.ByteBuddyUtils.getClassLoadingStrategy;
import static org.apache.beam.sdk.util.common.ReflectHelpers.findClassLoader;
import java.lang.reflect.Constructor;
@@ -27,7 +28,6 @@ import net.bytebuddy.description.modifier.FieldManifestation;
import net.bytebuddy.description.modifier.Visibility;
import net.bytebuddy.description.type.TypeDescription;
import net.bytebuddy.dynamic.DynamicType;
-import net.bytebuddy.dynamic.loading.ClassLoadingStrategy;
import net.bytebuddy.dynamic.scaffold.InstrumentedType;
import net.bytebuddy.dynamic.scaffold.subclass.ConstructorStrategy;
import net.bytebuddy.implementation.Implementation;
@@ -225,9 +225,7 @@ class ByteBuddyOnTimerInvokerFactory implements
OnTimerInvokerFactory {
Class<? extends OnTimerInvoker<?, ?>> res =
(Class<? extends OnTimerInvoker<?, ?>>)
unloaded
- .load(
- findClassLoader(fnClass.getClassLoader()),
- ClassLoadingStrategy.Default.INJECTION)
+ .load(findClassLoader(fnClass.getClassLoader()),
getClassLoadingStrategy(fnClass))
.getLoaded();
return res;
}
@@ -277,9 +275,7 @@ class ByteBuddyOnTimerInvokerFactory implements
OnTimerInvokerFactory {
Class<? extends OnTimerInvoker<?, ?>> res =
(Class<? extends OnTimerInvoker<?, ?>>)
unloaded
- .load(
- findClassLoader(fnClass.getClassLoader()),
- ClassLoadingStrategy.Default.INJECTION)
+ .load(findClassLoader(fnClass.getClassLoader()),
getClassLoadingStrategy(fnClass))
.getLoaded();
return res;
}
diff --git
a/sdks/java/core/src/main/java/org/apache/beam/sdk/util/ByteBuddyUtils.java
b/sdks/java/core/src/main/java/org/apache/beam/sdk/util/ByteBuddyUtils.java
new file mode 100644
index 00000000000..3a7dd889d95
--- /dev/null
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/util/ByteBuddyUtils.java
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.beam.sdk.util;
+
+import static java.util.Objects.requireNonNull;
+
+import java.lang.reflect.Method;
+import net.bytebuddy.dynamic.loading.ClassInjector;
+import net.bytebuddy.dynamic.loading.ClassLoadingStrategy;
+import org.apache.beam.sdk.util.common.ReflectHelpers;
+
+/** Utilities for working with Byte Buddy. */
+public final class ByteBuddyUtils {
+ private ByteBuddyUtils() {} // Non-instantiable
+
+ /** Returns a class loading strategy that is compatible with Java 17+. */
+ public static ClassLoadingStrategy<ClassLoader>
getClassLoadingStrategy(Class<?> targetClass) {
+ try {
+ ClassLoadingStrategy<ClassLoader> strategy;
+ if (ClassInjector.UsingLookup.isAvailable()) {
+ ClassLoader classLoader = ReflectHelpers.findClassLoader(targetClass);
+ Class<?> methodHandles =
Class.forName("java.lang.invoke.MethodHandles", true, classLoader);
+ @SuppressWarnings("nullness") // MethodHandles#lookup accepts null
+ Object lookup = methodHandles.getMethod("lookup").invoke(null);
+ Class<?> lookupClass =
+ Class.forName("java.lang.invoke.MethodHandles$Lookup", true,
classLoader);
+ Method privateLookupIn =
+ methodHandles.getMethod("privateLookupIn", Class.class,
lookupClass);
+ @SuppressWarnings("nullness") // this is a static method, the receiver
can be null
+ Object privateLookup = requireNonNull(privateLookupIn.invoke(null,
targetClass, lookup));
+ strategy =
ClassLoadingStrategy.UsingLookup.of(requireNonNull(privateLookup));
+ } else if (ClassInjector.UsingReflection.isAvailable()) {
+ strategy = ClassLoadingStrategy.Default.INJECTION;
+ } else {
+ throw new IllegalStateException("No code generation strategy
available");
+ }
+ return strategy;
+ } catch (ReflectiveOperationException e) {
+ throw new IllegalStateException("No code generation strategy available",
e);
+ }
+ }
+}
