#38 - Support multiple @factory @nAmed beans

Author: rbygrave

pom.xml

@@ -56,7 +56,7 @@
     <dependency>
       <groupId>io.dinject</groupId>
       <artifactId>dinject-generator</artifactId>
-      <version>1.17</version>
+      <version>1.18-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 

src/test/java/org/example/coffee/factory/MultipleOtherThings.java

@@ -8,15 +8,14 @@ public class MultipleOtherThings {
 
   private final Otherthing blue;
   private final Otherthing red;
-//  private final Otherthing green;
-//  private final Otherthing yellow;
+  private final Otherthing green;
+  private final Otherthing yellow;
 
-  MultipleOtherThings(@Named("blue") Otherthing blue, @Named("red") Otherthing red) {
-//    , @Named("green") Otherthing green, @Named("yellow") Otherthing yellow) {
+  MultipleOtherThings(@Named("blue") Otherthing blue, @Named("red") Otherthing red, @Named("green") Otherthing green, @Named("yellow") Otherthing yellow) {
     this.blue = blue;
     this.red = red;
-//    this.green = green;
-//    this.yellow = yellow;
+    this.green = green;
+    this.yellow = yellow;
   }
 
   public String blue() {
@@ -27,11 +26,11 @@ public String red() {
     return red.doOther();
   }
 
-//  public String green() {
-//    return green.doOther();
-//  }
+  public String green() {
+    return green.doOther();
+  }
 
-//  public String yellow() {
-//    return yellow.doOther();
-//  }
+  public String yellow() {
+    return yellow.doOther();
+  }
 }

src/test/java/org/example/coffee/factory/MultipleOtherThingsTest.java

@@ -15,8 +15,8 @@ public void test() {
       final MultipleOtherThings combined = context.getBean(MultipleOtherThings.class);
       assertEquals("blue", combined.blue());
       assertEquals("red", combined.red());
-//      assertEquals("green", combined.green());
-//      assertEquals("yellow", combined.yellow());
+      assertEquals("green", combined.green());
+      assertEquals("yellow", combined.yellow());
     }
   }
 }

src/test/java/org/example/coffee/factory/MyFactory.java

@@ -4,6 +4,8 @@
 import io.dinject.Factory;
 import org.example.coffee.factory.other.Something;
 
+import javax.inject.Named;
+
 @Factory
 public class MyFactory {
 
@@ -16,16 +18,16 @@ CFact buildCFact() {
   Something buildSomething() {
     return new SomeImpl();
   }
-//
-//  @Bean
-//  @Named("green")
-//  Otherthing greenOther() {
-//    return () -> "green";
-//  }
-//
-//  @Bean
-//  @Named("yellow")
-//  Otherthing yellowOther() {
-//    return () -> "yellow";
-//  }
+
+  @Bean
+  @Named("green")
+  Otherthing greenOther() {
+    return () -> "green";
+  }
+
+  @Bean
+  @Named("yellow")
+  Otherthing yellowOther() {
+    return () -> "yellow";
+  }
 }