diff --git a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/AbstractFragmentByHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/AbstractFragmentByHandler.java index 7148947a4f..7be8860c9d 100644 --- a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/AbstractFragmentByHandler.java +++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/AbstractFragmentByHandler.java @@ -55,6 +55,9 @@ public AbstractFragmentByHandler(Class targetClass, Androi @Override protected void validate(Element element, ElementValidation validation) { injectHelper.validate(targetClass, element, validation); + if (!validation.isValid()) { + return; + } Element param = element; if (element instanceof ExecutableElement) { diff --git a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/AbstractResHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/AbstractResHandler.java index fe26247b82..f1891bb115 100644 --- a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/AbstractResHandler.java +++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/AbstractResHandler.java @@ -48,6 +48,9 @@ public AbstractResHandler(AndroidRes androidRes, AndroidAnnotationsEnvironment e @Override public final void validate(Element element, ElementValidation validation) { injectHelper.validate(androidRes.getAnnotationClass(), element, validation); + if (!validation.isValid()) { + return; + } validatorHelper.allowedType(element, androidRes.getAllowedTypes(), validation); diff --git a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/AppHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/AppHandler.java index 077d62f4c2..3621caee68 100644 --- a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/AppHandler.java +++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/AppHandler.java @@ -45,6 +45,9 @@ public AppHandler(AndroidAnnotationsEnvironment environment) { @Override public void validate(Element element, ElementValidation validation) { injectHelper.validate(App.class, element, validation); + if (!validation.isValid()) { + return; + } validatorHelper.isNotPrivate(element, validation); diff --git a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/BeanHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/BeanHandler.java index 5153115942..78b9d4f3f2 100644 --- a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/BeanHandler.java +++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/BeanHandler.java @@ -51,6 +51,9 @@ public BeanHandler(AndroidAnnotationsEnvironment environment) { @Override public void validate(Element element, ElementValidation validation) { injectHelper.validate(Bean.class, element, validation); + if (!validation.isValid()) { + return; + } validatorHelper.typeOrTargetValueHasAnnotation(EBean.class, element, validation); diff --git a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/ExtraHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/ExtraHandler.java index 55ccd2341f..aaeedf7aae 100644 --- a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/ExtraHandler.java +++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/ExtraHandler.java @@ -66,6 +66,9 @@ public void validate(Element element, ElementValidation validation) { */ injectHelper.validate(Extra.class, element, validation); + if (!validation.isValid()) { + return; + } validatorHelper.isNotPrivate(element, validation); diff --git a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/FragmentArgHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/FragmentArgHandler.java index 6837c78bc9..a5f6d563b9 100644 --- a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/FragmentArgHandler.java +++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/FragmentArgHandler.java @@ -65,6 +65,9 @@ public FragmentArgHandler(AndroidAnnotationsEnvironment environment) { @Override public void validate(Element element, ElementValidation validation) { injectHelper.validate(FragmentArg.class, element, validation); + if (!validation.isValid()) { + return; + } validatorHelper.isNotPrivate(element, validation); diff --git a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/HttpsClientHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/HttpsClientHandler.java index 5807dcfe7f..360a83dcd1 100644 --- a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/HttpsClientHandler.java +++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/HttpsClientHandler.java @@ -60,6 +60,9 @@ public HttpsClientHandler(AndroidAnnotationsEnvironment environment) { @Override public void validate(Element element, ElementValidation validation) { injectHelper.validate(HttpsClient.class, element, validation); + if (!validation.isValid()) { + return; + } validatorHelper.annotationParameterIsOptionalValidResId(element, IRClass.Res.RAW, "keyStore", validation); validatorHelper.annotationParameterIsOptionalValidResId(element, IRClass.Res.RAW, "trustStore", validation); diff --git a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/InjectMenuHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/InjectMenuHandler.java index 9ca2c2e0a7..1fa719c8ca 100644 --- a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/InjectMenuHandler.java +++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/InjectMenuHandler.java @@ -40,6 +40,9 @@ public InjectMenuHandler(AndroidAnnotationsEnvironment environment) { @Override public void validate(Element element, ElementValidation valid) { injectHelper.validate(InjectMenu.class, element, valid); + if (!valid.isValid()) { + return; + } Element param = injectHelper.getParam(element); validatorHelper.isDeclaredType(param, valid); diff --git a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/OptionsMenuItemHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/OptionsMenuItemHandler.java index 22f93f8a9f..85413c01a6 100644 --- a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/OptionsMenuItemHandler.java +++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/OptionsMenuItemHandler.java @@ -44,6 +44,9 @@ public OptionsMenuItemHandler(AndroidAnnotationsEnvironment environment) { @Override public void validate(Element element, ElementValidation validation) { injectHelper.validate(OptionsMenuItem.class, element, validation); + if (!validation.isValid()) { + return; + } Element param = injectHelper.getParam(element); validatorHelper.isDeclaredType(param, validation); diff --git a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/PrefHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/PrefHandler.java index 4b2e0eb670..752b3c4577 100644 --- a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/PrefHandler.java +++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/PrefHandler.java @@ -46,6 +46,9 @@ public PrefHandler(AndroidAnnotationsEnvironment environment) { @Override public void validate(Element element, ElementValidation validation) { injectHelper.validate(Pref.class, element, validation); + if (!validation.isValid()) { + return; + } validatorHelper.isNotPrivate(element, validation); diff --git a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/PreferenceByKeyHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/PreferenceByKeyHandler.java index 58f1456d6b..47062717cf 100644 --- a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/PreferenceByKeyHandler.java +++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/PreferenceByKeyHandler.java @@ -47,6 +47,9 @@ public PreferenceByKeyHandler(AndroidAnnotationsEnvironment environment) { @Override protected void validate(Element element, ElementValidation valid) { injectHelper.validate(PreferenceByKey.class, element, valid); + if (!valid.isValid()) { + return; + } if (element.getKind() == ElementKind.PARAMETER) { validatorHelper.enclosingElementExtendsPreferenceActivityOrPreferenceFragment(element.getEnclosingElement(), valid); diff --git a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/RootContextHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/RootContextHandler.java index 66fcbbe3dc..2e5a03ef62 100644 --- a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/RootContextHandler.java +++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/RootContextHandler.java @@ -50,6 +50,9 @@ public RootContextHandler(AndroidAnnotationsEnvironment environment) { @Override public void validate(Element element, ElementValidation validation) { injectHelper.validate(RootContext.class, element, validation); + if (!validation.isValid()) { + return; + } Element param = injectHelper.getParam(element); validatorHelper.extendsContext(param, validation); diff --git a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/SystemServiceHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/SystemServiceHandler.java index 9944a4c30d..68f09e982f 100644 --- a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/SystemServiceHandler.java +++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/SystemServiceHandler.java @@ -51,6 +51,9 @@ public SystemServiceHandler(AndroidAnnotationsEnvironment environment) { @Override public void validate(Element element, ElementValidation validation) { injectHelper.validate(SystemService.class, element, validation); + if (!validation.isValid()) { + return; + } validatorHelper.androidService(element, validation); diff --git a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/ViewByIdHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/ViewByIdHandler.java index 68d4d32824..f4b9088f89 100644 --- a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/ViewByIdHandler.java +++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/ViewByIdHandler.java @@ -50,6 +50,9 @@ public ViewByIdHandler(AndroidAnnotationsEnvironment environment) { @Override public void validate(Element element, ElementValidation validation) { injectHelper.validate(ViewById.class, element, validation); + if (!validation.isValid()) { + return; + } Element param = injectHelper.getParam(element); validatorHelper.isDeclaredType(param, validation); diff --git a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/ViewsByIdHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/ViewsByIdHandler.java index 3c40c911a4..41eb963d2d 100644 --- a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/ViewsByIdHandler.java +++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/ViewsByIdHandler.java @@ -55,6 +55,9 @@ public ViewsByIdHandler(AndroidAnnotationsEnvironment environment) { @Override public void validate(Element element, ElementValidation validation) { injectHelper.validate(ViewsById.class, element, validation); + if (!validation.isValid()) { + return; + } Element param = injectHelper.getParam(element); validatorHelper.isDeclaredType(param, validation); diff --git a/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/generation/ActivityWithInvalidMethodInjection.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/generation/ActivityWithInvalidMethodInjection.java index 1ead0d4815..18672d46e4 100644 --- a/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/generation/ActivityWithInvalidMethodInjection.java +++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/generation/ActivityWithInvalidMethodInjection.java @@ -23,6 +23,10 @@ @EActivity public class ActivityWithInvalidMethodInjection extends Activity { + @Extra + void failHere() { + } + @Extra void failHere(@Extra String fail) { } diff --git a/AndroidAnnotations/androidannotations-ormlite/ormlite/src/main/java/org/androidannotations/ormlite/handler/OrmLiteDaoHandler.java b/AndroidAnnotations/androidannotations-ormlite/ormlite/src/main/java/org/androidannotations/ormlite/handler/OrmLiteDaoHandler.java index d5c92cdaa9..b219a758e0 100644 --- a/AndroidAnnotations/androidannotations-ormlite/ormlite/src/main/java/org/androidannotations/ormlite/handler/OrmLiteDaoHandler.java +++ b/AndroidAnnotations/androidannotations-ormlite/ormlite/src/main/java/org/androidannotations/ormlite/handler/OrmLiteDaoHandler.java @@ -60,6 +60,9 @@ public OrmLiteDaoHandler(AndroidAnnotationsEnvironment environment) { @Override public void validate(Element element, ElementValidation validation) { injectHelper.validate(OrmLiteDao.class, element, validation); + if (!validation.isValid()) { + return; + } validatorHelper.isNotPrivate(element, validation); diff --git a/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/main/java/org/androidannotations/rest/spring/handler/RestServiceHandler.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/main/java/org/androidannotations/rest/spring/handler/RestServiceHandler.java index 37b3729931..6352475c8f 100644 --- a/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/main/java/org/androidannotations/rest/spring/handler/RestServiceHandler.java +++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/main/java/org/androidannotations/rest/spring/handler/RestServiceHandler.java @@ -46,6 +46,9 @@ public RestServiceHandler(AndroidAnnotationsEnvironment environment) { @Override public void validate(Element element, ElementValidation validation) { injectHelper.validate(RestService.class, element, validation); + if (!validation.isValid()) { + return; + } validatorHelper.isNotPrivate(element, validation);