diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/dynamic/loading/ClassInjector.java b/byte-buddy-dep/src/main/java/net/bytebuddy/dynamic/loading/ClassInjector.java index 0071ab2a0c..de6564aed7 100644 --- a/byte-buddy-dep/src/main/java/net/bytebuddy/dynamic/loading/ClassInjector.java +++ b/byte-buddy-dep/src/main/java/net/bytebuddy/dynamic/loading/ClassInjector.java @@ -88,6 +88,15 @@ public interface ClassInjector { */ boolean isAlive(); + /** + * Injects the given types into the represented class loader. + * + * @param types The types to load via injection. + * @param classFileLocator The class file locator to use for resolving binary representations. + * @return The loaded types that were passed as arguments. + */ + Map> inject(Set types, ClassFileLocator classFileLocator); + /** * Injects the given types into the represented class loader. * @@ -95,7 +104,7 @@ public interface ClassInjector { * @param classFileLocator The class file locator to use for resolving binary representations. * @return The loaded types that were passed as arguments. */ - Map> inject(Set names, ClassFileLocator classFileLocator); + Map> injectRaw(Set names, ClassFileLocator classFileLocator); /** * Injects the given types into the represented class loader. @@ -106,9 +115,9 @@ public interface ClassInjector { Map> inject(Map types); /** - * Injects the given types into the represented class loader using a mapping from name to binary representation. + * Injects the given types into the represented class loader. * - * @param types The types to load via injection. + * @param types The names of the type to load via injection. * @return The loaded types that were passed as arguments. */ Map> injectRaw(Map types); @@ -118,6 +127,22 @@ public interface ClassInjector { */ abstract class AbstractBase implements ClassInjector { + /** + * {@inheritDoc} + */ + public Map> inject(Set types, ClassFileLocator classFileLocator) { + Set names = new LinkedHashSet(); + for (TypeDescription type : types) { + names.add(type.getName()); + } + Map> loadedTypes = injectRaw(names, classFileLocator); + Map> result = new HashMap>(); + for (TypeDescription type : types) { + result.put(type, loadedTypes.get(type.getName())); + } + return result; + } + /** * {@inheritDoc} */ @@ -138,7 +163,7 @@ public Map> inject(Map> injectRaw(Map types) { - return inject(types.keySet(), new ClassFileLocator.Simple(types)); + return injectRaw(types.keySet(), new ClassFileLocator.Simple(types)); } } @@ -254,7 +279,7 @@ public boolean isAlive() { /** * {@inheritDoc} */ - public Map> inject(Set names, ClassFileLocator classFileLocator) { + public Map> injectRaw(Set names, ClassFileLocator classFileLocator) { Dispatcher dispatcher = DISPATCHER.initialize(); Map> result = new HashMap>(); for (String name : names) { @@ -1645,7 +1670,7 @@ public boolean isAlive() { /** * {@inheritDoc} */ - public Map> inject(Set names, ClassFileLocator classFileLocator) { + public Map> injectRaw(Set names, ClassFileLocator classFileLocator) { PackageDescription target = TypeDescription.ForLoadedType.of(lookupType()).getPackage(); if (target == null) { throw new IllegalArgumentException("Cannot inject array or primitive type"); @@ -1832,7 +1857,7 @@ public boolean isAlive() { /** * {@inheritDoc} */ - public Map> inject(Set names, ClassFileLocator classFileLocator) { + public Map> injectRaw(Set names, ClassFileLocator classFileLocator) { Dispatcher dispatcher = this.dispatcher.initialize(); Map> result = new HashMap>(); synchronized (classLoader == null @@ -2486,7 +2511,7 @@ public boolean isAlive() { /** * {@inheritDoc} */ - public Map> inject(Set names, ClassFileLocator classFileLocator) { + public Map> injectRaw(Set names, ClassFileLocator classFileLocator) { File file = new File(folder, JAR + randomString.nextString() + "." + JAR); try { if (!file.createNewFile()) { @@ -2756,7 +2781,7 @@ public boolean isAlive() { /** * {@inheritDoc} */ - public Map> inject(Set names, ClassFileLocator classFileLocator) { + public Map> injectRaw(Set names, ClassFileLocator classFileLocator) { Map> result = new HashMap>(); synchronized (classLoader == null ? BOOTSTRAP_LOADER_LOCK