Skip to content

Commit 6632bfa

Browse files
dodgexdodgex
committed
Stop validation when injectHelper invalidated the annotation
1 parent 368127b commit 6632bfa

17 files changed

Lines changed: 51 additions & 0 deletions

File tree

‎AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/AbstractFragmentByHandler.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@ public AbstractFragmentByHandler(Class<? extends Annotation> targetClass, Androi
5555
@Override
5656
protected void validate(Element element, ElementValidation validation) {
5757
injectHelper.validate(targetClass, element, validation);
58+
if (!validation.isValid()) {
59+
return;
60+
}
5861

5962
Element param = element;
6063
if (element instanceof ExecutableElement) {

‎AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/AbstractResHandler.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@ public AbstractResHandler(AndroidRes androidRes, AndroidAnnotationsEnvironment e
4848
@Override
4949
public final void validate(Element element, ElementValidation validation) {
5050
injectHelper.validate(androidRes.getAnnotationClass(), element, validation);
51+
if (!validation.isValid()) {
52+
return;
53+
}
5154

5255
validatorHelper.allowedType(element, androidRes.getAllowedTypes(), validation);
5356

‎AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/AppHandler.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@ public AppHandler(AndroidAnnotationsEnvironment environment) {
4545
@Override
4646
public void validate(Element element, ElementValidation validation) {
4747
injectHelper.validate(App.class, element, validation);
48+
if (!validation.isValid()) {
49+
return;
50+
}
4851

4952
validatorHelper.isNotPrivate(element, validation);
5053

‎AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/BeanHandler.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@ public BeanHandler(AndroidAnnotationsEnvironment environment) {
5151
@Override
5252
public void validate(Element element, ElementValidation validation) {
5353
injectHelper.validate(Bean.class, element, validation);
54+
if (!validation.isValid()) {
55+
return;
56+
}
5457

5558
validatorHelper.typeOrTargetValueHasAnnotation(EBean.class, element, validation);
5659

‎AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/ExtraHandler.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,9 @@ public void validate(Element element, ElementValidation validation) {
6666
*/
6767

6868
injectHelper.validate(Extra.class, element, validation);
69+
if (!validation.isValid()) {
70+
return;
71+
}
6972

7073
validatorHelper.isNotPrivate(element, validation);
7174

‎AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/FragmentArgHandler.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,9 @@ public FragmentArgHandler(AndroidAnnotationsEnvironment environment) {
6565
@Override
6666
public void validate(Element element, ElementValidation validation) {
6767
injectHelper.validate(FragmentArg.class, element, validation);
68+
if (!validation.isValid()) {
69+
return;
70+
}
6871

6972
validatorHelper.isNotPrivate(element, validation);
7073

‎AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/HttpsClientHandler.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,9 @@ public HttpsClientHandler(AndroidAnnotationsEnvironment environment) {
6060
@Override
6161
public void validate(Element element, ElementValidation validation) {
6262
injectHelper.validate(HttpsClient.class, element, validation);
63+
if (!validation.isValid()) {
64+
return;
65+
}
6366

6467
validatorHelper.annotationParameterIsOptionalValidResId(element, IRClass.Res.RAW, "keyStore", validation);
6568
validatorHelper.annotationParameterIsOptionalValidResId(element, IRClass.Res.RAW, "trustStore", validation);

‎AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/InjectMenuHandler.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ public InjectMenuHandler(AndroidAnnotationsEnvironment environment) {
4040
@Override
4141
public void validate(Element element, ElementValidation valid) {
4242
injectHelper.validate(InjectMenu.class, element, valid);
43+
if (!valid.isValid()) {
44+
return;
45+
}
4346

4447
Element param = injectHelper.getParam(element);
4548
validatorHelper.isDeclaredType(param, valid);

‎AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/OptionsMenuItemHandler.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ public OptionsMenuItemHandler(AndroidAnnotationsEnvironment environment) {
4444
@Override
4545
public void validate(Element element, ElementValidation validation) {
4646
injectHelper.validate(OptionsMenuItem.class, element, validation);
47+
if (!validation.isValid()) {
48+
return;
49+
}
4750

4851
Element param = injectHelper.getParam(element);
4952
validatorHelper.isDeclaredType(param, validation);

‎AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/PrefHandler.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,9 @@ public PrefHandler(AndroidAnnotationsEnvironment environment) {
4646
@Override
4747
public void validate(Element element, ElementValidation validation) {
4848
injectHelper.validate(Pref.class, element, validation);
49+
if (!validation.isValid()) {
50+
return;
51+
}
4952

5053
validatorHelper.isNotPrivate(element, validation);
5154

0 commit comments

Comments
 (0)