Remove beta annotations and lint errors

braintree · Nov 6, 2015 · 1a753e3 · 1a753e3
1 parent 8777166
commit 1a753e3
Show file tree

Hide file tree

Showing 17 changed files with 4 additions and 59 deletions.
diff --git a/BraintreeApi/src/main/java/com/braintreepayments/api/AndroidPay.java b/BraintreeApi/src/main/java/com/braintreepayments/api/AndroidPay.java
@@ -3,7 +3,6 @@
 import android.app.Activity;
 import android.content.Intent;
 
-import com.braintreepayments.api.annotations.Beta;
 import com.braintreepayments.api.exceptions.InvalidArgumentException;
 import com.braintreepayments.api.models.AndroidPayCard;
 import com.braintreepayments.api.models.AndroidPayConfiguration;
@@ -26,7 +25,6 @@
 /**
  * Class containing Android Pay specific logic.
  */
-@Beta
 public class AndroidPay {
 
     protected static final int ANDROID_PAY_MASKED_WALLET_REQUEST_CODE = 13489;
@@ -49,7 +47,6 @@ public class AndroidPay {
      * @param fragment {@link BraintreeFragment}
      * @return the {@link PaymentMethodTokenizationParameters}
      */
-    @Beta
     public static PaymentMethodTokenizationParameters getTokenizationParameters(BraintreeFragment fragment) {
         PaymentMethodTokenizationParameters.Builder parameters = PaymentMethodTokenizationParameters.newBuilder()
                 .setPaymentMethodTokenizationType(PaymentMethodTokenizationType.PAYMENT_GATEWAY)
@@ -108,7 +105,6 @@ public static Collection<Integer> getAllowedCardNetworks(BraintreeFragment fragm
      * @param wallet a {@link FullWallet} from the Intent in
      *          {@link Activity#onActivityResult(int, int, Intent)}
      */
-    @Beta
     public static void tokenize(BraintreeFragment fragment, FullWallet wallet) {
         try {
             fragment.postCallback(AndroidPayCard.fromJson(wallet.getPaymentMethodToken().getToken()));

diff --git a/BraintreeApi/src/main/java/com/braintreepayments/api/ThreeDSecure.java b/BraintreeApi/src/main/java/com/braintreepayments/api/ThreeDSecure.java
@@ -3,7 +3,6 @@
 import android.app.Activity;
 import android.content.Intent;
 
-import com.braintreepayments.api.annotations.Beta;
 import com.braintreepayments.api.exceptions.BraintreeException;
 import com.braintreepayments.api.exceptions.ErrorWithResponse;
 import com.braintreepayments.api.interfaces.ConfigurationListener;
@@ -47,7 +46,6 @@ public class ThreeDSecure {
      *                    the 3D Secure verification if performed.
      * @param amount The amount of the transaction in the current merchant account's currency
      */
-    @Beta
     public static void performVerification(final BraintreeFragment fragment, final CardBuilder cardBuilder, final String amount) {
         PaymentMethodTokenization.tokenize(fragment, cardBuilder, new PaymentMethodResponseCallback() {
             @Override
@@ -86,7 +84,6 @@ public void failure(Exception exception) {
      * @param nonce The nonce that represents a card to perform a 3D Secure verification against.
      * @param amount The amount of the transaction in the current merchant account's currency.
      */
-    @Beta
     public static void performVerification(final BraintreeFragment fragment, final String nonce,
             final String amount) {
         fragment.waitForConfiguration(new ConfigurationListener() {

diff --git a/BraintreeApi/src/main/java/com/braintreepayments/api/models/AndroidPayCard.java b/BraintreeApi/src/main/java/com/braintreepayments/api/models/AndroidPayCard.java
@@ -3,16 +3,13 @@
 import android.os.Parcel;
 import android.os.Parcelable;
 
-import com.braintreepayments.api.annotations.Beta;
-
 import org.json.JSONException;
 import org.json.JSONObject;
 
 /**
  * {@link com.braintreepayments.api.models.PaymentMethod} representing an Android Pay card.
  * @see com.braintreepayments.api.models.PaymentMethod
  */
-@Beta
 public class AndroidPayCard extends PaymentMethod implements Parcelable {
 
     protected static final String PAYMENT_METHOD_TYPE = "AndroidPayCard";

diff --git a/BraintreeApi/src/main/java/com/braintreepayments/api/models/AndroidPayConfiguration.java b/BraintreeApi/src/main/java/com/braintreepayments/api/models/AndroidPayConfiguration.java
@@ -2,7 +2,6 @@
 
 import android.content.Context;
 
-import com.braintreepayments.api.annotations.Beta;
 import com.google.android.gms.common.ConnectionResult;
 import com.google.android.gms.common.GoogleApiAvailability;
 
@@ -13,7 +12,6 @@
 /**
  * Contains the remote Android Pay configuration for the Braintree SDK.
  */
-@Beta
 public class AndroidPayConfiguration {
 
     private static final String ENABLED_KEY = "enabled";

diff --git a/BraintreeApi/src/main/java/com/braintreepayments/api/models/Card.java b/BraintreeApi/src/main/java/com/braintreepayments/api/models/Card.java
@@ -3,8 +3,6 @@
 import android.os.Parcel;
 import android.os.Parcelable;
 
-import com.braintreepayments.api.annotations.Beta;
-
 import org.json.JSONException;
 import org.json.JSONObject;
 
@@ -74,7 +72,6 @@ public String getLastTwo() {
      * @return The 3D Secure info for the current {@link com.braintreepayments.api.models.Card} or
      * {@code null}
      */
-    @Beta
     public ThreeDSecureInfo getThreeDSecureInfo() {
         return mThreeDSecureInfo;
     }

diff --git a/BraintreeApi/src/main/java/com/braintreepayments/api/models/Configuration.java b/BraintreeApi/src/main/java/com/braintreepayments/api/models/Configuration.java
@@ -1,7 +1,5 @@
 package com.braintreepayments.api.models;
 
-import com.braintreepayments.api.annotations.Beta;
-
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -102,7 +100,6 @@ public PayPalConfiguration getPayPal() {
     /**
      * @return instance of {@link AndroidPayConfiguration}.
      */
-    @Beta
     public AndroidPayConfiguration getAndroidPay() {
         return mAndroidPayConfiguration;
     }
@@ -124,7 +121,6 @@ public String getVenmoState() {
      * @return {@code true} if 3D Secure is enabled and supported for the current merchant account,
      *         {@code false} otherwise.
      */
-    @Beta
     public boolean isThreeDSecureEnabled() {
         return mThreeDSecureEnabled;
     }

diff --git a/...pi/src/main/java/com/braintreepayments/api/models/ThreeDSecureAuthenticationResponse.java b/...pi/src/main/java/com/braintreepayments/api/models/ThreeDSecureAuthenticationResponse.java
@@ -4,7 +4,6 @@
 import android.os.Parcel;
 import android.os.Parcelable;
 
-import com.braintreepayments.api.annotations.Beta;
 import com.braintreepayments.api.threedsecure.ThreeDSecureWebViewActivity;
 
 import org.json.JSONException;
@@ -13,7 +12,6 @@
 /**
  * Class to parse and contain 3D Secure authentication responses
  */
-@Beta
 public class ThreeDSecureAuthenticationResponse implements Parcelable {
 
     private static final String PAYMENT_METHOD_KEY = "paymentMethod";

diff --git a/BraintreeApi/src/main/java/com/braintreepayments/api/models/ThreeDSecureInfo.java b/BraintreeApi/src/main/java/com/braintreepayments/api/models/ThreeDSecureInfo.java
@@ -3,15 +3,12 @@
 import android.os.Parcel;
 import android.os.Parcelable;
 
-import com.braintreepayments.api.annotations.Beta;
-
 import org.json.JSONObject;
 
 /**
  * A class to contain 3D Secure information about the current
  * {@link com.braintreepayments.api.models.Card}
  */
-@Beta
 public class ThreeDSecureInfo implements Parcelable {
 
     private static final String LIABILITY_SHIFTED_KEY = "liabilityShifted";

diff --git a/BraintreeApi/src/main/java/com/braintreepayments/api/models/ThreeDSecureLookup.java b/BraintreeApi/src/main/java/com/braintreepayments/api/models/ThreeDSecureLookup.java
@@ -3,15 +3,12 @@
 import android.os.Parcel;
 import android.os.Parcelable;
 
-import com.braintreepayments.api.annotations.Beta;
-
 import org.json.JSONException;
 import org.json.JSONObject;
 
 /**
  * Class to parse and contain 3D Secure lookup params
  */
-@Beta
 public class ThreeDSecureLookup implements Parcelable {
 
     private static final String PAYMENT_METHOD_KEY = "paymentMethod";

diff --git a/...Api/src/main/java/com/braintreepayments/api/threedsecure/ThreeDSecureWebChromeClient.java b/...Api/src/main/java/com/braintreepayments/api/threedsecure/ThreeDSecureWebChromeClient.java
@@ -4,9 +4,6 @@
 import android.webkit.WebChromeClient;
 import android.webkit.WebView;
 
-import com.braintreepayments.api.annotations.Beta;
-
-@Beta
 public class ThreeDSecureWebChromeClient extends WebChromeClient {
 
     private ThreeDSecureWebViewActivity mActivity;

diff --git a/BraintreeApi/src/main/java/com/braintreepayments/api/threedsecure/ThreeDSecureWebView.java b/BraintreeApi/src/main/java/com/braintreepayments/api/threedsecure/ThreeDSecureWebView.java
@@ -8,10 +8,8 @@
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 
-import com.braintreepayments.api.annotations.Beta;
 import com.braintreepayments.api.internal.BraintreeHttpClient;
 
-@Beta
 @SuppressLint("SetJavaScriptEnabled")
 public class ThreeDSecureWebView extends WebView {
 

diff --git a/...Api/src/main/java/com/braintreepayments/api/threedsecure/ThreeDSecureWebViewActivity.java b/...Api/src/main/java/com/braintreepayments/api/threedsecure/ThreeDSecureWebViewActivity.java
@@ -8,15 +8,13 @@
 import android.view.Window;
 import android.widget.FrameLayout;
 
-import com.braintreepayments.api.annotations.Beta;
 import com.braintreepayments.api.models.ThreeDSecureAuthenticationResponse;
 import com.braintreepayments.api.models.ThreeDSecureLookup;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.util.Stack;
 
-@Beta
 public class ThreeDSecureWebViewActivity extends Activity {
 
     public static final String EXTRA_THREE_D_SECURE_LOOKUP = "com.braintreepayments.api.EXTRA_THREE_D_SECURE_LOOKUP";

diff --git a/...eeApi/src/main/java/com/braintreepayments/api/threedsecure/ThreeDSecureWebViewClient.java b/...eeApi/src/main/java/com/braintreepayments/api/threedsecure/ThreeDSecureWebViewClient.java
@@ -7,10 +7,8 @@
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 
-import com.braintreepayments.api.annotations.Beta;
 import com.braintreepayments.api.models.ThreeDSecureAuthenticationResponse;
 
-@Beta
 public class ThreeDSecureWebViewClient extends WebViewClient {
 
     private ThreeDSecureWebViewActivity mActivity;

diff --git a/Demo/src/main/java/com/braintreepayments/demo/FinishedActivity.java b/Demo/src/main/java/com/braintreepayments/demo/FinishedActivity.java
@@ -16,7 +16,6 @@
 import retrofit.RetrofitError;
 import retrofit.client.Response;
 
-@SuppressWarnings("com.braintreepayments.beta")
 public class FinishedActivity extends Activity {
 
     public static final String EXTRA_PAYMENT_METHOD_NONCE = "nonce";

diff --git a/Demo/src/main/java/com/braintreepayments/demo/MainActivity.java b/Demo/src/main/java/com/braintreepayments/demo/MainActivity.java
@@ -41,7 +41,6 @@
 import retrofit.RetrofitError;
 import retrofit.client.Response;
 
-@SuppressWarnings("com.braintreepayments.beta")
 public class MainActivity extends Activity implements PaymentMethodCreatedListener,
         BraintreeErrorListener, OnNavigationListener {
 

diff --git a/Demo/src/main/java/com/braintreepayments/demo/Settings.java b/Demo/src/main/java/com/braintreepayments/demo/Settings.java
@@ -4,7 +4,6 @@
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 
-@SuppressWarnings("com.braintreepayments.beta")
 public class Settings {
 
     protected static final String ENVIRONMENT = "environment";

diff --git a/Lint/src/main/java/com/braintreepayments/lint/BetaDetector.java b/Lint/src/main/java/com/braintreepayments/lint/BetaDetector.java
@@ -14,7 +14,7 @@
 import com.android.tools.lint.detector.api.Speed;
 import com.android.tools.lint.detector.api.TextFormat;
 
-import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 import lombok.ast.AstVisitor;
@@ -24,25 +24,9 @@
 
 public class BetaDetector extends Detector implements JavaScanner {
 
-    private static final List<String> METHODS = Arrays.asList(
-            "isThreeDSecureEnabled",
-            "startThreeDSecureVerification",
-            "finishThreeDSecureVerification",
-            "getThreeDSecureInfo",
-            "isAndroidPayEnabled",
-            "isMaskedWalletResponse",
-            "isFullWalletResponse",
-            "getAndroidPayTokenizationParameters",
-            "getAndroidPayGoogleTransactionId",
-            "performAndroidPayMaskedWalletRequest",
-            "performAndroidPayChangeMaskedWalletRequest",
-            "performAndroidPayFullWalletRequest",
-            "getNonceFromAndroidPayFullWalletResponse",
-            "getAndroidPay"
-    );
-
-    private static final Implementation IMPLEMENTATION = new Implementation(
-            BetaDetector.class,
+    private static final List<String> METHODS = Collections.emptyList();
+
+    private static final Implementation IMPLEMENTATION = new Implementation(BetaDetector.class,
             Scope.JAVA_FILE_SCOPE);
 
     public static final Issue ISSUE = Issue.create(