1 files changed, 9 insertions, 13 deletions
diff --git a/factory/src/main/java/com/google/auto/factory/processor/AutoFactoryDeclaration.java b/factory/src/main/java/com/google/auto/factory/processor/AutoFactoryDeclaration.java
index ad4ccb8b..e2da6eae 100644
--- a/factory/src/main/java/com/google/auto/factory/processor/AutoFactoryDeclaration.java
+++ b/factory/src/main/java/com/google/auto/factory/processor/AutoFactoryDeclaration.java
@@ -62,21 +62,17 @@ abstract class AutoFactoryDeclaration {
   abstract AnnotationMirror mirror();
   abstract ImmutableMap<String, AnnotationValue> valuesMap();
 
-  String getFactoryName() {
-    CharSequence packageName = getPackage(targetType()).getQualifiedName();
-    StringBuilder builder = new StringBuilder(packageName);
-    if (packageName.length() > 0) {
-      builder.append('.');
-    }
+  PackageAndClass getFactoryName() {
+    String packageName = getPackage(targetType()).getQualifiedName().toString();
     if (className().isPresent()) {
-      builder.append(className().get());
-    } else {
-      for (String enclosingSimpleName : targetEnclosingSimpleNames()) {
-        builder.append(enclosingSimpleName).append('_');
-      }
-      builder.append(targetType().getSimpleName()).append("Factory");
+      return PackageAndClass.of(packageName, className().get());
+    }
+    StringBuilder builder = new StringBuilder();
+    for (String enclosingSimpleName : targetEnclosingSimpleNames()) {
+      builder.append(enclosingSimpleName).append('_');
     }
-    return builder.toString();
+    builder.append(targetType().getSimpleName()).append("Factory");
+    return PackageAndClass.of(packageName, builder.toString());
   }
 
   private ImmutableList<String> targetEnclosingSimpleNames() {