HttpsClient annotation

Signed-off-by: Nabil Hachicha <nabil.hachicha@gmail.com>
pyricau · Jun 7, 2012 · Jun 3, 2012 · Jun 3, 2012 · Jun 4, 2012 · Jun 7, 2012
commit 0151060e78eaf22235e8d83f370cd4424665e2ea
diff --git a/...notations/src/main/java/com/googlecode/androidannotations/AndroidAnnotationProcessor.java b/...notations/src/main/java/com/googlecode/androidannotations/AndroidAnnotationProcessor.java
@@ -54,6 +54,7 @@
 import com.googlecode.androidannotations.annotations.FragmentByTag;
 import com.googlecode.androidannotations.annotations.FromHtml;
 import com.googlecode.androidannotations.annotations.Fullscreen;
+import com.googlecode.androidannotations.annotations.HttpsClient;
 import com.googlecode.androidannotations.annotations.InstanceState;
 import com.googlecode.androidannotations.annotations.ItemClick;
 import com.googlecode.androidannotations.annotations.ItemLongClick;
@@ -133,6 +134,7 @@
 import com.googlecode.androidannotations.processing.FragmentByTagProcessor;
 import com.googlecode.androidannotations.processing.FromHtmlProcessor;
 import com.googlecode.androidannotations.processing.FullscreenProcessor;
+import com.googlecode.androidannotations.processing.HttpsClientProcessor;
 import com.googlecode.androidannotations.processing.InstanceStateProcessor;
 import com.googlecode.androidannotations.processing.ItemClickProcessor;
 import com.googlecode.androidannotations.processing.ItemLongClickProcessor;
@@ -190,6 +192,7 @@
 import com.googlecode.androidannotations.validation.FragmentByTagValidator;
 import com.googlecode.androidannotations.validation.FromHtmlValidator;
 import com.googlecode.androidannotations.validation.FullscreenValidator;
+import com.googlecode.androidannotations.validation.HttpsClientValidator;
 import com.googlecode.androidannotations.validation.InstanceStateValidator;
 import com.googlecode.androidannotations.validation.ItemClickValidator;
 import com.googlecode.androidannotations.validation.ItemLongClickValidator;
@@ -291,8 +294,8 @@
 		FragmentByTag.class, //
 		BeforeTextChange.class, //
 		TextChange.class, //
