finally fixing bug which gets the wrong list

mageddo · Aug 7, 2024 · e520b3d · e520b3d
1 parent 69565b5
commit e520b3d
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/test/java/dagger/sheath/CtxWrapper.java b/src/test/java/dagger/sheath/CtxWrapper.java
@@ -8,6 +8,7 @@
 
 import javax.inject.Provider;
 import java.lang.reflect.Field;
+import java.lang.reflect.Method;
 import java.util.Objects;
 import java.util.function.Consumer;
 
@@ -43,7 +44,7 @@ public Object get(Signature signature) {
 
     {
       final var found = findUsingCtx(signature);
-      if(found != null){
+      if (found != null) {
         log.debug("status=foundByUsingCtx");
         return found;
       }
@@ -64,7 +65,7 @@ private Object findUsingCtx(Signature signature) {
       final var method = MethodUtils
         .getAllMethods(this.getCtxClass())
         .stream()
-        .filter(it -> it.getReturnType().isAssignableFrom(signature.getClazz()) && it.getParameterTypes().length == 0)
+        .filter(it -> isAssignable(it, signature))
         .findFirst();
       if (method.isPresent()) {
         return MethodUtils.invoke(method.get(), this.ctx, true);
@@ -75,6 +76,11 @@ private Object findUsingCtx(Signature signature) {
     return null;
   }
 
+  private static boolean isAssignable(Method m, Signature sig) {
+    final var mSig = Signature.of(m.getReturnType());
+    return mSig.isSameOrInheritFrom(sig) && m.getParameterTypes().length == 0;
+  }
+
   private Object findUsingBindingMethods(Class<?> clazz) {
     try {
       final var bindingMethod = BindingMethod.findBindingMethod(this);