#23 - when using Lombok @slf4j getting Argument passed to when() is not a mock

Author: rbygrave

pom.xml

@@ -40,10 +40,17 @@
 
     <!-- test dependencies -->
 
+    <dependency>
+      <groupId>org.projectlombok</groupId>
+      <artifactId>lombok</artifactId>
+      <version>1.18.6</version>
+      <scope>test</scope>
+    </dependency>
+
     <dependency>
       <groupId>io.dinject</groupId>
       <artifactId>dinject-generator</artifactId>
-      <version>1.4</version>
+      <version>1.6</version>
       <scope>test</scope>
     </dependency>
 

src/main/java/io/dinject/core/DBuilderExtn.java

@@ -43,17 +43,26 @@ public boolean isAddBeanFor(Class<?> addForType, Class<?> injectTarget) {
   @SuppressWarnings("unchecked")
   @Override
   public Object enrich(Object bean, Class<?>[] types) {
-    EnrichBean enrich = enrichMap.get(typeOf(bean, types));
+    EnrichBean enrich = getEnrich(bean, types);
     return enrich != null ? enrich.enrich(bean) : bean;
   }
 
   /**
-   * Return the type to lookup for enrichment.
+   * Search for EnrichBean on the bean or any of the interface types.
    */
-  private Class<?> typeOf(Object bean, Class<?>... types) {
-    if (types.length > 0) {
-      return types[0];
+  private EnrichBean getEnrich(Object bean, Class<?>[] types) {
+
+    EnrichBean enrich = enrichMap.get(bean.getClass());
+    if (enrich != null) {
+      return enrich;
+    }
+    for (Class<?> type : types) {
+      enrich = enrichMap.get(type);
+      if (enrich != null) {
+        return enrich;
+      }
     }
-    return bean.getClass();
+    return null;
   }
+
 }

src/test/java/org/example/coffee/grind/Grinder.java

@@ -1,9 +1,12 @@
 package org.example.coffee.grind;
 
+import lombok.extern.slf4j.Slf4j;
+
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
+@Slf4j
 @Singleton
 public class Grinder {