Move PayPalLineItem class to PayPal module and update javadoc.

skauss · Sep 25, 2019 · fa14165 · fa14165
1 parent 619753e
commit fa14165
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 6 deletions.
diff --git a/Braintree/src/main/java/com/braintreepayments/api/PayPal.java b/Braintree/src/main/java/com/braintreepayments/api/PayPal.java
@@ -28,7 +28,7 @@
 import com.braintreepayments.api.models.PayPalAccountBuilder;
 import com.braintreepayments.api.models.PayPalAccountNonce;
 import com.braintreepayments.api.models.PayPalConfiguration;
-import com.braintreepayments.api.models.PayPalLineItem;
+import com.paypal.android.sdk.onetouch.core.PayPalLineItem;
 import com.braintreepayments.api.models.PayPalPaymentResource;
 import com.braintreepayments.api.models.PayPalRequest;
 import com.braintreepayments.api.models.PaymentMethodNonce;

diff --git a/Braintree/src/main/java/com/braintreepayments/api/models/PayPalRequest.java b/Braintree/src/main/java/com/braintreepayments/api/models/PayPalRequest.java
@@ -4,11 +4,12 @@
 import android.os.Parcelable;
 import androidx.annotation.StringDef;
 
+import com.paypal.android.sdk.onetouch.core.PayPalLineItem;
+
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.List;
 
 /**
  * Represents the parameters that are needed to start a Checkout with PayPal

diff --git a/Braintree/src/test/java/com/braintreepayments/api/PayPalRequestUnitTest.java b/Braintree/src/test/java/com/braintreepayments/api/PayPalRequestUnitTest.java
@@ -5,7 +5,7 @@
 import com.braintreepayments.api.exceptions.InvalidArgumentException;
 import com.braintreepayments.api.models.Authorization;
 import com.braintreepayments.api.models.Configuration;
-import com.braintreepayments.api.models.PayPalLineItem;
+import com.paypal.android.sdk.onetouch.core.PayPalLineItem;
 import com.braintreepayments.api.models.PayPalRequest;
 import com.braintreepayments.api.models.PostalAddress;
 import com.paypal.android.sdk.onetouch.core.BillingAgreementRequest;

diff --git a/Braintree/src/test/java/com/braintreepayments/api/PayPalUnitTest.java b/Braintree/src/test/java/com/braintreepayments/api/PayPalUnitTest.java
@@ -16,7 +16,7 @@
 import com.braintreepayments.api.models.Configuration;
 import com.braintreepayments.api.models.PayPalAccountBuilder;
 import com.braintreepayments.api.models.PayPalAccountNonce;
-import com.braintreepayments.api.models.PayPalLineItem;
+import com.paypal.android.sdk.onetouch.core.PayPalLineItem;
 import com.braintreepayments.api.models.PayPalRequest;
 import com.braintreepayments.api.models.PaymentMethodBuilder;
 import com.braintreepayments.api.models.PaymentMethodNonce;

diff --git a/...eepayments/api/models/PayPalLineItem.java → ...oid/sdk/onetouch/core/PayPalLineItem.java b/...eepayments/api/models/PayPalLineItem.java → ...oid/sdk/onetouch/core/PayPalLineItem.java
@@ -1,4 +1,4 @@
-package com.braintreepayments.api.models;
+package com.paypal.android.sdk.onetouch.core;
 
 import android.os.Parcel;
 import android.os.Parcelable;
@@ -15,6 +15,13 @@ public class PayPalLineItem implements Parcelable {
 
     @Retention(RetentionPolicy.SOURCE)
     @StringDef({PayPalLineItem.KIND_CREDIT, PayPalLineItem.KIND_DEBIT})
+
+    /**
+    * The type of PayPal line item.
+    *
+    * {@link #KIND_CREDIT} A line item that is a credit.
+    * {@link #KIND_DEBIT} A line item that debits.
+    */
     @interface PayPalLineItemKind {}
     public static final String KIND_CREDIT = "credit";
     public static final String KIND_DEBIT = "debit";

diff --git a/...ts/api/models/PayPalLineItemUnitTest.java → ...onetouch/core/PayPalLineItemUnitTest.java b/...ts/api/models/PayPalLineItemUnitTest.java → ...onetouch/core/PayPalLineItemUnitTest.java
@@ -1,4 +1,4 @@
-package com.braintreepayments.api.models;
+package com.paypal.android.sdk.onetouch.core;
 
 import android.os.Parcel;