Generate bootstrap method inside proxy class

.github/workflows/ci.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: ['8', '11', '15']
+        java: ['11', '15']
     steps:
     - uses: actions/checkout@v2
     - name: Setup JDK ${{ matrix.java }}

pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.airlift</groupId>
         <artifactId>airbase</artifactId>
-        <version>83</version>
+        <version>104</version>
     </parent>
 
     <artifactId>bytecode</artifactId>
@@ -20,7 +20,10 @@
         <air.check.skip-spotbugs>true</air.check.skip-spotbugs>
         <air.check.skip-pmd>true</air.check.skip-pmd>
 
-        <dep.asm.version>6.2.1</dep.asm.version>
+        <project.build.targetJdk>11</project.build.targetJdk>
+        <air.modernizer.java-version>8</air.modernizer.java-version>
+
+        <dep.asm.version>9.0</dep.asm.version>
     </properties>
 
     <dependencies>

src/main/java/io/airlift/bytecode/AnnotationDefinition.java

@@ -13,7 +13,6 @@
  */
 package io.airlift.bytecode;
 
-import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.primitives.Primitives;
 import org.objectweb.asm.AnnotationVisitor;
@@ -28,6 +27,7 @@
 import java.util.Map.Entry;
 import java.util.Set;
 
+import static com.google.common.base.Preconditions.checkArgument;
 import static io.airlift.bytecode.ParameterizedType.type;
 import static java.util.Objects.requireNonNull;
 
@@ -152,14 +152,14 @@ private static void isValidType(Object value)
         if (value instanceof List) {
             // todo verify list contains single type
             for (Object v : (List<Object>) value) {
-                Preconditions.checkArgument(ALLOWED_TYPES.contains(v.getClass()), "List contains invalid type %s", v.getClass());
+                checkArgument(ALLOWED_TYPES.contains(v.getClass()), "List contains invalid type %s", v.getClass());
                 if (v instanceof List) {
                     isValidType(value);
                 }
             }
         }
         else {
-            Preconditions.checkArgument(ALLOWED_TYPES.contains(value.getClass()), "Invalid value type %s", value.getClass());
+            checkArgument(ALLOWED_TYPES.contains(value.getClass()), "Invalid value type %s", value.getClass());
         }
     }
 

src/main/java/io/airlift/bytecode/BytecodeBlock.java

@@ -17,6 +17,7 @@
 import io.airlift.bytecode.debug.LineNumberNode;
 import io.airlift.bytecode.instruction.Constant;
 import io.airlift.bytecode.instruction.InvokeInstruction;
+import io.airlift.bytecode.instruction.InvokeInstruction.BootstrapMethod;
 import io.airlift.bytecode.instruction.JumpInstruction;
 import io.airlift.bytecode.instruction.LabelNode;
 import io.airlift.bytecode.instruction.TypeInstruction;
@@ -494,6 +495,17 @@ public BytecodeNode invokeDynamic(String name,
         return this;
     }
 
+    public BytecodeBlock invokeDynamic(
+            String name,
+            ParameterizedType returnType,
+            Iterable<ParameterizedType> parameterTypes,
+            BootstrapMethod bootstrapMethod,
+            List<Object> bootstrapArgs)
+    {
+        nodes.add(InvokeInstruction.invokeDynamic(name, returnType, parameterTypes, bootstrapMethod, bootstrapArgs));
+        return this;
+    }
+
     public BytecodeBlock ret(Class<?> type)
     {
         if (type == long.class) {

src/main/java/io/airlift/bytecode/ClassInfo.java

@@ -29,14 +29,14 @@
  */
 package io.airlift.bytecode;
 
-import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.tree.ClassNode;
 import org.objectweb.asm.tree.MethodNode;
 
 import java.util.List;
 
+import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.collect.Iterables.transform;
 import static io.airlift.bytecode.ParameterizedType.type;
 import static io.airlift.bytecode.ParameterizedType.typeFromPathName;
@@ -126,7 +126,7 @@ public List<ClassInfo> getInterfaces()
 
     public List<MethodNode> getMethods()
     {
-        Preconditions.checkState(methods != null, "Methods were not loaded for type %s", type);
+        checkState(methods != null, "Methods were not loaded for type %s", type);
         return methods;
     }
 

src/main/java/io/airlift/bytecode/DynamicClassLoader.java

@@ -13,7 +13,6 @@
  */
 package io.airlift.bytecode;
 
-import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Sets;
 import com.google.common.collect.Sets.SetView;
@@ -25,6 +24,8 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
+import static com.google.common.base.Preconditions.checkArgument;
+
 public class DynamicClassLoader
         extends ClassLoader
 {
@@ -59,7 +60,7 @@ public Class<?> defineClass(String className, byte[] bytecode)
     public Map<String, Class<?>> defineClasses(Map<String, byte[]> newClasses)
     {
         SetView<String> conflicts = Sets.intersection(pendingClasses.keySet(), newClasses.keySet());
-        Preconditions.checkArgument(conflicts.isEmpty(), "The classes %s have already been defined", conflicts);
+        checkArgument(conflicts.isEmpty(), "The classes %s have already been defined", conflicts);
 
         pendingClasses.putAll(newClasses);
         try {
@@ -127,8 +128,15 @@ protected Class<?> loadClass(String name, boolean resolve)
                 }
             }
 
-            Class<?> clazz = getParent().loadClass(name);
-            return resolveClass(clazz, resolve);
+            // try parent if present
+            ClassLoader parent = getParent();
+            if (parent != null) {
+                Class<?> clazz = parent.loadClass(name);
+                return resolveClass(clazz, resolve);
+            }
+
+            // try bootstrap class loader
+            return super.loadClass(name, resolve);
         }
     }