rebinding on the implementation generated class rather then interface in @NonConfigurationInstance. Improved integration tests to validate change. androidannotations#361

pyricau · pyricau · commit 87c7896e031a · 2012-10-26T16:10:43.000+02:00
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/helper/AnnotationHelper.java b/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/helper/AnnotationHelper.java
@@ -20,13 +20,17 @@
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.AnnotationMirror;
+import javax.lang.model.element.AnnotationValue;
 import javax.lang.model.element.Element;
+import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.Modifier;
 import javax.lang.model.element.NestingKind;
 import javax.lang.model.element.TypeElement;
+import javax.lang.model.type.DeclaredType;
 import javax.lang.model.type.MirroredTypeException;
 import javax.lang.model.type.TypeMirror;
 import javax.lang.model.util.Elements;
@@ -304,4 +308,27 @@ public String actionName(Class<? extends Annotation> target) {
 		return target.getSimpleName() + "ed";
 	}
 
+	public DeclaredType extractAnnotationClassParameter(Element element, Class<? extends Annotation> target) {
+
+		AnnotationMirror annotationMirror = findAnnotationMirror(element, target);
+
+		Map<? extends ExecutableElement, ? extends AnnotationValue> elementValues = annotationMirror.getElementValues();
+
+		for (Map.Entry<? extends ExecutableElement, ? extends AnnotationValue> entry : elementValues.entrySet()) {
+			/*
+			 * "value" is unset when the default value is used
+			 */
+			if ("value".equals(entry.getKey().getSimpleName().toString())) {
+
+				AnnotationValue annotationValue = entry.getValue();
+
+				DeclaredType annotationClass = (DeclaredType) annotationValue.getValue();
+
+				return annotationClass;
+			}
+		}
+
+		return null;
+	}
+
 }
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/helper/TargetAnnotationHelper.java b/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/helper/TargetAnnotationHelper.java
@@ -16,13 +16,9 @@
 package com.googlecode.androidannotations.helper;
 
 import java.lang.annotation.Annotation;
-import java.util.Map;
 
 import javax.annotation.processing.ProcessingEnvironment;
-import javax.lang.model.element.AnnotationMirror;
-import javax.lang.model.element.AnnotationValue;
 import javax.lang.model.element.Element;
