jessebrault/groowt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed some di problems.

Browse Source
This commit is contained in:
JesseBrault0709 2024-05-30 11:09:06 +02:00
parent f4e44fe050
commit ab4d006955
2 changed files with 50 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
util/di/src/main/java/groowt/util/di/AbstractInjectingObjectFactory.java
View File

@ -166,6 +166,18 @@ public abstract class AbstractInjectingObjectFactory implements ObjectFactory {
return null;
}
private static boolean areArgsAssignable(Class<?>[] paramTypes, Object[] givenArgs) {
if (paramTypes.length != givenArgs.length) {
return false;
}
for (int i = 0; i < paramTypes.length; i++) {
if (!paramTypes[i].isInstance(givenArgs[i])) {
return false;
}
}
return true;
}
/**
* @implNote If overridden, please cache any found non-inject constructors using
* {@link #putCachedNonInjectConstructor}.
@ -187,7 +199,7 @@ public abstract class AbstractInjectingObjectFactory implements ObjectFactory {
final Constructor<?>[] constructors = this.cachedAllConstructors.computeIfAbsent(clazz, Class::getConstructors);
for (Constructor<?> constructor : constructors) {
if (Arrays.equals(constructor.getParameterTypes(), types)) {
if (areArgsAssignable(constructor.getParameterTypes(), constructorArgs)) {
final Constructor<T> found = (Constructor<T>) constructor;
this.putCachedNonInjectConstructor(new CachedNonInjectConstructor<>(clazz, found, types));
return found;

37
util/di/src/test/java/groowt/util/di/DefaultRegistryObjectFactoryTests.java
View File

@ -213,4 +213,41 @@ public class DefaultRegistryObjectFactoryTests {
assertEquals("HELLO, WORLD!", g.greet());
}
public static final class NoInjectGreeter implements Greeter {
private final String greeting;
public NoInjectGreeter(String greeting) {
this.greeting = greeting;
}
@Override
public String greet() {
return this.greeting;
}
}
@Test
public void noInjectFoundViaGet() {
final var b = DefaultRegistryObjectFactory.Builder.withDefaults();
b.configureRegistry(r -> {
r.bind(NoInjectGreeter.class, toSelf());
});
final var f = b.build();
final var g = f.get(NoInjectGreeter.class, "Given Greeting");
assertEquals("Given Greeting", g.greet());
}
@Test
public void noInjectFindViaCreate() {
final var b = DefaultRegistryObjectFactory.Builder.withDefaults();
b.configureRegistry(r -> {
r.bind(NoInjectGreeter.class, toSelf());
});
final var f = b.build();
final var g = f.createInstance(NoInjectGreeter.class, "Given Greeting");
assertEquals("Given Greeting", g.greet());
}
}