#27 - No injection of dependencies when using withSpy() and field injection

Author: rbygrave

pom.xml

@@ -50,7 +50,7 @@
     <dependency>
       <groupId>io.dinject</groupId>
       <artifactId>dinject-generator</artifactId>
-      <version>1.6</version>
+      <version>1.8</version>
       <scope>test</scope>
     </dependency>
 

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

@@ -63,17 +63,17 @@ public interface Builder {
    * @param name  The (optional) name of the instance.
    * @param types Interfaces and class level annotations this bean provides or associates to.
    */
-  void register(Object bean, String name, Class<?>... types);
+  <T> T register(T bean, String name, Class<?>... types);
 
   /**
    * Register the bean as a Primary bean.
    */
-  void registerPrimary(Object bean, String name, Class<?>... types);
+  <T> T registerPrimary(T bean, String name, Class<?>... types);
 
   /**
    * Register the bean as a secondary bean.
    */
-  void registerSecondary(Object bean, String name, Class<?>... types);
+  <T> T registerSecondary(T bean, String name, Class<?>... types);
 
   /**
    * Add a lifecycle bean.
@@ -133,5 +133,5 @@ public interface Builder {
    * @param types The types this bean registers for
    * @return Either the bean or the enriched bean to register into the context.
    */
-  Object enrich(Object bean, Class<?>[] types);
+  <T> T enrich(T bean, Class<?>[] types);
 }

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

@@ -153,39 +153,42 @@ public void addChild(BeanContext child) {
    * Return the bean to register potentially with spy enhancement.
    */
   @Override
-  public Object enrich(Object bean, Class<?>[] types) {
+  public <T> T enrich(T bean, Class<?>[] types) {
     // only enriched by DBuilderExtn
     return bean;
   }
 
   @Override
-  public void register(Object bean, String name, Class<?>... types) {
+  public <T> T register(T bean, String name, Class<?>... types) {
     String canonicalName = bean.getClass().getCanonicalName();
     if (parent != null) {
       // enrichment only exist on top level builder
       bean = parent.enrich(bean, types);
     }
     beanMap.register(canonicalName, bean, name, types);
+    return bean;
   }
 
   @Override
-  public void registerPrimary(Object bean, String name, Class<?>... types) {
+  public <T> T registerPrimary(T bean, String name, Class<?>... types) {
     String canonicalName = bean.getClass().getCanonicalName();
     if (parent != null) {
       // enrichment only exist on top level builder
       bean = parent.enrich(bean, types);
     }
     beanMap.registerPrimary(canonicalName, bean, name, types);
+    return bean;
   }
 
   @Override
-  public void registerSecondary(Object bean, String name, Class<?>... types) {
+  public <T> T registerSecondary(T bean, String name, Class<?>... types) {
     String canonicalName = bean.getClass().getCanonicalName();
     if (parent != null) {
       // enrichment only exist on top level builder
       bean = parent.enrich(bean, types);
     }
     beanMap.registerSecondary(canonicalName, bean, name, types);
+    return bean;
   }
 
   @Override

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

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