1 files changed, 7 insertions, 3 deletions
diff --git a/java/dagger/internal/codegen/writing/ProducerFactoryGenerator.java b/java/dagger/internal/codegen/writing/ProducerFactoryGenerator.java
index a013be940..5e5292359 100644
--- a/java/dagger/internal/codegen/writing/ProducerFactoryGenerator.java
+++ b/java/dagger/internal/codegen/writing/ProducerFactoryGenerator.java
@@ -103,6 +103,10 @@ public final class ProducerFactoryGenerator extends SourceFileGenerator<Producti
     this.keyFactory = keyFactory;
   }
 
+  @Override
+  public ClassName nameGeneratedType(ProductionBinding binding) {
+    return generatedClassNameForBinding(binding);
+  }
 
   @Override
   public Element originatingElement(ProductionBinding binding) {
@@ -111,7 +115,7 @@ public final class ProducerFactoryGenerator extends SourceFileGenerator<Producti
   }
 
   @Override
-  public ImmutableList<TypeSpec.Builder> topLevelTypes(ProductionBinding binding) {
+  public Optional<TypeSpec.Builder> write(ProductionBinding binding) {
     // We don't want to write out resolved bindings -- we want to write out the generic version.
     checkArgument(!binding.unresolved().isPresent());
     checkArgument(binding.bindingElement().isPresent());
@@ -119,7 +123,7 @@ public final class ProducerFactoryGenerator extends SourceFileGenerator<Producti
     TypeName providedTypeName = TypeName.get(binding.contributedType());
     TypeName futureTypeName = listenableFutureOf(providedTypeName);
 
-    ClassName generatedTypeName = generatedClassNameForBinding(binding);
+    ClassName generatedTypeName = nameGeneratedType(binding);
     TypeSpec.Builder factoryBuilder =
         classBuilder(generatedTypeName)
             .addModifiers(PUBLIC, FINAL)
@@ -229,7 +233,7 @@ public final class ProducerFactoryGenerator extends SourceFileGenerator<Producti
     gwtIncompatibleAnnotation(binding).ifPresent(factoryBuilder::addAnnotation);
 
     // TODO(gak): write a sensible toString
-    return ImmutableList.of(factoryBuilder);
+    return Optional.of(factoryBuilder);
   }
 
   private MethodSpec staticFactoryMethod(ProductionBinding binding, MethodSpec constructor) {