-		AfterTextChange.class //
-})
+		AfterTextChange.class, //
+		HttpsClient.class })
 @SupportedSourceVersion(SourceVersion.RELEASE_6)
 public class AndroidAnnotationProcessor extends AnnotatedAbstractProcessor {
 
@@ -460,6 +463,7 @@ private ModelValidator buildModelValidator(IRClass rClass, AndroidSystemServices
 		modelValidator.register(new BeforeTextChangeValidator(processingEnv, rClass));
 		modelValidator.register(new TextChangeValidator(processingEnv, rClass));
 		modelValidator.register(new AfterTextChangeValidator(processingEnv, rClass));
+		modelValidator.register(new HttpsClientValidator(processingEnv, rClass));
 		return modelValidator;
 	}
 
@@ -538,6 +542,7 @@ private ModelProcessor buildModelProcessor(IRClass rClass, AndroidSystemServices
 		modelProcessor.register(new TextChangeProcessor(processingEnv, rClass));
 		modelProcessor.register(new BeforeTextChangeProcessor(processingEnv, rClass));
 		modelProcessor.register(new AfterTextChangeProcessor(processingEnv, rClass));
+		modelProcessor.register(new HttpsClientProcessor());
 		return modelProcessor;
 	}
 

diff --git a/...annotations/src/main/java/com/googlecode/androidannotations/helper/IdValidatorHelper.java b/...annotations/src/main/java/com/googlecode/androidannotations/helper/IdValidatorHelper.java
@@ -49,6 +49,13 @@ public void idExists(Element element, Res res, boolean defaultUseName, boolean a
 		idExists(element, res, defaultUseName, allowDefault, valid, idValue);
 	}
 
+	public void idExists(Element element, Res res, boolean defaultUseName, boolean allowDefault, IsValid valid, String methodName) {
+
+		Integer idValue = annotationHelper.extractAnnotationValue(element, methodName);
+
+		idExists(element, res, defaultUseName, allowDefault, valid, idValue);
+	}
+
 	public void idsExists(Element element, Res res, IsValid valid) {
 
 		int[] idsValues = annotationHelper.extractAnnotationValue(element);

diff --git a/...ations/src/main/java/com/googlecode/androidannotations/helper/TargetAnnotationHelper.java b/...ations/src/main/java/com/googlecode/androidannotations/helper/TargetAnnotationHelper.java
@@ -48,6 +48,19 @@ public <T> T extractAnnotationValue(Element element) {
 		}
 	}
 
+	@SuppressWarnings("unchecked")
+	public <T> T extractAnnotationValue(Element element, String methodName) {
+		Annotation annotation = element.getAnnotation(target);
+
+		Method method;
+		try {
+			method = annotation.getClass().getMethod(methodName);
+			return (T) method.invoke(annotation);
+		} catch (Exception e) {
+			throw new RuntimeException(e);
+		}
+	}
+
 	public DeclaredType extractAnnotationClassValue(Element element) {
 
 		AnnotationMirror annotationMirror = findAnnotationMirror(element, target);

diff --git a/...ns/androidannotations/src/main/java/com/googlecode/androidannotations/rclass/IRClass.java b/...ns/androidannotations/src/main/java/com/googlecode/androidannotations/rclass/IRClass.java
@@ -18,7 +18,7 @@
 public interface IRClass {
 
 	public enum Res {
-		LAYOUT, ID, STRING, ARRAY, COLOR, ANIM, BOOL, DIMEN, DRAWABLE, INTEGER, MOVIE, MENU;
+		LAYOUT, ID, STRING, ARRAY, COLOR, ANIM, BOOL, DIMEN, DRAWABLE, INTEGER, MOVIE, MENU, RAW;
 		public String rName() {
 			return toString().toLowerCase();
 		}

diff --git a/AndroidAnnotations/functional-test-1-5-tests/pom.xml b/AndroidAnnotations/functional-test-1-5-tests/pom.xml
@@ -46,6 +46,13 @@
 			<artifactId>junit</artifactId>
 			<scope>test</scope>
 		</dependency>
+
+		<dependency>
+			<groupId>bouncycastle</groupId>
+			<artifactId>bcprov-jdk16</artifactId>
+			<version>140</version>
+		</dependency>
+
 	</dependencies>
 
 	<build>

diff --git a/AndroidAnnotations/functional-test-1-5/.settings/org.eclipse.jdt.apt.core.prefs b/AndroidAnnotations/functional-test-1-5/.settings/org.eclipse.jdt.apt.core.prefs
@@ -1,5 +1,5 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.apt.aptEnabled=true
-org.eclipse.jdt.apt.genSrcDir=.apt_generated
+org.eclipse.jdt.apt.genSrcDir=.apt_generatedd
 org.eclipse.jdt.apt.processorOptions/trace=true
 org.eclipse.jdt.apt.reconcileEnabled=true
diff --git a/AndroidAnnotations/functional-test-1-5/AndroidManifest.xml b/AndroidAnnotations/functional-test-1-5/AndroidManifest.xml
@@ -63,6 +63,7 @@
         <activity android:name="com.googlecode.androidannotations.test15.nonconfiguration.NonConfigurationActivity_" />
         <activity android:name="com.googlecode.androidannotations.test15.sherlock.MySherlockActivity_" />
         <activity android:name="com.googlecode.androidannotations.test15.efragment.MyFragmentActivity_" />
+        <activity android:name=".SSLConnection_" />
 
         <receiver android:name="com.googlecode.androidannotations.test15.ereceiver.MyReceiver_" />
 

diff --git a/androidannotations-dependencies/.classpath b/androidannotations-dependencies/.classpath
@@ -3,6 +3,6 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry exported="true" kind="lib" path="codemodel-2.4.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="android-1.6_r2.jar"/>
+	<classpathentry kind="lib" path="android-1.6_r2.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>