Do not prepend outer classnames to the generated @autofactory class name if a

class name has been explicitly specified.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=160310315

Author: cwgordon

factory/src/main/java/com/google/auto/factory/processor/AutoFactoryDeclaration.java

@@ -67,12 +67,12 @@ String getFactoryName() {
     if (packageName.length() > 0) {
       builder.append('.');
     }
-    for (String enclosingSimpleName : targetEnclosingSimpleNames()) {
-      builder.append(enclosingSimpleName).append('_');
-    }
     if (className().isPresent()) {
       builder.append(className().get());
     } else {
+      for (String enclosingSimpleName : targetEnclosingSimpleNames()) {
+        builder.append(enclosingSimpleName).append('_');
+      }
       builder.append(targetType().getSimpleName()).append("Factory");
     }
     return builder.toString();

factory/src/test/java/com/google/auto/factory/processor/AutoFactoryProcessorTest.java

@@ -49,7 +49,7 @@ public void nestedClasses() {
         .and()
         .generatesSources(
             JavaFileObjects.forResource("expected/NestedClasses_SimpleNestedClassFactory.java"),
-            JavaFileObjects.forResource("expected/NestedClasses_CustomNamedFactory.java"));
+            JavaFileObjects.forResource("expected/NestedClassCustomNamedFactory.java"));
   }
 
   @Test public void simpleClassNonFinal() {

factory/src/test/resources/expected/NestedClasses_CustomNamedFactory.java renamed to factory/src/test/resources/expected/NestedClassCustomNamedFactory.java

@@ -22,8 +22,8 @@
   value = "com.google.auto.factory.processor.AutoFactoryProcessor",
   comments = "https://github.com/google/auto/tree/master/factory"
   )
-final class NestedClasses_CustomNamedFactory {
-  @Inject NestedClasses_CustomNamedFactory() {}
+final class NestedClassCustomNamedFactory {
+  @Inject NestedClassCustomNamedFactory() {}
 
   NestedClasses.SimpleNestedClassWithCustomFactory create() {
     return new NestedClasses.SimpleNestedClassWithCustomFactory();

factory/src/test/resources/good/NestedClasses.java

@@ -22,6 +22,6 @@ final class NestedClasses {
   @AutoFactory
   static final class SimpleNestedClass {}
 
-  @AutoFactory(className = "CustomNamedFactory")
+  @AutoFactory(className = "NestedClassCustomNamedFactory")
   static final class SimpleNestedClassWithCustomFactory {}
-}
+}