androidannotations · WonderCsabo · Nov 4, 2017 · Mar 14, 2017 · Mar 14, 2017 · Mar 16, 2017
diff --git a/...ndroidannotations/src/main/java/org/androidannotations/AndroidAnnotationsEnvironment.java b/...ndroidannotations/src/main/java/org/androidannotations/AndroidAnnotationsEnvironment.java
@@ -1,5 +1,6 @@
 /**
  * Copyright (C) 2010-2016 eBusiness Information, Excilys Group
+ * Copyright (C) 2016-2017 the AndroidAnnotations project
  *
  * 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
@@ -61,6 +62,8 @@ public interface AndroidAnnotationsEnvironment {
 
 	AndroidManifest getAndroidManifest();
 
+	AnnotationElements getExtractedElements();
+
 	AnnotationElements getValidatedElements();
 
 	JCodeModel getCodeModel();

diff --git a/...-core/androidannotations/src/main/java/org/androidannotations/helper/ValidatorHelper.java b/...-core/androidannotations/src/main/java/org/androidannotations/helper/ValidatorHelper.java
@@ -308,6 +308,14 @@ public void typeHasAnnotation(Class<? extends Annotation> annotation, Element el
 		typeHasAnnotation(annotation, elementType, valid);
 	}
 
+	public void typeHasValidAnnotation(Class<? extends Annotation> annotation, Element element, ElementValidation valid) {
+		typeHasAnnotation(annotation, element, valid);
+
+		if (valid.isValid()) {
+			typeIsValid(annotation, element.asType(), valid);
+		}
+	}
+
 	public void typeHasAnnotation(Class<? extends Annotation> annotation, TypeMirror elementType, ElementValidation valid) {
 		Element typeElement = annotationHelper.getTypeUtils().asElement(elementType);
 		if (!elementHasAnnotationSafe(annotation, typeElement)) {
@@ -324,14 +332,14 @@ public void typeOrTargetValueHasAnnotation(Class<? extends Annotation> annotatio
 		DeclaredType targetAnnotationClassValue = annotationHelper.extractAnnotationClassParameter(element);
 
 		if (targetAnnotationClassValue != null) {
-			typeHasAnnotation(annotation, targetAnnotationClassValue, valid);
+			targetElement = targetAnnotationClassValue.asElement();
 
 			if (!annotationHelper.getTypeUtils().isAssignable(targetAnnotationClassValue, targetElement.asType())) {
 				valid.addError("The value of %s must be assignable into the annotated field");
 			}
-		} else {
-			typeHasAnnotation(annotation, targetElement, valid);
 		}
+
+		typeHasValidAnnotation(annotation, targetElement, valid);
 	}
 
 	Element findTargetElement(Element element, ElementValidation valid) {
@@ -352,6 +360,20 @@ Element findTargetElement(Element element, ElementValidation valid) {
 		return element;
 	}
 
+	public void typeIsValid(Class<? extends Annotation> annotation, TypeMirror elementType, ElementValidation elementValidation) {
+		Set<? extends Element> validElements = validatedModel().getRootAnnotatedElements(annotation.getName());
+
+		Set<? extends Element> extractedElements = environment().getExtractedElements().getRootAnnotatedElements(annotation.getName());
+
+		Element typeElement = annotationHelper.getTypeUtils().asElement(elementType);
+
+		if (!extractedElements.contains(typeElement) || validElements.contains(typeElement)) {
+			return;
+		}
+
+		elementValidation.addError("The type " + typeElement.getSimpleName() + " is invalid, " + "please check the messages on that type.");
+	}
+
 	private boolean elementHasAnnotationSafe(Class<? extends Annotation> annotation, Element element) {
 		List<? extends AnnotationMirror> annotationMirrors = element.getAnnotationMirrors();
 		for (AnnotationMirror annotationMirror : annotationMirrors) {

diff --git a/...annotations/src/main/java/org/androidannotations/internal/AndroidAnnotationProcessor.java b/...annotations/src/main/java/org/androidannotations/internal/AndroidAnnotationProcessor.java
@@ -1,5 +1,6 @@
 /**
  * Copyright (C) 2010-2016 eBusiness Information, Excilys Group
+ * Copyright (C) 2016-2017 the AndroidAnnotations project
  *
  * 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
@@ -37,7 +38,6 @@
 import org.androidannotations.internal.exception.AndroidManifestNotFoundException;
 import org.androidannotations.internal.exception.ProcessingException;
 import org.androidannotations.internal.exception.RClassNotFoundException;
-import org.androidannotations.internal.exception.ValidationException;
 import org.androidannotations.internal.exception.VersionMismatchException;
 import org.androidannotations.internal.exception.VersionNotFoundException;
 import org.androidannotations.internal.generation.CodeModelGenerator;
@@ -124,8 +124,6 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
 		try {
 			checkApiAndProcessorVersions();
 			processThrowing(annotations, roundEnv);
-		} catch (ValidationException e) {
-			// We do nothing, errors have been printed by ModelValidator
 		} catch (ProcessingException e) {
 			handleException(annotations, roundEnv, e);
 		} catch (Exception e) {
@@ -136,7 +134,7 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
 
 		LOGGER.info("Finish processing");
 
-		LoggerContext.getInstance().close();
+		LoggerContext.getInstance().close(roundEnv.processingOver());
 		return true;
 	}
 
@@ -156,6 +154,8 @@ private void processThrowing(Set<? extends TypeElement> annotations, RoundEnviro
 		}
 
 		AnnotationElementsHolder extractedModel = extractAnnotations(annotations, roundEnv);
+		androidAnnotationsEnv.setExtractedElements(extractedModel);
+
 		AnnotationElementsHolder validatingHolder = extractedModel.validatingHolder();
 		androidAnnotationsEnv.setValidatedElements(validatingHolder);
 
@@ -210,7 +210,7 @@ private IRClass findRClasses(AndroidManifest androidManifest) throws RClassNotFo
 		}
 	}
 
-	private AnnotationElements validateAnnotations(AnnotationElements extractedModel, AnnotationElementsHolder validatingHolder) throws ValidationException {
+	private AnnotationElements validateAnnotations(AnnotationElements extractedModel, AnnotationElementsHolder validatingHolder) {
 		timeStats.start("Validate Annotations");
 		ModelValidator modelValidator = new ModelValidator(androidAnnotationsEnv);
 		AnnotationElements validatedAnnotations = modelValidator.validate(extractedModel, validatingHolder);

diff --git a/.../src/main/java/org/androidannotations/internal/InternalAndroidAnnotationsEnvironment.java b/.../src/main/java/org/androidannotations/internal/InternalAndroidAnnotationsEnvironment.java
@@ -1,5 +1,6 @@
 /**
  * Copyright (C) 2010-2016 eBusiness Information, Excilys Group
+ * Copyright (C) 2016-2017 the AndroidAnnotations project
  *
  * 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
@@ -48,6 +49,8 @@ public class InternalAndroidAnnotationsEnvironment implements AndroidAnnotations
 	private IRClass rClass;
 	private AndroidManifest androidManifest;
 
+	private AnnotationElements extractedElements;
+
 	private AnnotationElements validatedElements;
 
 	private ProcessHolder processHolder;
@@ -73,6 +76,10 @@ public void setAndroidEnvironment(IRClass rClass, AndroidManifest androidManifes
 		this.androidManifest = androidManifest;
 	}
 
+	public void setExtractedElements(AnnotationElements extractedElements) {
+		this.extractedElements = extractedElements;
+	}
+
 	public void setValidatedElements(AnnotationElements validatedElements) {
 		this.validatedElements = validatedElements;
 	}
@@ -141,6 +148,11 @@ public AndroidManifest getAndroidManifest() {
 		return androidManifest;
 	}
 
+	@Override
+	public AnnotationElements getExtractedElements() {
+		return extractedElements;
+	}
+
 	@Override
 	public AnnotationElements getValidatedElements() {
 		return validatedElements;

diff --git a/...oidannotations/src/main/java/org/androidannotations/internal/core/handler/AppHandler.java b/...oidannotations/src/main/java/org/androidannotations/internal/core/handler/AppHandler.java
@@ -52,7 +52,7 @@ public void validate(Element element, ElementValidation validation) {
 		validatorHelper.isNotPrivate(element, validation);
 
 		Element param = injectHelper.getParam(element);
-		validatorHelper.typeHasAnnotation(EApplication.class, param, validation);
+		validatorHelper.typeHasValidAnnotation(EApplication.class, param, validation);
 	}
 
 	@Override

diff --git a/...in/java/org/androidannotations/internal/core/handler/NonConfigurationInstanceHandler.java b/...in/java/org/androidannotations/internal/core/handler/NonConfigurationInstanceHandler.java
@@ -1,5 +1,6 @@
 /**
  * Copyright (C) 2010-2016 eBusiness Information, Excilys Group
+ * Copyright (C) 2016-2017 the AndroidAnnotations project
  *
  * 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
@@ -51,6 +52,10 @@ public void validate(Element element, ElementValidation validation) {
 		validatorHelper.isNotPrivate(element, validation);
 
 		validatorHelper.isNotFinal(element, validation);
+
+		if (element.getAnnotation(Bean.class) != null) {
+			validatorHelper.typeIsValid(EBean.class, element.asType(), validation);
+		}
 	}
 
 	@Override

diff --git a/...otations/src/main/java/org/androidannotations/internal/exception/ValidationException.java b/...otations/src/main/java/org/androidannotations/internal/exception/ValidationException.java
diff --git a/...roidannotations/src/main/java/org/androidannotations/internal/process/ModelValidator.java b/...roidannotations/src/main/java/org/androidannotations/internal/process/ModelValidator.java
@@ -1,5 +1,6 @@
 /**
  * Copyright (C) 2010-2016 eBusiness Information, Excilys Group
+ * Copyright (C) 2016-2017 the AndroidAnnotations project
  *
  * 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
@@ -15,9 +16,7 @@
  */
 package org.androidannotations.internal.process;
 
