Skip to content
This repository was archived by the owner on Feb 26, 2023. It is now read-only.

Add a new validation rule for @Rest annotation #490

Merged
mathieuboniface merged 1 commit into from
Feb 6, 2013
Merged

Add a new validation rule for @Rest annotation #490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions ...s/androidannotations/src/main/java/org/androidannotations/AndroidAnnotationProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,6 @@
import org.androidannotations.processing.BeanProcessor;
import org.androidannotations.processing.BeforeTextChangeProcessor;
import org.androidannotations.processing.ClickProcessor;
import org.androidannotations.processing.HierarchyViewerSupportProcessor;
import org.androidannotations.processing.EActivityProcessor;
import org.androidannotations.processing.EApplicationProcessor;
import org.androidannotations.processing.EBeanProcessor;
Expand All @@ -142,6 +141,7 @@
import org.androidannotations.processing.FragmentByTagProcessor;
import org.androidannotations.processing.FromHtmlProcessor;
import org.androidannotations.processing.FullscreenProcessor;
import org.androidannotations.processing.HierarchyViewerSupportProcessor;
import org.androidannotations.processing.HttpsClientProcessor;
import org.androidannotations.processing.InstanceStateProcessor;
import org.androidannotations.processing.ItemClickProcessor;
Expand Down Expand Up @@ -191,7 +191,6 @@
import org.androidannotations.validation.BeanValidator;
import org.androidannotations.validation.BeforeTextChangeValidator;
import org.androidannotations.validation.ClickValidator;
import org.androidannotations.validation.HierarchyViewerSupportValidator;
import org.androidannotations.validation.EActivityValidator;
import org.androidannotations.validation.EApplicationValidator;
import org.androidannotations.validation.EBeanValidator;
Expand All @@ -207,6 +206,7 @@
import org.androidannotations.validation.FragmentByTagValidator;
import org.androidannotations.validation.FromHtmlValidator;
import org.androidannotations.validation.FullscreenValidator;
import org.androidannotations.validation.HierarchyViewerSupportValidator;
import org.androidannotations.validation.HttpsClientValidator;
import org.androidannotations.validation.InstanceStateValidator;
import org.androidannotations.validation.ItemClickValidator;
Expand Down Expand Up @@ -465,7 +465,7 @@ private ModelValidator buildModelValidator(IRClass rClass, AndroidSystemServices
modelValidator.register(new SystemServiceValidator(processingEnv, androidSystemServices));
modelValidator.register(new SharedPrefValidator(processingEnv));
modelValidator.register(new PrefValidator(processingEnv));
modelValidator.register(new RestValidator(processingEnv));
modelValidator.register(new RestValidator(processingEnv, androidManifest));
modelValidator.register(new DeleteValidator(processingEnv));
modelValidator.register(new GetValidator(processingEnv));
modelValidator.register(new HeadValidator(processingEnv));
Expand Down
7 changes: 6 additions & 1 deletion ...ndroidannotations/src/main/java/org/androidannotations/validation/rest/RestValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import javax.lang.model.element.TypeElement;

import org.androidannotations.annotations.rest.Rest;
import org.androidannotations.helper.AndroidManifest;
import org.androidannotations.helper.TargetAnnotationHelper;
import org.androidannotations.helper.ValidatorHelper;
import org.androidannotations.model.AnnotationElements;
Expand All @@ -31,8 +32,10 @@
public class RestValidator implements ElementValidator {

private final ValidatorHelper validatorHelper;
private final AndroidManifest androidManifest;

public RestValidator(ProcessingEnvironment processingEnv) {
public RestValidator(ProcessingEnvironment processingEnv, AndroidManifest androidManifest) {
this.androidManifest = androidManifest;
TargetAnnotationHelper annotationHelper = new TargetAnnotationHelper(processingEnv, getTarget());
validatorHelper = new ValidatorHelper(annotationHelper);
}
Expand Down Expand Up @@ -64,6 +67,8 @@ public boolean validate(Element element, AnnotationElements validatedElements) {

validatorHelper.validateInterceptors(element, valid);

validatorHelper.hasInternetPermission(typeElement, androidManifest, valid);

return valid.isValid();
}

Expand Down
12 changes: 9 additions & 3 deletions ...oidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/RestTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,10 @@

import java.io.IOException;

import org.junit.Before;
import org.junit.Test;

import org.androidannotations.AndroidAnnotationProcessor;
import org.androidannotations.utils.AAProcessorTestHelper;
import org.junit.Before;
import org.junit.Test;

public class RestTest extends AAProcessorTestHelper {

Expand All @@ -37,4 +36,11 @@ public void class_client_does_not_compile() throws IOException {
assertCompilationErrorOn(ClassClient.class, "@Rest", result);
}

@Test
public void client_no_internet_permission_does_not_compile() throws IOException {
addManifestProcessorParameter(RestTest.class, "NoInternetPermissionManifest.xml");
CompileResult result = compileFiles(ClientWithNoConverters.class);
assertCompilationErrorOn(ClientWithNoConverters.class, "@Rest", result);
}

}
2 changes: 2 additions & 0 deletions ...ons/androidannotations/src/test/resources/org/androidannotations/rest/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
package="org.androidannotations.testprocessor"
android:versionCode="1"
android:versionName="1.0" >

<uses-permission android:name="android.permission.INTERNET"/>

<application>
</application>
Expand Down
27 changes: 27 additions & 0 deletions ...notations/src/test/resources/org/androidannotations/rest/NoInternetPermissionManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?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="org.androidannotations.testprocessor"
android:versionCode="1"
android:versionName="1.0" >

<application>
</application>

</manifest>