Merge pull request androidannotations#1719 from WonderCsabo/1640_deprecateHttpsClient

WonderCsabo · WonderCsabo · commit 1da679797bf7 · 2016-03-04T17:07:03.000+01:00
Deprecate @HttpsClient
diff --git a/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/HttpsClient.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/HttpsClient.java
@@ -85,9 +85,12 @@
  * </pre>
  * 
  * </blockquote>
+ *
+ * @deprecated See https://developer.android.com/about/versions/marshmallow/android-6.0-changes.html#behavior-apache-http-client
  */
 @Retention(RetentionPolicy.CLASS)
 @Target({ ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER })
+@Deprecated
 public @interface HttpsClient {
 
 	/**
diff --git a/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/SSLConnection.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/SSLConnection.java
@@ -21,6 +21,7 @@
 
 import android.app.Activity;
 
+@SuppressWarnings("deprecation")
 @EActivity
 public class SSLConnection extends Activity {
 
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
@@ -47,6 +47,7 @@
 import com.helger.jcodemodel.JTryBlock;
 import com.helger.jcodemodel.JVar;
 
+@SuppressWarnings("deprecation")
 public class HttpsClientHandler extends BaseAnnotationHandler<EComponentHolder>implements MethodInjectionHandler<EComponentHolder> {
 
 	private final InjectHelper<EComponentHolder> injectHelper;
