Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings
This repository was archived by the owner on Feb 26, 2023. It is now read-only.

Stop validation when injectHelper invalidated the annotation (#1795) #1801

Merged
WonderCsabo merged 2 commits into from
Jul 17, 2016
Merged

Stop validation when injectHelper invalidated the annotation (#1795) #1801

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6632bfa
Stop validation when injectHelper invalidated the annotation
dodgex Jun 14, 2016
210ad0b
Add test for failing compilation
dodgex Jun 17, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions 3 ...src/main/java/org/androidannotations/internal/core/handler/AbstractFragmentByHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@ public AbstractFragmentByHandler(Class<? extends Annotation> 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) {
Expand Down
3 changes: 3 additions & 0 deletions 3 ...ations/src/main/java/org/androidannotations/internal/core/handler/AbstractResHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
3 changes: 3 additions & 0 deletions 3 ...oidannotations/src/main/java/org/androidannotations/internal/core/handler/AppHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
3 changes: 3 additions & 0 deletions 3 ...idannotations/src/main/java/org/androidannotations/internal/core/handler/BeanHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
3 changes: 3 additions & 0 deletions 3 ...dannotations/src/main/java/org/androidannotations/internal/core/handler/ExtraHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
3 changes: 3 additions & 0 deletions 3 ...ations/src/main/java/org/androidannotations/internal/core/handler/FragmentArgHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
3 changes: 3 additions & 0 deletions 3 ...ations/src/main/java/org/androidannotations/internal/core/handler/HttpsClientHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
3 changes: 3 additions & 0 deletions 3 ...tations/src/main/java/org/androidannotations/internal/core/handler/InjectMenuHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
3 changes: 3 additions & 0 deletions 3 ...ns/src/main/java/org/androidannotations/internal/core/handler/OptionsMenuItemHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
3 changes: 3 additions & 0 deletions 3 ...idannotations/src/main/java/org/androidannotations/internal/core/handler/PrefHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
3 changes: 3 additions & 0 deletions 3 ...ns/src/main/java/org/androidannotations/internal/core/handler/PreferenceByKeyHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
3 changes: 3 additions & 0 deletions 3 ...ations/src/main/java/org/androidannotations/internal/core/handler/RootContextHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
3 changes: 3 additions & 0 deletions 3 ...ions/src/main/java/org/androidannotations/internal/core/handler/SystemServiceHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
3 changes: 3 additions & 0 deletions 3 ...notations/src/main/java/org/androidannotations/internal/core/handler/ViewByIdHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
3 changes: 3 additions & 0 deletions 3 ...otations/src/main/java/org/androidannotations/internal/core/handler/ViewsByIdHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 4 additions & 0 deletions 4 ...s/src/test/java/org/androidannotations/generation/ActivityWithInvalidMethodInjection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@
@EActivity
public class ActivityWithInvalidMethodInjection extends Activity {

@Extra
void failHere() {
}

@Extra
void failHere(@Extra String fail) {
}
Expand Down
3 changes: 3 additions & 0 deletions 3 ...mlite/ormlite/src/main/java/org/androidannotations/ormlite/handler/OrmLiteDaoHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
3 changes: 3 additions & 0 deletions 3 ...t-spring/src/main/java/org/androidannotations/rest/spring/handler/RestServiceHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.