-import java.util.ArrayList;
 import java.util.LinkedHashSet;
-import java.util.List;
 import java.util.Set;
 
 import javax.lang.model.element.AnnotationMirror;
@@ -26,7 +25,6 @@
 import org.androidannotations.AndroidAnnotationsEnvironment;
 import org.androidannotations.ElementValidation;
 import org.androidannotations.handler.AnnotationHandler;
-import org.androidannotations.internal.exception.ValidationException;
 import org.androidannotations.internal.model.AnnotationElements;
 import org.androidannotations.internal.model.AnnotationElementsHolder;
 import org.androidannotations.logger.Logger;
@@ -41,10 +39,9 @@ public ModelValidator(AndroidAnnotationsEnvironment environment) {
 		this.environment = environment;
 	}
 
-	public AnnotationElements validate(AnnotationElements extractedModel, AnnotationElementsHolder validatingHolder) throws ValidationException {
+	public AnnotationElements validate(AnnotationElements extractedModel, AnnotationElementsHolder validatingHolder) {
 
 		LOGGER.info("Validating elements");
-		List<ElementValidation> failedValidations = new ArrayList<>();
 
 		/*
 		 * We currently do not validate the elements on the ancestors, assuming
@@ -78,22 +75,17 @@ public AnnotationElements validate(AnnotationElements extractedModel, Annotation
 				}
 
 				for (String warning : elementValidation.getWarnings()) {
-					LOGGER.warn(warning, elementValidation.getElement(), elementValidation.getAnnotationMirror());
+					LOGGER.warn(warning, elementValidation.getElement(), annotationMirror);
 				}
 
 				if (elementValidation.isValid()) {
 					validatedAnnotatedElements.add(annotatedElement);
 				} else {
-					failedValidations.add(elementValidation);
 					LOGGER.warn("Element {} invalidated by {}", annotatedElement, annotatedElement, validatorSimpleName);
 				}
 			}
 		}
 
-		if (!failedValidations.isEmpty()) {
-			throw new ValidationException(failedValidations);
-		}
-
 		return validatingHolder;
 	}
 }
diff --git a/...ns-core/androidannotations/src/main/java/org/androidannotations/logger/LoggerContext.java b/...ns-core/androidannotations/src/main/java/org/androidannotations/logger/LoggerContext.java
@@ -1,5 +1,6 @@
 /**
  * Copyright (C) 2010-2016 eBusiness Information, Excilys Group
+ * Copyright (C) 2016-2017 the AndroidAnnotations project
  *
  * 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
@@ -85,9 +86,9 @@ public void setEnvironment(AndroidAnnotationsEnvironment environment) {
 		}
 	}
 
-	public void close() {
+	public void close(boolean lastRound) {
 		for (Appender appender : appenders) {
-			appender.close();
+			appender.close(lastRound);
 		}
 	}
 

diff --git a/...ore/androidannotations/src/main/java/org/androidannotations/logger/appender/Appender.java b/...ore/androidannotations/src/main/java/org/androidannotations/logger/appender/Appender.java
@@ -1,5 +1,6 @@
 /**
  * Copyright (C) 2010-2016 eBusiness Information, Excilys Group
+ * Copyright (C) 2016-2017 the AndroidAnnotations project
  *
  * 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
@@ -44,6 +45,6 @@ public void setEnvironment(AndroidAnnotationsEnvironment environment) {
 
 	public abstract void append(Level level, Element element, AnnotationMirror annotationMirror, String message);
 
-	public abstract void close();
+	public abstract void close(boolean lastRound);
 
 }
diff --git a/...roidannotations/src/main/java/org/androidannotations/logger/appender/ConsoleAppender.java b/...roidannotations/src/main/java/org/androidannotations/logger/appender/ConsoleAppender.java
@@ -1,5 +1,6 @@
 /**
  * Copyright (C) 2010-2016 eBusiness Information, Excilys Group
+ * Copyright (C) 2016-2017 the AndroidAnnotations project
  *
  * 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
@@ -15,6 +16,9 @@
  */
 package org.androidannotations.logger.appender;
 
+import java.util.LinkedList;
+import java.util.List;
+
 import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.element.Element;
 
@@ -23,6 +27,8 @@
 
 public class ConsoleAppender extends Appender {
 
+	private final List<String> errors = new LinkedList<>();
+
 	public ConsoleAppender() {
 		super(new FormatterFull());
 	}
@@ -36,12 +42,17 @@ public void append(Level level, Element element, AnnotationMirror annotationMirr
 		if (level.isSmaller(Level.ERROR)) {
 			System.out.println(message);
 		} else {
-			System.err.println(message);
+			errors.add(message);
 		}
 	}
 
 	@Override
-	public void close() {
+	public synchronized void close(boolean lastRound) {
+		if (lastRound) {
+			for (String error : errors) {
+				System.err.println(error);
+			}
+		}
 	}
 
 }
diff --git a/...androidannotations/src/main/java/org/androidannotations/logger/appender/FileAppender.java b/...androidannotations/src/main/java/org/androidannotations/logger/appender/FileAppender.java
@@ -1,5 +1,6 @@
 /**
  * Copyright (C) 2010-2016 eBusiness Information, Excilys Group
+ * Copyright (C) 2016-2017 the AndroidAnnotations project
  *
  * 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
@@ -57,7 +58,7 @@ public synchronized void open() {
 	}
 
 	@Override
-	public synchronized void close() {
+	public synchronized void close(boolean lastRound) {
 		if (isStreamOpened()) {
 			try {
 				outputStream.close();