Only load neighbors when required

Revxrsal · Jul 16, 2021 · 0e3d4c5 · 0e3d4c5
1 parent d122692
commit 0e3d4c5
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 9 deletions.
diff --git a/core/src/main/java/io/tunabytes/bytecode/MixinsConfig.java b/core/src/main/java/io/tunabytes/bytecode/MixinsConfig.java
@@ -1,5 +1,7 @@
 package io.tunabytes.bytecode;
 
+import io.tunabytes.classloader.TunaClassDefiner;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.*;
@@ -20,15 +22,17 @@ public MixinsConfig() {
             properties.forEach((key, value) -> mixinEntries.add(new MixinEntry((String) key, (String) value)));
             InputStream neighborsStream = getClass().getResourceAsStream("/mixins-neighbors.properties");
             requireNonNull(neighborsStream, "mixins-neighbors.properties not found. Did you add tuna-bytes as an annotation processor?");
-            Properties neighborsProps = new Properties();
-            neighborsProps.load(neighborsStream);
-            neighborsProps.forEach((key, value) -> {
-                try {
-                    neighbors.put((String) key, Class.forName(String.valueOf(value)));
-                } catch (ClassNotFoundException e) {
-                    e.printStackTrace();
-                }
-            });
+            if (TunaClassDefiner.requiresNeighbor()) {
+                Properties neighborsProps = new Properties();
+                neighborsProps.load(neighborsStream);
+                neighborsProps.forEach((key, value) -> {
+                    try {
+                        neighbors.put((String) key, Class.forName(String.valueOf(value)));
+                    } catch (ClassNotFoundException e) {
+                        e.printStackTrace();
+                    }
+                });
+            }
         } catch (IOException e) {
             e.printStackTrace();
         }

diff --git a/core/src/main/java/io/tunabytes/classloader/ClassDefiner.java b/core/src/main/java/io/tunabytes/classloader/ClassDefiner.java
@@ -15,4 +15,9 @@ Class<?> defineClass(String name,
                          Class<?> neighbor,
                          ClassLoader loader,
                          ProtectionDomain protectionDomain) throws ClassFormatError;
+
+    default boolean requiresNeighbor() {
+        return false;
+    }
+
 }
diff --git a/core/src/main/java/io/tunabytes/classloader/TunaClassDefiner.java b/core/src/main/java/io/tunabytes/classloader/TunaClassDefiner.java
@@ -71,4 +71,8 @@ public static Class<?> defineClass(String name,
                                        ProtectionDomain protectionDomain) throws ClassFormatError {
         return classDefiner.defineClass(name, b, 0, b.length, neighbor, loader, protectionDomain);
     }
+
+    public static boolean requiresNeighbor() {
+        return classDefiner.requiresNeighbor();
+    }
 }
diff --git a/java11/src/main/java/io/tunabytes/classloader/Java11.java b/java11/src/main/java/io/tunabytes/classloader/Java11.java
@@ -71,4 +71,8 @@ public static Class<?> toClass(Class<?> neighbor, byte[] bcode) {
                     + " has no permission to define the class");
         }
     }
+
+    @Override public boolean requiresNeighbor() {
+        return true;
+    }
 }