Fix inner class generation bug

Author: frankiesardo

icepick-processor/src/main/java/icepick/processor/ClassWriter.java

@@ -35,14 +35,15 @@ void writeClass(FieldEnclosingClass fieldEnclosingClass, Collection<AnnotatedFie
     private String getClassTemplate(FieldEnclosingClass fieldEnclosingClass, Collection<AnnotatedField> fields) throws IOException {
         String className = fieldEnclosingClass.className;
         String packageName = fieldEnclosingClass.packageName;
+        String sanitizedClassName = fieldEnclosingClass.sanitizedClassName;
         String saveInstanceStateBody = makeOnSaveInstanceStateBody(fields);
         String restoreInstanceStateBody = makeOnRestoreInstanceStateBody(fields);
         String saveInstanceStateStart = makeSaveInstanceStateStart(className, fieldEnclosingClass.parentFqcn);
         String restoreInstanceStateStart = makeRestoreInstanceStateStart(className);
         String saveInstanceStateEnd = makeSaveInstanceStateEnd();
         String restoreInstanceStateEnd = makeRestoreInstanceStateEnd(fieldEnclosingClass.parentFqcn);
 
-        return replaceTemplateWith(packageName, className, saveInstanceStateStart, restoreInstanceStateStart, saveInstanceStateBody, restoreInstanceStateBody, saveInstanceStateEnd, restoreInstanceStateEnd);
+        return replaceTemplateWith(packageName, sanitizedClassName, saveInstanceStateStart, restoreInstanceStateStart, saveInstanceStateBody, restoreInstanceStateBody, saveInstanceStateEnd, restoreInstanceStateEnd);
     }
 
     private String makeOnRestoreInstanceStateBody(Collection<AnnotatedField> fields) {
@@ -77,10 +78,10 @@ private String makeBundlePut(AnnotatedField annotatedField) {
 
     protected abstract String makeRestoreInstanceStateEnd(String parentFqcn);
 
-    private String replaceTemplateWith(String packageName, String className, String saveInstanceStateStart, String restoreInstanceStateStart, String saveInstanceStateBody, String restoreInstanceStateBody, String saveInstanceStateEnd, String restoreInstanceStateEnd) throws IOException {
+    private String replaceTemplateWith(String packageName, String sanitizedClassName, String saveInstanceStateStart, String restoreInstanceStateStart, String saveInstanceStateBody, String restoreInstanceStateBody, String saveInstanceStateEnd, String restoreInstanceStateEnd) throws IOException {
         return CLASS_TEMPLATE
                 .replace(PACKAGE, packageName)
-                .replace(CLASS_NAME, className)
+                .replace(CLASS_NAME, sanitizedClassName)
                 .replace(SUFFIX, getSuffix())
                 .replace(SAVE_INSTANCE_STATE_START, saveInstanceStateStart)
                 .replace(SAVE_INSTANCE_STATE_BODY, saveInstanceStateBody)
@@ -136,8 +137,10 @@ static class Factory {
             this.suffix = suffix;
         }
 
-        public ClassWriter from(TypeElement classType) throws IOException {
-            JavaFileObject jfo = filer.createSourceFile(classType.getQualifiedName() + suffix, classType);
+        public ClassWriter from(FieldEnclosingClass fieldEnclosingClass) throws IOException {
+            TypeElement classType = fieldEnclosingClass.type;
+            String sanitizedClassName = fieldEnclosingClass.sanitizedClassName;
+            JavaFileObject jfo = filer.createSourceFile(sanitizedClassName + suffix, classType);
             boolean isView = typeUtils.isAssignable(classType.asType(), elementUtils.getTypeElement("android.view.View").asType());
             return isView ? new ViewWriter(jfo, suffix) : new FragmentActivityWriter(jfo, suffix);
         }

icepick-processor/src/main/java/icepick/processor/EnvironmentFactory.java

@@ -4,6 +4,8 @@
 import javax.lang.model.element.Element;
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.type.TypeMirror;
+import javax.lang.model.util.Elements;
+import javax.lang.model.util.Types;
 import java.io.IOException;
 import java.util.Collection;
 
@@ -14,9 +16,11 @@ class EnvironmentFactory {
     private final ClassWriter.Factory writerFactory;
 
     static EnvironmentFactory from(ProcessingEnvironment processingEnv, String suffix) {
-        FieldEnclosingClass.Factory enclosingClassFactory = new FieldEnclosingClass.Factory(processingEnv.getTypeUtils());
-        AnnotatedField.Factory fieldFactory = new AnnotatedField.Factory(processingEnv.getElementUtils(), processingEnv.getTypeUtils());
-        ClassWriter.Factory writerFactory = new ClassWriter.Factory(processingEnv.getTypeUtils(), processingEnv.getElementUtils(), processingEnv.getFiler(), suffix);
+        Types typeUtils = processingEnv.getTypeUtils();
+        Elements elementUtils = processingEnv.getElementUtils();
+        FieldEnclosingClass.Factory enclosingClassFactory = new FieldEnclosingClass.Factory(typeUtils, elementUtils);
+        AnnotatedField.Factory fieldFactory = new AnnotatedField.Factory(elementUtils, typeUtils);
+        ClassWriter.Factory writerFactory = new ClassWriter.Factory(typeUtils, elementUtils, processingEnv.getFiler(), suffix);
         return new EnvironmentFactory(enclosingClassFactory, fieldFactory, writerFactory);
     }
 
@@ -34,7 +38,7 @@ public AnnotatedField makeField(Element element) {
         return fieldFactory.from(element);
     }
 
-    public ClassWriter makeWriter(TypeElement classType) throws IOException {
-        return writerFactory.from(classType);
+    public ClassWriter makeWriter(FieldEnclosingClass enclosingClass) throws IOException {
+        return writerFactory.from(enclosingClass);
     }
 }

icepick-processor/src/main/java/icepick/processor/FieldEnclosingClass.java

@@ -4,44 +4,51 @@
 import javax.lang.model.type.DeclaredType;
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
+import javax.lang.model.util.Elements;
 import javax.lang.model.util.Types;
 import java.util.Collection;
 
 class FieldEnclosingClass {
 
     public final TypeElement type;
     public final String className;
+    public final String sanitizedClassName;
     public final String packageName;
     public final String parentFqcn;
 
-    FieldEnclosingClass(TypeElement type, String className, String packageName, String parentFqcn) {
+    FieldEnclosingClass(TypeElement type, String className, String sanitizedClassName, String packageName, String parentFqcn) {
         this.type = type;
         this.className = className;
+        this.sanitizedClassName = sanitizedClassName;
         this.packageName = packageName;
         this.parentFqcn = parentFqcn;
     }
 
     static class Factory {
 
         private final Types typeUtils;
+        private final Elements elementUtils;
 
-        Factory(Types typeUtils) {
+        Factory(Types typeUtils, Elements elementUtils) {
             this.typeUtils = typeUtils;
+            this.elementUtils = elementUtils;
         }
 
         public FieldEnclosingClass from(TypeElement classType, Collection<TypeMirror> parents) {
             String className = findName(classType);
             String packageName = findPackage(classType);
             String parentFqcn = findParentFqcn(classType, parents);
-            return new FieldEnclosingClass(classType, className, packageName, parentFqcn);
+            String sanitizedClassName = className.replace(".", "$");
+            return new FieldEnclosingClass(classType, className, sanitizedClassName, packageName, parentFqcn);
         }
 
         private String findName(TypeElement classType) {
-            return classType.getSimpleName().toString();
+            int packageLength = findPackage(classType).length() + 1;
+            return classType.getQualifiedName().toString().substring(packageLength);
         }
 
         private String findPackage(TypeElement classType) {
-            return classType.getQualifiedName().toString().replace("." + classType.getSimpleName(), "");
+            return elementUtils.getPackageOf(classType).getQualifiedName().toString();
         }
 
         private String findParentFqcn(TypeElement classType, Collection<TypeMirror> parents) {

icepick-processor/src/main/java/icepick/processor/IcicleProcessorState.java

@@ -101,7 +101,7 @@ private Collection<AnnotatedField> attemptConversion(Collection<Element> element
     private void writeHelpers(Map<FieldEnclosingClass, Collection<AnnotatedField>> elementsByEnclosingClass) {
         for (FieldEnclosingClass fieldEnclosingClass : elementsByEnclosingClass.keySet()) {
             try {
-                ClassWriter classWriter = factory.makeWriter(fieldEnclosingClass.type);
+                ClassWriter classWriter = factory.makeWriter(fieldEnclosingClass);
                 classWriter.writeClass(fieldEnclosingClass, elementsByEnclosingClass.get(fieldEnclosingClass));
             } catch (IOException e) {
                 logger.logError("Impossible to create helper for %. Reason: %" + fieldEnclosingClass.className, e);

icepick-processor/src/test/java/icepick/processor/FragmentActivityWriterTest.java

@@ -18,7 +18,7 @@ public class FragmentActivityWriterTest {
     final StringWriter stringWriter = new StringWriter();
     final JavaFileObject jfo = mock(JavaFileObject.class);
     final ClassWriter classWriter = new FragmentActivityWriter(jfo, "$$Icicle");
-    final FieldEnclosingClass fieldEnclosingClass = new FieldEnclosingClass(mock(TypeElement.class), "TestActivity", "com.frankiesardo", "com.frankiesardo.SuperClass");
+    final FieldEnclosingClass fieldEnclosingClass = new FieldEnclosingClass(mock(TypeElement.class), "TestActivity", "TestActivity", "com.frankiesardo", "com.frankiesardo.SuperClass");
 
     final Set<AnnotatedField> fields = new LinkedHashSet<AnnotatedField>();
 

icepick-processor/src/test/java/icepick/processor/ViewWriterTest.java

@@ -9,11 +9,6 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import icepick.processor.AnnotatedField;
-import icepick.processor.ClassWriter;
-import icepick.processor.FieldEnclosingClass;
-import icepick.processor.ViewWriter;
-
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -23,7 +18,7 @@ public class ViewWriterTest {
     final StringWriter stringWriter = new StringWriter();
     final JavaFileObject jfo = mock(JavaFileObject.class);
     final ViewWriter icicleWriter = new ViewWriter(jfo, "$$Icicle");
-    final FieldEnclosingClass fieldEnclosingClass = new FieldEnclosingClass(mock(TypeElement.class), "TestView", "com.frankiesardo", "com.frankiesardo.SuperClass");
+    final FieldEnclosingClass fieldEnclosingClass = new FieldEnclosingClass(mock(TypeElement.class), "TestView", "TestView", "com.frankiesardo", "com.frankiesardo.SuperClass");
 
     final Set<AnnotatedField> fields = new LinkedHashSet<AnnotatedField>();