From bd299f242f96ab38aa78a44797289d77400d4d9b Mon Sep 17 00:00:00 2001 From: Michael Shafrir Date: Thu, 5 Sep 2019 09:52:05 -0400 Subject: [PATCH] Remove @Deprecated methods from StripeIntent models - Remove `PaymentIntent#getSource()`. Use `PaymentIntent#getPaymentMethodId()` instead. - Remove `SetupIntent#getCustomerId()` - Remove `SourceCallback`. Use `ApiResultCallback` instead. - Remove `TokenCallback`. Use `ApiResultCallback` instead. --- .../com/stripe/android/SourceCallback.java | 13 ------ .../stripe/android/StripeIntentResult.java | 43 +------------------ .../com/stripe/android/TokenCallback.java | 13 ------ .../stripe/android/model/PaymentIntent.java | 18 +------- .../com/stripe/android/model/SetupIntent.java | 9 ---- 5 files changed, 2 insertions(+), 94 deletions(-) delete mode 100644 stripe/src/main/java/com/stripe/android/SourceCallback.java delete mode 100644 stripe/src/main/java/com/stripe/android/TokenCallback.java diff --git a/stripe/src/main/java/com/stripe/android/SourceCallback.java b/stripe/src/main/java/com/stripe/android/SourceCallback.java deleted file mode 100644 index 98e440a06a3..00000000000 --- a/stripe/src/main/java/com/stripe/android/SourceCallback.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.stripe.android; - -import com.stripe.android.model.Source; - -/** - * An interface representing a callback to be notified about the results of - * creating or finding a {@link Source}. - * - * @deprecated use {@link ApiResultCallback} - */ -@Deprecated -public interface SourceCallback extends ApiResultCallback { -} diff --git a/stripe/src/main/java/com/stripe/android/StripeIntentResult.java b/stripe/src/main/java/com/stripe/android/StripeIntentResult.java index 607cb29b72d..80ecdb34787 100644 --- a/stripe/src/main/java/com/stripe/android/StripeIntentResult.java +++ b/stripe/src/main/java/com/stripe/android/StripeIntentResult.java @@ -24,12 +24,10 @@ public abstract class StripeIntentResult { @NonNull private final T mStripeIntent; @Outcome private final int mOutcome; - @Status private final int mStatus; - StripeIntentResult(@NonNull T stripeIntent, @Status int outcome) { + StripeIntentResult(@NonNull T stripeIntent, @Outcome int outcome) { mStripeIntent = stripeIntent; mOutcome = determineOutcome(Objects.requireNonNull(stripeIntent.getStatus()), outcome); - mStatus = mOutcome; } @StripeIntentResult.Outcome @@ -69,15 +67,6 @@ public final int getOutcome() { return mOutcome; } - /** - * @deprecated use {@link #getOutcome()} - */ - @Deprecated - @Status - public final int getStatus() { - return mStatus; - } - @Override public final boolean equals(@Nullable Object obj) { return this == obj || (obj instanceof StripeIntentResult && @@ -123,34 +112,4 @@ public final int hashCode() { */ int TIMEDOUT = 4; } - - /** - * @deprecated use {@link Outcome} - */ - @Retention(RetentionPolicy.SOURCE) - @IntDef({Status.UNKNOWN, Status.SUCCEEDED, Status.FAILED, Status.CANCELED, Status.TIMEDOUT}) - @Deprecated - public @interface Status { - int UNKNOWN = 0; - - /** - * Confirmation or payment authentication succeeded - */ - int SUCCEEDED = 1; - - /** - * Confirm or payment authentication failed - */ - int FAILED = 2; - - /** - * Payment authentication was canceled by the user - */ - int CANCELED = 3; - - /** - * Payment authentication timed-out - */ - int TIMEDOUT = 4; - } } diff --git a/stripe/src/main/java/com/stripe/android/TokenCallback.java b/stripe/src/main/java/com/stripe/android/TokenCallback.java deleted file mode 100644 index e3e9eb6dd19..00000000000 --- a/stripe/src/main/java/com/stripe/android/TokenCallback.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.stripe.android; - -import com.stripe.android.model.Token; - -/** - * An interface representing a callback to be notified about the results of - * {@link Token} creation or requests - * - * @deprecated use {@link ApiResultCallback} - */ -@Deprecated -public interface TokenCallback extends ApiResultCallback { -} diff --git a/stripe/src/main/java/com/stripe/android/model/PaymentIntent.java b/stripe/src/main/java/com/stripe/android/model/PaymentIntent.java index 1033b0304d4..1fab90bd87e 100644 --- a/stripe/src/main/java/com/stripe/android/model/PaymentIntent.java +++ b/stripe/src/main/java/com/stripe/android/model/PaymentIntent.java @@ -48,7 +48,6 @@ public final class PaymentIntent extends StripeModel implements StripeIntent { private static final String FIELD_PAYMENT_METHOD_ID = "payment_method_id"; private static final String FIELD_PAYMENT_METHOD_TYPES = "payment_method_types"; private static final String FIELD_RECEIPT_EMAIL = "receipt_email"; - private static final String FIELD_SOURCE = "source"; private static final String FIELD_STATUS = "status"; private static final String FIELD_SETUP_FUTURE_USAGE = "setup_future_usage"; @@ -71,7 +70,6 @@ public final class PaymentIntent extends StripeModel implements StripeIntent { @Nullable private final NextActionType mNextActionType; @Nullable private final String mPaymentMethodId; @Nullable private final String mReceiptEmail; - @Nullable private final String mSource; @Nullable private final Status mStatus; @Nullable private final Usage mSetupFutureUsage; @Nullable private final Error mLastPaymentError; @@ -290,15 +288,6 @@ public String getReceiptEmail() { return mReceiptEmail; } - /** - * @deprecated use {@link #getPaymentMethodId()} - */ - @Deprecated - @Nullable - public String getSource() { - return mSource; - } - /** * @return Status of this PaymentIntent. */ @@ -332,7 +321,6 @@ private PaymentIntent( @Nullable Map nextAction, @Nullable String paymentMethodId, @Nullable String receiptEmail, - @Nullable String source, @Nullable Status status, @Nullable Usage setupFutureUsage, @Nullable Error lastPaymentError) { @@ -352,7 +340,6 @@ private PaymentIntent( mNextAction = nextAction; mPaymentMethodId = paymentMethodId; mReceiptEmail = receiptEmail; - mSource = source; mStatus = status; mSetupFutureUsage = setupFutureUsage; mNextActionType = mNextAction != null ? @@ -402,7 +389,6 @@ public static PaymentIntent fromJson(@Nullable JSONObject jsonObject) { final Usage setupFutureUsage = Usage.fromCode(optString(jsonObject, FIELD_SETUP_FUTURE_USAGE)); final Map nextAction = optMap(jsonObject, FIELD_NEXT_ACTION); - final String source = optString(jsonObject, FIELD_SOURCE); final Error lastPaymentError = Error.fromJson(jsonObject.optJSONObject(FIELD_LAST_PAYMENT_ERROR)); @@ -423,7 +409,6 @@ public static PaymentIntent fromJson(@Nullable JSONObject jsonObject) { nextAction, paymentMethodId, receiptEmail, - source, status, setupFutureUsage, lastPaymentError @@ -450,7 +435,6 @@ private boolean typedEquals(@NonNull PaymentIntent paymentIntent) { && ObjectUtils.equals(mLiveMode, paymentIntent.mLiveMode) && ObjectUtils.equals(mPaymentMethodId, paymentIntent.mPaymentMethodId) && ObjectUtils.equals(mReceiptEmail, paymentIntent.mReceiptEmail) - && ObjectUtils.equals(mSource, paymentIntent.mSource) && ObjectUtils.equals(mStatus, paymentIntent.mStatus) && ObjectUtils.equals(mSetupFutureUsage, paymentIntent.mSetupFutureUsage) && ObjectUtils.equals(mPaymentMethodTypes, paymentIntent.mPaymentMethodTypes) @@ -463,7 +447,7 @@ private boolean typedEquals(@NonNull PaymentIntent paymentIntent) { public int hashCode() { return ObjectUtils.hash(mId, mObjectType, mAmount, mCanceledAt, mCancellationReason, mCaptureMethod, mClientSecret, mConfirmationMethod, mCreated, mCurrency, - mDescription, mLiveMode, mReceiptEmail, mSource, mStatus, mPaymentMethodTypes, + mDescription, mLiveMode, mReceiptEmail, mStatus, mPaymentMethodTypes, mNextAction, mNextActionType, mPaymentMethodId, mSetupFutureUsage, mLastPaymentError); } diff --git a/stripe/src/main/java/com/stripe/android/model/SetupIntent.java b/stripe/src/main/java/com/stripe/android/model/SetupIntent.java index 5b3cfe3d538..a586171d313 100644 --- a/stripe/src/main/java/com/stripe/android/model/SetupIntent.java +++ b/stripe/src/main/java/com/stripe/android/model/SetupIntent.java @@ -105,15 +105,6 @@ public long getCreated() { return mCreated; } - /** - * @deprecated this field is only available with a secret key - */ - @Deprecated - @Nullable - public String getCustomerId() { - return null; - } - /** * @return An arbitrary string attached to the object. Often useful for displaying to users. */