-import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.type.DeclaredType;
 
 public class TargetAnnotationHelper extends AnnotationHelper implements HasTarget {
@@ -45,26 +41,7 @@ public <T> T extractAnnotationParameter(Element element, String methodName) {
 	}
 
 	public DeclaredType extractAnnotationClassParameter(Element element) {
-
-		AnnotationMirror annotationMirror = findAnnotationMirror(element, target);
-
-		Map<? extends ExecutableElement, ? extends AnnotationValue> elementValues = annotationMirror.getElementValues();
-
-		for (Map.Entry<? extends ExecutableElement, ? extends AnnotationValue> entry : elementValues.entrySet()) {
-			/*
-			 * "value" is unset when the default value is used
-			 */
-			if ("value".equals(entry.getKey().getSimpleName().toString())) {
-
-				AnnotationValue annotationValue = entry.getValue();
-
-				DeclaredType annotationClass = (DeclaredType) annotationValue.getValue();
-
-				return annotationClass;
-			}
-		}
-
-		return null;
+		return extractAnnotationClassParameter(element, target);
 	}
 
 	@Override
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/NonConfigurationInstanceProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/NonConfigurationInstanceProcessor.java
@@ -29,6 +29,8 @@
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.TypeElement;
+import javax.lang.model.type.DeclaredType;
+import javax.lang.model.type.TypeMirror;
 
 import com.googlecode.androidannotations.annotations.Bean;
 import com.googlecode.androidannotations.annotations.NonConfigurationInstance;
@@ -137,7 +139,19 @@ public void process(Element element, JCodeModel codeModel, EBeanHolder holder) t
 
 		boolean hasBeanAnnotation = element.getAnnotation(Bean.class) != null;
 		if (hasBeanAnnotation) {
-			JClass fieldGeneratedBeanClass = holder.refClass(fieldType.fullName() + GENERATION_SUFFIX);
+
+			DeclaredType targetAnnotationClassValue = annotationHelper.extractAnnotationClassParameter(element, Bean.class);
+
+			TypeMirror elementType;
+			if (targetAnnotationClassValue != null) {
+				elementType = targetAnnotationClassValue;
+			} else {
+				elementType = element.asType();
+			}
+
+			String typeQualifiedName = elementType.toString();
+
+			JClass fieldGeneratedBeanClass = holder.refClass(typeQualifiedName + GENERATION_SUFFIX);
 
 			ncHolder.initIfNonConfigurationNotNullBody.invoke(cast(fieldGeneratedBeanClass, field), "rebind").arg(_this());
 		}
diff --git a/AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/ebean/EBeanTest.java b/AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/ebean/EBeanTest.java
@@ -0,0 +1,22 @@
+package com.googlecode.androidannotations.ebean;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import com.googlecode.androidannotations.AndroidAnnotationProcessor;
+import com.googlecode.androidannotations.utils.AAProcessorTestHelper;
+
+public class EBeanTest extends AAProcessorTestHelper {
+
+	@Before
+	public void setup() {
+		addManifestProcessorParameter(EBeanTest.class);
+		addProcessor(AndroidAnnotationProcessor.class);
+	}
+
+	@Test
+	public void activity_subclass_in_manifest_compiles() {
+		assertCompilationSuccessful(compileFiles(SomeActivity.class, SomeImplementation.class));
+	}
+
+}
diff --git a/AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/ebean/SomeActivity.java b/AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/ebean/SomeActivity.java
@@ -0,0 +1,16 @@
+package com.googlecode.androidannotations.ebean;
+
+import android.app.Activity;
+
+import com.googlecode.androidannotations.annotations.Bean;
+import com.googlecode.androidannotations.annotations.EActivity;
+import com.googlecode.androidannotations.annotations.NonConfigurationInstance;
+
+@EActivity
+public class SomeActivity extends Activity {
+
+	@NonConfigurationInstance
+	@Bean(SomeImplementation.class)
+	SomeInterface someInterface;
+
+}
diff --git a/AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/ebean/SomeImplementation.java b/AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/ebean/SomeImplementation.java
@@ -0,0 +1,8 @@
+package com.googlecode.androidannotations.ebean;
+
+import com.googlecode.androidannotations.annotations.EBean;
+
+@EBean
+public class SomeImplementation implements SomeInterface {
+
+}
diff --git a/AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/ebean/SomeInterface.java b/AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/ebean/SomeInterface.java
@@ -0,0 +1,5 @@
+package com.googlecode.androidannotations.ebean;
+
+public interface SomeInterface {
+
+}
diff --git a/AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/manifest/AndroidManifestErrorsTest.java b/AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/manifest/AndroidManifestErrorsTest.java
@@ -13,7 +13,7 @@ public class AndroidManifestErrorsTest extends AAProcessorTestHelper {
 	@Before
 	public void setup() {
 		addManifestProcessorParameter(AndroidManifestErrorsTest.class);
-		addProcessor(new AndroidAnnotationProcessor());
+		addProcessor(AndroidAnnotationProcessor.class);
 	}
 
 	@Test
diff --git a/AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/manifest/AndroidManifestFinderTest.java b/AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/manifest/AndroidManifestFinderTest.java
@@ -17,7 +17,7 @@ public class AndroidManifestFinderTest extends AAProcessorTestHelper {
 
 	@Before
 	public void setup() {
-		addProcessor(new AndroidAnnotationProcessor());
+		addProcessor(AndroidAnnotationProcessor.class);
 	}
 
 	@Test
diff --git a/AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/utils/AAProcessorTestHelper.java b/AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/utils/AAProcessorTestHelper.java
@@ -13,7 +13,7 @@ public void addManifestProcessorParameter(Class<?> classOfPackagingContainingMan
 	}
 
 	public File toGeneratedFile(Class<?> compiledClass) {
-		File output = new File(OUTPUT_DIRECTORY, toPath(compiledClass.getPackage()) + "/" + compiledClass + ModelConstants.GENERATION_SUFFIX + SOURCE_FILE_SUFFIX);
+		File output = new File(OUTPUT_DIRECTORY, toPath(compiledClass.getPackage()) + "/" + compiledClass.getSimpleName() + ModelConstants.GENERATION_SUFFIX + SOURCE_FILE_SUFFIX);
 		return output;
 	}
 
diff --git a/AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/utils/ProcessorTestHelper.java b/AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/utils/ProcessorTestHelper.java
@@ -11,6 +11,7 @@
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 
@@ -123,22 +124,24 @@ private static String[] getContents(File file) {
 
 	private final List<String> compilerOptions = new ArrayList<String>();
 
-	private final List<Processor> processors = new ArrayList<Processor>();
+	private final List<Class<? extends Processor>> processorsClasses = new ArrayList<Class<? extends Processor>>();
 
 	public ProcessorTestHelper() {
-		compilerOptions.add("-proc:only");
 		compilerOptions.add("-classpath");
 		compilerOptions.add(getClassPath());
 		compilerOptions.add("-s");
-		compilerOptions.add(ensureOutputDirectory().getAbsolutePath());
+		String outputPath = ensureOutputDirectory().getAbsolutePath();
+		compilerOptions.add(outputPath);
+		compilerOptions.add("-d");
+		compilerOptions.add(outputPath);
 	}
 
 	public File getOuputDirectory() {
 		return ensureOutputDirectory();
 	}
 
-	public void addProcessor(Processor processor) {
-		processors.add(processor);
+	public void addProcessor(Class<? extends Processor> processorClass) {
+		processorsClasses.add(processorClass);
 	}
 
 	public void addProcessorParameter(String key, String value) {
@@ -182,26 +185,29 @@ public CompileResult compileFiles(Type... compilationUnits) {
 		return compileFiles(files);
 	}
 
+	public CompileResult compileFiles(File... compilationUnits) {
+		return compileFiles(Arrays.asList(compilationUnits));
+	}
+
 	public CompileResult compileFiles(Collection<File> compilationUnits) {
 		DiagnosticCollector<JavaFileObject> diagnosticCollector = new DiagnosticCollector<JavaFileObject>();
 
 		JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
 
 		StandardJavaFileManager fileManager = compiler.getStandardFileManager(diagnosticCollector, null, null);
 
-		/*
-		 * Call the compiler with the "-proc:only" option. The "class names"
-		 * option (which could, in principle, be used instead of compilation
-		 * units for annotation processing) isn't useful in this case because
-		 * only annotations on the classes being compiled are accessible.
-		 * 
-		 * Information about the classes being compiled (such as what they are
-		 * annotated with) is *not* available via the RoundEnvironment. However,
-		 * if these classes are annotations, they certainly need to be
-		 * validated.
-		 */
-
 		CompilationTask task = compiler.getTask(null, fileManager, diagnosticCollector, compilerOptions, null, fileManager.getJavaFileObjectsFromFiles(compilationUnits));
+
+		List<Processor> processors = new ArrayList<Processor>();
+
+		for (Class<? extends Processor> processorClass : processorsClasses) {
+			try {
+				processors.add(processorClass.newInstance());
+			} catch (Exception e) {
+				throw new RuntimeException(e);
+			}
+		}
+
 		task.setProcessors(processors);
 
 		task.call();
diff --git a/AndroidAnnotations/androidannotations/src/test/resources/com/googlecode/androidannotations/ebean/AndroidManifest.xml b/AndroidAnnotations/androidannotations/src/test/resources/com/googlecode/androidannotations/ebean/AndroidManifest.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2010-2012 eBusiness Information, Excilys Group
+
+    Licensed under the Apache License, Version 2.0 (the "License"); you may not
+    use this file except in compliance with the License. You may obtain a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed To in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+    License for the specific language governing permissions and limitations under
+    the License.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.googlecode.androidannotations.testprocessor"
+    android:versionCode="1"
+    android:versionName="1.0" >
+
+    <application>
+        <activity android:name="com.googlecode.androidannotations.ebean.SomeActivity_" />
+    </application>
+
+</manifest>
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/nonconfiguration/NonConfigurationActivity.java b/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/nonconfiguration/NonConfigurationActivity.java
@@ -21,6 +21,8 @@
 import com.googlecode.androidannotations.annotations.EActivity;
 import com.googlecode.androidannotations.annotations.NonConfigurationInstance;
 import com.googlecode.androidannotations.test15.ebean.EmptyDependency;
+import com.googlecode.androidannotations.test15.ebean.SomeImplementation;
+import com.googlecode.androidannotations.test15.ebean.SomeInterface;
 
 /**
  * TODO test that on configuration changes, the fields are reinjected
@@ -35,6 +37,10 @@ public class NonConfigurationActivity extends Activity {
 	@Bean
 	EmptyDependency recreatedDependency;
 
+	@Bean(SomeImplementation.class)
+	@NonConfigurationInstance
+	SomeInterface maintainedAbstracted;
+	
 	@NonConfigurationInstance
 	Object someObject;
 

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +package com.googlecode.androidannotations.ebean;
++
 +public interface SomeInterface {
++
 +}
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public class AndroidManifestErrorsTest extends AAProcessorTestHelper {`
`13`	`13`	`@Before`
`14`	`14`	`public void setup() {`
`15`	`15`	`addManifestProcessorParameter(AndroidManifestErrorsTest.class);`
`16`		`- addProcessor(new AndroidAnnotationProcessor());`
	`16`	`+ addProcessor(AndroidAnnotationProcessor.class);`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public class AndroidManifestFinderTest extends AAProcessorTestHelper {`
`17`	`17`
`18`	`18`	`@Before`
`19`	`19`	`public void setup() {`
`20`		`- addProcessor(new AndroidAnnotationProcessor());`
	`20`	`+ addProcessor(AndroidAnnotationProcessor.class);`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public void addManifestProcessorParameter(Class<?> classOfPackagingContainingMan`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`public File toGeneratedFile(Class<?> compiledClass) {`
`16`		`- File output = new File(OUTPUT_DIRECTORY, toPath(compiledClass.getPackage()) + "/" + compiledClass + ModelConstants.GENERATION_SUFFIX + SOURCE_FILE_SUFFIX);`
	`16`	`+ File output = new File(OUTPUT_DIRECTORY, toPath(compiledClass.getPackage()) + "/" + compiledClass.getSimpleName() + ModelConstants.GENERATION_SUFFIX + SOURCE_FILE_SUFFIX);`
`17`	`17`	`return output;`
`18`	`18`	`}`
`19`	`19`