diff --git a/README.md b/README.md index 825cac03..cb37bc19 100644 --- a/README.md +++ b/README.md @@ -25,10 +25,11 @@ implementation "com.stripe:stripe-java:20.98.0" Add this dependency to your project's POM: ```xml + - com.stripe - stripe-java - 20.98.0 + com.seamlesspay + stripe-java + 20.98.0 ``` @@ -66,10 +67,10 @@ StripeExample.java import java.util.HashMap; import java.util.Map; -import com.stripe.Stripe; -import com.stripe.exception.SPException; -import com.stripe.model.Customer; -import com.stripe.net.RequestOptions; +import com.seamlesspay.Stripe; +import com.seamlesspay.exception.SPException; +import com.seamlesspay.model.Customer; +import com.seamlesspay.net.RequestOptions; public class StripeExample { diff --git a/VERSION b/VERSION index 15037dd9..c5d54ec3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -20.98.0 +0.0.9 diff --git a/build.gradle b/build.gradle index dfdbcddc..d741ca61 100644 --- a/build.gradle +++ b/build.gradle @@ -41,12 +41,6 @@ tasks.withType(JavaCompile) { // // to fix by adding the missing summaries. // check("MissingSummary", net.ltgt.gradle.errorprone.CheckSeverity.OFF) // -// // This check is disabled because multiple nested classes may have the same name in a given -// // file. E.g. in `main/java/com/stripe/param/AccountUpdateParams.java`: -// // The name `Address` refers to [com.stripe.param.AccountUpdateParams.Company.Address, -// // com.stripe.param.AccountUpdateParams.Individual.Address] within this file.) -// // We should fix this by having autogen use the fully-qualified class to eliminate ambiguity. -// check("SameNameButDifferent", net.ltgt.gradle.errorprone.CheckSeverity.OFF) // } } @@ -81,7 +75,7 @@ jar { "Implementation-Version": VERSION_NAME, "Implementation-Vendor": VENDOR_NAME, "Bundle-SymbolicName": POM_ARTIFACT_ID, - "Export-Package": "com.stripe.*") + "Export-Package": "com.seamlesspay.*") archiveVersion = VERSION_NAME } @@ -137,7 +131,7 @@ coveralls { //} gitPublish { - repoUri = 'git@github.com:stripe/stripe-java.git' + repoUri = 'git@github.com:seamlesspay/seamlesspay-java.git' branch = 'gh-pages' sign = false // disable commit signing diff --git a/gradle.properties b/gradle.properties index 5cb7584d..497f37b6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,24 +1,25 @@ -GROUP=com.stripe -VERSION_NAME=20.98.0 +GROUP=com.seamlesspay +VERSION_NAME=0.0.1 +NAME=seamlesspay-java -POM_URL=https://github.com/stripe/stripe-java -POM_SCM_URL=git@github.com:stripe/stripe-java.git -POM_SCM_CONNECTION=scm:git:git@github.com:stripe/stripe-java.git -POM_SCM_DEV_CONNECTION=scm:git:git@github.com:stripe/stripe-java.git +POM_URL=https://github.com/seamlesspay/seamlesspay-java +POM_SCM_URL=git@github.com:seamlesspay/seamlesspay-java.git +POM_SCM_CONNECTION=scm:git:git@github.com:seamlesspay/seamlesspay-java.git +POM_SCM_DEV_CONNECTION=scm:git:git@github.com:seamlesspay/seamlesspay-java.git POM_LICENCE_NAME=The MIT License POM_LICENCE_URL=https://opensource.org/licenses/MIT -POM_LICENCE_DIST=repo -POM_DEVELOPER_ID=stripe -POM_DEVELOPER_NAME=Stripe -POM_DEVELOPER_EMAIL=support+java@stripe.com +POM_LICENCE_DIST=seamlesspay +POM_DEVELOPER_ID=seamlesspay +POM_DEVELOPER_NAME=SeamlessPay +POM_DEVELOPER_EMAIL=support+java@seamlesspay.com -POM_DESCRIPTION=Stripe Java Bindings -POM_NAME=stripe-java -POM_ARTIFACT_ID=stripe-java +POM_DESCRIPTION=SeamlessPay Java Bindings +POM_NAME=seamlesspay-java +POM_ARTIFACT_ID=seamlesspay-java POM_PACKAGING=jar -POM_ORGANIZATION_URL=https://stripe.com +POM_ORGANIZATION_URL=https://seamlesspay.com -VENDOR_NAME=Stripe, Inc. (https://stripe.com) +VENDOR_NAME=Seamless Payments (https://seamlesspay.com) # Workaround to prevent Java 12 to try and use TLSv1.3 when uploading coverage # reports to coveralls.io. diff --git a/init b/init deleted file mode 100644 index 8b137891..00000000 --- a/init +++ /dev/null @@ -1 +0,0 @@ - diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 00000000..ea40a47d --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = NAME diff --git a/src/main/java/com/seamlesspay/SPAPI.java b/src/main/java/com/seamlesspay/SPAPI.java index 6dc604fb..58674cc1 100644 --- a/src/main/java/com/seamlesspay/SPAPI.java +++ b/src/main/java/com/seamlesspay/SPAPI.java @@ -49,31 +49,7 @@ public static String getApiBase() { } /** - * (FOR TESTING ONLY) If you'd like your OAuth requests to hit your own (mocked) server, you can - * set this up here by overriding the base Connect URL. - */ -// public static void overrideConnectBase(final String overriddenConnectBase) { -// connectBase = overriddenConnectBase; -// } -// -// public static String getConnectBase() { -// return connectBase; -// } - - /** - * (FOR TESTING ONLY) If you'd like your upload requests to hit your own (mocked) server, you can - * set this up here by overriding the base api URL. - */ -// public static void overrideUploadBase(final String overriddenUploadBase) { -// uploadBase = overriddenUploadBase; -// } -// -// public static String getUploadBase() { -// return uploadBase; -// } - - /** - * Set proxy to tunnel all Stripe connections. + * Set proxy to tunnel all SeamlessPay connections. * * @param proxy proxy host and port setting */ @@ -98,7 +74,7 @@ public static int getConnectTimeout() { } /** - * Sets the timeout value that will be used for making new connections to the Stripe API (in + * Sets the timeout value that will be used for making new connections to the SeamlessPay API (in * milliseconds). * * @param timeout timeout value in milliseconds @@ -121,7 +97,7 @@ public static int getReadTimeout() { /** * Sets the timeout value that will be used when reading data from an established connection to - * the Stripe API (in milliseconds). + * the SeamlessPay API (in milliseconds). * *

Note that this value should be set conservatively because some API requests can take time * and a short timeout increases the likelihood of causing a problem in the backend. @@ -176,12 +152,12 @@ public static void setAppInfo(String name, String version, String url) { } /** - * Sets information about your application. The information is passed along to Stripe. + * Sets information about your application. The information is passed along to SeamlessPay. * * @param name Name of your application (e.g. "MyAwesomeApp") * @param version Version of your application (e.g. "1.2.34") * @param url Website for your application (e.g. "https://myawesomeapp.info") - * @param partnerId Your Stripe Partner ID (e.g. "pp_partner_1234") + * @param partnerId Your SeamlessPay Partner ID (e.g. "pp_partner_1234") */ public static void setAppInfo(String name, String version, String url, String partnerId) { if (appInfo == null) { diff --git a/src/main/java/com/stripe/exception/ApiConnectionException.java b/src/main/java/com/seamlesspay/exception/ApiConnectionException.java similarity index 89% rename from src/main/java/com/stripe/exception/ApiConnectionException.java rename to src/main/java/com/seamlesspay/exception/ApiConnectionException.java index 881abaf3..f6825107 100644 --- a/src/main/java/com/stripe/exception/ApiConnectionException.java +++ b/src/main/java/com/seamlesspay/exception/ApiConnectionException.java @@ -1,4 +1,4 @@ -package com.stripe.exception; +package com.seamlesspay.exception; public class ApiConnectionException extends SPException { private static final long serialVersionUID = 2L; diff --git a/src/main/java/com/stripe/exception/ApiException.java b/src/main/java/com/seamlesspay/exception/ApiException.java similarity index 84% rename from src/main/java/com/stripe/exception/ApiException.java rename to src/main/java/com/seamlesspay/exception/ApiException.java index cfe42084..bc8fe4a7 100644 --- a/src/main/java/com/stripe/exception/ApiException.java +++ b/src/main/java/com/seamlesspay/exception/ApiException.java @@ -1,6 +1,6 @@ -package com.stripe.exception; +package com.seamlesspay.exception; -import com.stripe.model.error.SPError; +import com.seamlesspay.model.error.SPError; public class ApiException extends SPException { private static final long serialVersionUID = 2L; diff --git a/src/main/java/com/stripe/exception/AuthenticationException.java b/src/main/java/com/seamlesspay/exception/AuthenticationException.java similarity index 85% rename from src/main/java/com/stripe/exception/AuthenticationException.java rename to src/main/java/com/seamlesspay/exception/AuthenticationException.java index e3ff6f90..c5a03d86 100644 --- a/src/main/java/com/stripe/exception/AuthenticationException.java +++ b/src/main/java/com/seamlesspay/exception/AuthenticationException.java @@ -1,6 +1,6 @@ -package com.stripe.exception; +package com.seamlesspay.exception; -import com.stripe.model.error.SPError; +import com.seamlesspay.model.error.SPError; public class AuthenticationException extends SPException { private static final long serialVersionUID = 2L; diff --git a/src/main/java/com/stripe/exception/IdempotencyException.java b/src/main/java/com/seamlesspay/exception/IdempotencyException.java similarity index 88% rename from src/main/java/com/stripe/exception/IdempotencyException.java rename to src/main/java/com/seamlesspay/exception/IdempotencyException.java index 7e983783..e633dff1 100644 --- a/src/main/java/com/stripe/exception/IdempotencyException.java +++ b/src/main/java/com/seamlesspay/exception/IdempotencyException.java @@ -1,4 +1,4 @@ -package com.stripe.exception; +package com.seamlesspay.exception; public class IdempotencyException extends SPException { private static final long serialVersionUID = 2L; diff --git a/src/main/java/com/stripe/exception/InvalidRequestException.java b/src/main/java/com/seamlesspay/exception/InvalidRequestException.java similarity index 90% rename from src/main/java/com/stripe/exception/InvalidRequestException.java rename to src/main/java/com/seamlesspay/exception/InvalidRequestException.java index 6f7133dc..26cc8236 100644 --- a/src/main/java/com/stripe/exception/InvalidRequestException.java +++ b/src/main/java/com/seamlesspay/exception/InvalidRequestException.java @@ -1,4 +1,4 @@ -package com.stripe.exception; +package com.seamlesspay.exception; public class InvalidRequestException extends SPException { private static final long serialVersionUID = 2L; diff --git a/src/main/java/com/stripe/exception/SPException.java b/src/main/java/com/seamlesspay/exception/SPException.java similarity index 95% rename from src/main/java/com/stripe/exception/SPException.java rename to src/main/java/com/seamlesspay/exception/SPException.java index 1c86a098..cb433b38 100644 --- a/src/main/java/com/stripe/exception/SPException.java +++ b/src/main/java/com/seamlesspay/exception/SPException.java @@ -1,6 +1,6 @@ -package com.stripe.exception; +package com.seamlesspay.exception; -import com.stripe.model.error.SPError; +import com.seamlesspay.model.error.SPError; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/com/stripe/model/Batch.java b/src/main/java/com/seamlesspay/model/Batch.java similarity index 89% rename from src/main/java/com/stripe/model/Batch.java rename to src/main/java/com/seamlesspay/model/Batch.java index 30e948ce..5fee4fd1 100644 --- a/src/main/java/com/stripe/model/Batch.java +++ b/src/main/java/com/seamlesspay/model/Batch.java @@ -1,9 +1,9 @@ -package com.stripe.model; +package com.seamlesspay.model; import com.seamlesspay.SPAPI; -import com.stripe.exception.SPException; -import com.stripe.net.ApiResource; -import com.stripe.net.RequestOptions; +import com.seamlesspay.exception.SPException; +import com.seamlesspay.net.ApiResource; +import com.seamlesspay.net.RequestOptions; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/com/stripe/model/BatchCloseResult.java b/src/main/java/com/seamlesspay/model/BatchCloseResult.java similarity index 93% rename from src/main/java/com/stripe/model/BatchCloseResult.java rename to src/main/java/com/seamlesspay/model/BatchCloseResult.java index a2932814..e5e167cf 100644 --- a/src/main/java/com/stripe/model/BatchCloseResult.java +++ b/src/main/java/com/seamlesspay/model/BatchCloseResult.java @@ -1,7 +1,7 @@ -package com.stripe.model; +package com.seamlesspay.model; import com.google.gson.annotations.SerializedName; -import com.stripe.net.ApiResource; +import com.seamlesspay.net.ApiResource; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/com/stripe/model/CardType.java b/src/main/java/com/seamlesspay/model/CardType.java similarity index 86% rename from src/main/java/com/stripe/model/CardType.java rename to src/main/java/com/seamlesspay/model/CardType.java index 81dc4f14..82338fb7 100644 --- a/src/main/java/com/stripe/model/CardType.java +++ b/src/main/java/com/seamlesspay/model/CardType.java @@ -1,4 +1,4 @@ -package com.stripe.model; +package com.seamlesspay.model; import com.google.gson.annotations.SerializedName; diff --git a/src/main/java/com/stripe/model/Charge.java b/src/main/java/com/seamlesspay/model/Charge.java similarity index 94% rename from src/main/java/com/stripe/model/Charge.java rename to src/main/java/com/seamlesspay/model/Charge.java index 70b4e576..3a702a60 100644 --- a/src/main/java/com/stripe/model/Charge.java +++ b/src/main/java/com/seamlesspay/model/Charge.java @@ -1,14 +1,14 @@ -package com.stripe.model; +package com.seamlesspay.model; import com.google.gson.annotations.SerializedName; import com.seamlesspay.SPAPI; -import com.stripe.exception.SPException; -import com.stripe.net.ApiRequestParams; -import com.stripe.net.ApiResource; -import com.stripe.net.RequestOptions; -import com.stripe.param.ChargeCreateParams; -import com.stripe.param.ChargeUpdateParams; -import com.stripe.param.ChargeVoidParams; +import com.seamlesspay.exception.SPException; +import com.seamlesspay.net.ApiRequestParams; +import com.seamlesspay.net.ApiResource; +import com.seamlesspay.net.RequestOptions; +import com.seamlesspay.param.ChargeCreateParams; +import com.seamlesspay.param.ChargeUpdateParams; +import com.seamlesspay.param.ChargeVoidParams; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; @@ -155,7 +155,7 @@ public static ChargeCollection list(RequestOptions options) /** * To charge a credit card or other payment source, you create a Charge object. If * your API key is in test mode, the supplied payment source (e.g., card) won’t actually be - * charged, although everything else will occur as if in live mode. (Stripe assumes that the + * charged, although everything else will occur as if in live mode. (SeamlessPay assumes that the * charge would have completed successfully). */ public static Charge create(Map params) throws SPException { @@ -165,7 +165,7 @@ public static Charge create(Map params) throws SPException { /** * To charge a credit card or other payment source, you create a Charge object. If * your API key is in test mode, the supplied payment source (e.g., card) won’t actually be - * charged, although everything else will occur as if in live mode. (Stripe assumes that the + * charged, although everything else will occur as if in live mode. (SeamlessPay assumes that the * charge would have completed successfully). */ public static Charge create(Map params, RequestOptions options) @@ -177,7 +177,7 @@ public static Charge create(Map params, RequestOptions options) /** * To charge a credit card or other payment source, you create a Charge object. If * your API key is in test mode, the supplied payment source (e.g., card) won’t actually be - * charged, although everything else will occur as if in live mode. (Stripe assumes that the + * charged, although everything else will occur as if in live mode. (SeamlessPay assumes that the * charge would have completed successfully). */ public static Charge create(ChargeCreateParams params) throws SPException { @@ -187,7 +187,7 @@ public static Charge create(ChargeCreateParams params) throws SPException { /** * To charge a credit card or other payment source, you create a Charge object. If * your API key is in test mode, the supplied payment source (e.g., card) won’t actually be - * charged, although everything else will occur as if in live mode. (Stripe assumes that the + * charged, although everything else will occur as if in live mode. (SeamlessPay assumes that the * charge would have completed successfully). */ public static Charge create(ChargeCreateParams params, RequestOptions options) throws SPException { diff --git a/src/main/java/com/stripe/model/ChargeCollection.java b/src/main/java/com/seamlesspay/model/ChargeCollection.java similarity index 67% rename from src/main/java/com/stripe/model/ChargeCollection.java rename to src/main/java/com/seamlesspay/model/ChargeCollection.java index 1ba3406c..16fbaa16 100644 --- a/src/main/java/com/stripe/model/ChargeCollection.java +++ b/src/main/java/com/seamlesspay/model/ChargeCollection.java @@ -1,3 +1,3 @@ -package com.stripe.model; +package com.seamlesspay.model; public class ChargeCollection extends SPCollection {} diff --git a/src/main/java/com/stripe/model/CreditCardVerification.java b/src/main/java/com/seamlesspay/model/CreditCardVerification.java similarity index 94% rename from src/main/java/com/stripe/model/CreditCardVerification.java rename to src/main/java/com/seamlesspay/model/CreditCardVerification.java index 159df825..c046fc85 100644 --- a/src/main/java/com/stripe/model/CreditCardVerification.java +++ b/src/main/java/com/seamlesspay/model/CreditCardVerification.java @@ -1,4 +1,4 @@ -package com.stripe.model; +package com.seamlesspay.model; import com.google.gson.annotations.SerializedName; import lombok.Data; diff --git a/src/main/java/com/stripe/model/CreditCardVerificationCode.java b/src/main/java/com/seamlesspay/model/CreditCardVerificationCode.java similarity index 94% rename from src/main/java/com/stripe/model/CreditCardVerificationCode.java rename to src/main/java/com/seamlesspay/model/CreditCardVerificationCode.java index cc374292..a19b5a2f 100644 --- a/src/main/java/com/stripe/model/CreditCardVerificationCode.java +++ b/src/main/java/com/seamlesspay/model/CreditCardVerificationCode.java @@ -1,4 +1,4 @@ -package com.stripe.model; +package com.seamlesspay.model; import com.google.gson.annotations.SerializedName; diff --git a/src/main/java/com/stripe/model/Currency.java b/src/main/java/com/seamlesspay/model/Currency.java similarity index 78% rename from src/main/java/com/stripe/model/Currency.java rename to src/main/java/com/seamlesspay/model/Currency.java index 6ffc1798..797666af 100644 --- a/src/main/java/com/stripe/model/Currency.java +++ b/src/main/java/com/seamlesspay/model/Currency.java @@ -1,4 +1,4 @@ -package com.stripe.model; +package com.seamlesspay.model; public enum Currency { diff --git a/src/main/java/com/stripe/model/DigitalWalletProgramType.java b/src/main/java/com/seamlesspay/model/DigitalWalletProgramType.java similarity index 69% rename from src/main/java/com/stripe/model/DigitalWalletProgramType.java rename to src/main/java/com/seamlesspay/model/DigitalWalletProgramType.java index 87aa04b6..0d6e7249 100644 --- a/src/main/java/com/stripe/model/DigitalWalletProgramType.java +++ b/src/main/java/com/seamlesspay/model/DigitalWalletProgramType.java @@ -1,4 +1,4 @@ -package com.stripe.model; +package com.seamlesspay.model; public enum DigitalWalletProgramType { diff --git a/src/main/java/com/stripe/model/EntryType.java b/src/main/java/com/seamlesspay/model/EntryType.java similarity index 89% rename from src/main/java/com/stripe/model/EntryType.java rename to src/main/java/com/seamlesspay/model/EntryType.java index 8334e20b..9812664b 100644 --- a/src/main/java/com/stripe/model/EntryType.java +++ b/src/main/java/com/seamlesspay/model/EntryType.java @@ -1,4 +1,4 @@ -package com.stripe.model; +package com.seamlesspay.model; import com.google.gson.annotations.SerializedName; diff --git a/src/main/java/com/stripe/model/Event.java b/src/main/java/com/seamlesspay/model/Event.java similarity index 94% rename from src/main/java/com/stripe/model/Event.java rename to src/main/java/com/seamlesspay/model/Event.java index 1a27e813..f89c11cd 100644 --- a/src/main/java/com/stripe/model/Event.java +++ b/src/main/java/com/seamlesspay/model/Event.java @@ -1,7 +1,7 @@ -package com.stripe.model; +package com.seamlesspay.model; import com.google.gson.annotations.SerializedName; -import com.stripe.net.ApiResource; +import com.seamlesspay.net.ApiResource; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; diff --git a/src/main/java/com/stripe/model/HasId.java b/src/main/java/com/seamlesspay/model/HasId.java similarity index 59% rename from src/main/java/com/stripe/model/HasId.java rename to src/main/java/com/seamlesspay/model/HasId.java index 7d854376..07e7e90b 100644 --- a/src/main/java/com/stripe/model/HasId.java +++ b/src/main/java/com/seamlesspay/model/HasId.java @@ -1,4 +1,4 @@ -package com.stripe.model; +package com.seamlesspay.model; public interface HasId { String getId(); diff --git a/src/main/java/com/stripe/model/Order.java b/src/main/java/com/seamlesspay/model/Order.java similarity index 98% rename from src/main/java/com/stripe/model/Order.java rename to src/main/java/com/seamlesspay/model/Order.java index 32f99ebf..abda3302 100644 --- a/src/main/java/com/stripe/model/Order.java +++ b/src/main/java/com/seamlesspay/model/Order.java @@ -1,4 +1,4 @@ -package com.stripe.model; +package com.seamlesspay.model; import com.google.gson.annotations.SerializedName; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/stripe/model/Pagination.java b/src/main/java/com/seamlesspay/model/Pagination.java similarity index 91% rename from src/main/java/com/stripe/model/Pagination.java rename to src/main/java/com/seamlesspay/model/Pagination.java index ed2c36a0..5a88e604 100644 --- a/src/main/java/com/stripe/model/Pagination.java +++ b/src/main/java/com/seamlesspay/model/Pagination.java @@ -1,4 +1,4 @@ -package com.stripe.model; +package com.seamlesspay.model; import lombok.ToString; diff --git a/src/main/java/com/stripe/model/PaymentNetwork.java b/src/main/java/com/seamlesspay/model/PaymentNetwork.java similarity index 89% rename from src/main/java/com/stripe/model/PaymentNetwork.java rename to src/main/java/com/seamlesspay/model/PaymentNetwork.java index a051b13f..0eb18b15 100644 --- a/src/main/java/com/stripe/model/PaymentNetwork.java +++ b/src/main/java/com/seamlesspay/model/PaymentNetwork.java @@ -1,4 +1,4 @@ -package com.stripe.model; +package com.seamlesspay.model; import com.google.gson.annotations.SerializedName; diff --git a/src/main/java/com/stripe/model/RawJsonObject.java b/src/main/java/com/seamlesspay/model/RawJsonObject.java similarity index 85% rename from src/main/java/com/stripe/model/RawJsonObject.java rename to src/main/java/com/seamlesspay/model/RawJsonObject.java index eb71ec37..caf0fa67 100644 --- a/src/main/java/com/stripe/model/RawJsonObject.java +++ b/src/main/java/com/seamlesspay/model/RawJsonObject.java @@ -1,4 +1,4 @@ -package com.stripe.model; +package com.seamlesspay.model; import com.google.gson.JsonObject; diff --git a/src/main/java/com/stripe/model/RawJsonObjectDeserializer.java b/src/main/java/com/seamlesspay/model/RawJsonObjectDeserializer.java similarity index 95% rename from src/main/java/com/stripe/model/RawJsonObjectDeserializer.java rename to src/main/java/com/seamlesspay/model/RawJsonObjectDeserializer.java index 647607f9..30596af4 100644 --- a/src/main/java/com/stripe/model/RawJsonObjectDeserializer.java +++ b/src/main/java/com/seamlesspay/model/RawJsonObjectDeserializer.java @@ -1,4 +1,4 @@ -package com.stripe.model; +package com.seamlesspay.model; import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonDeserializer; diff --git a/src/main/java/com/stripe/model/Refund.java b/src/main/java/com/seamlesspay/model/Refund.java similarity index 95% rename from src/main/java/com/stripe/model/Refund.java rename to src/main/java/com/seamlesspay/model/Refund.java index 799fd539..fd5f7157 100644 --- a/src/main/java/com/stripe/model/Refund.java +++ b/src/main/java/com/seamlesspay/model/Refund.java @@ -1,14 +1,14 @@ -package com.stripe.model; +package com.seamlesspay.model; import com.google.gson.annotations.SerializedName; import com.seamlesspay.SPAPI; -import com.stripe.exception.SPException; -import com.stripe.net.ApiRequestParams; -import com.stripe.net.ApiResource; -import com.stripe.net.RequestOptions; -import com.stripe.param.ChargeUpdateParams; -import com.stripe.param.ChargeVoidParams; -import com.stripe.param.RefundCreateParams; +import com.seamlesspay.exception.SPException; +import com.seamlesspay.net.ApiRequestParams; +import com.seamlesspay.net.ApiResource; +import com.seamlesspay.net.RequestOptions; +import com.seamlesspay.param.ChargeUpdateParams; +import com.seamlesspay.param.ChargeVoidParams; +import com.seamlesspay.param.RefundCreateParams; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/com/stripe/model/RefundCollection.java b/src/main/java/com/seamlesspay/model/RefundCollection.java similarity index 67% rename from src/main/java/com/stripe/model/RefundCollection.java rename to src/main/java/com/seamlesspay/model/RefundCollection.java index 6eb7a867..a7ca74df 100644 --- a/src/main/java/com/stripe/model/RefundCollection.java +++ b/src/main/java/com/seamlesspay/model/RefundCollection.java @@ -1,3 +1,3 @@ -package com.stripe.model; +package com.seamlesspay.model; public class RefundCollection extends SPCollection {} diff --git a/src/main/java/com/stripe/model/SPCollection.java b/src/main/java/com/seamlesspay/model/SPCollection.java similarity index 93% rename from src/main/java/com/stripe/model/SPCollection.java rename to src/main/java/com/seamlesspay/model/SPCollection.java index da4626cb..15e271ac 100644 --- a/src/main/java/com/stripe/model/SPCollection.java +++ b/src/main/java/com/seamlesspay/model/SPCollection.java @@ -1,4 +1,4 @@ -package com.stripe.model; +package com.seamlesspay.model; import lombok.EqualsAndHashCode; import lombok.Getter; diff --git a/src/main/java/com/stripe/model/SPCollectionInterface.java b/src/main/java/com/seamlesspay/model/SPCollectionInterface.java similarity index 84% rename from src/main/java/com/stripe/model/SPCollectionInterface.java rename to src/main/java/com/seamlesspay/model/SPCollectionInterface.java index 4668cfbe..3e5e28ad 100644 --- a/src/main/java/com/stripe/model/SPCollectionInterface.java +++ b/src/main/java/com/seamlesspay/model/SPCollectionInterface.java @@ -1,4 +1,4 @@ -package com.stripe.model; +package com.seamlesspay.model; import java.util.List; diff --git a/src/main/java/com/stripe/model/SPObject.java b/src/main/java/com/seamlesspay/model/SPObject.java similarity index 95% rename from src/main/java/com/stripe/model/SPObject.java rename to src/main/java/com/seamlesspay/model/SPObject.java index 7f065779..f170da2f 100644 --- a/src/main/java/com/stripe/model/SPObject.java +++ b/src/main/java/com/seamlesspay/model/SPObject.java @@ -1,11 +1,11 @@ -package com.stripe.model; +package com.seamlesspay.model; import com.google.gson.FieldNamingPolicy; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.JsonObject; -import com.stripe.net.ApiResource; -import com.stripe.net.SPResponse; +import com.seamlesspay.net.ApiResource; +import com.seamlesspay.net.SPResponse; import lombok.EqualsAndHashCode; import java.lang.reflect.Field; diff --git a/src/main/java/com/stripe/model/SPObjectInterface.java b/src/main/java/com/seamlesspay/model/SPObjectInterface.java similarity index 76% rename from src/main/java/com/stripe/model/SPObjectInterface.java rename to src/main/java/com/seamlesspay/model/SPObjectInterface.java index d8160b74..8ff3f8d6 100644 --- a/src/main/java/com/stripe/model/SPObjectInterface.java +++ b/src/main/java/com/seamlesspay/model/SPObjectInterface.java @@ -1,6 +1,6 @@ -package com.stripe.model; +package com.seamlesspay.model; -import com.stripe.net.SPResponse; +import com.seamlesspay.net.SPResponse; public interface SPObjectInterface { diff --git a/src/main/java/com/stripe/model/ShippingAddress.java b/src/main/java/com/seamlesspay/model/ShippingAddress.java similarity index 95% rename from src/main/java/com/stripe/model/ShippingAddress.java rename to src/main/java/com/seamlesspay/model/ShippingAddress.java index 8258ae24..1ad1ca28 100644 --- a/src/main/java/com/stripe/model/ShippingAddress.java +++ b/src/main/java/com/seamlesspay/model/ShippingAddress.java @@ -1,4 +1,4 @@ -package com.stripe.model; +package com.seamlesspay.model; import com.google.gson.annotations.SerializedName; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/stripe/model/TransactionMethod.java b/src/main/java/com/seamlesspay/model/TransactionMethod.java similarity index 84% rename from src/main/java/com/stripe/model/TransactionMethod.java rename to src/main/java/com/seamlesspay/model/TransactionMethod.java index 299bac7a..10332765 100644 --- a/src/main/java/com/stripe/model/TransactionMethod.java +++ b/src/main/java/com/seamlesspay/model/TransactionMethod.java @@ -1,4 +1,4 @@ -package com.stripe.model; +package com.seamlesspay.model; import com.google.gson.annotations.SerializedName; diff --git a/src/main/java/com/stripe/model/TransactionStatus.java b/src/main/java/com/seamlesspay/model/TransactionStatus.java similarity index 89% rename from src/main/java/com/stripe/model/TransactionStatus.java rename to src/main/java/com/seamlesspay/model/TransactionStatus.java index e16136ca..b8b1ede0 100644 --- a/src/main/java/com/stripe/model/TransactionStatus.java +++ b/src/main/java/com/seamlesspay/model/TransactionStatus.java @@ -1,4 +1,4 @@ -package com.stripe.model; +package com.seamlesspay.model; import com.google.gson.annotations.SerializedName; diff --git a/src/main/java/com/stripe/model/error/NotAuthenticatedError.java b/src/main/java/com/seamlesspay/model/error/NotAuthenticatedError.java similarity index 88% rename from src/main/java/com/stripe/model/error/NotAuthenticatedError.java rename to src/main/java/com/seamlesspay/model/error/NotAuthenticatedError.java index d15a8181..2a8d3444 100644 --- a/src/main/java/com/stripe/model/error/NotAuthenticatedError.java +++ b/src/main/java/com/seamlesspay/model/error/NotAuthenticatedError.java @@ -1,4 +1,4 @@ -package com.stripe.model.error; +package com.seamlesspay.model.error; import com.google.gson.annotations.SerializedName; import lombok.Data; diff --git a/src/main/java/com/stripe/model/error/NotFoundError.java b/src/main/java/com/seamlesspay/model/error/NotFoundError.java similarity index 79% rename from src/main/java/com/stripe/model/error/NotFoundError.java rename to src/main/java/com/seamlesspay/model/error/NotFoundError.java index bf79f9cc..caa3287b 100644 --- a/src/main/java/com/stripe/model/error/NotFoundError.java +++ b/src/main/java/com/seamlesspay/model/error/NotFoundError.java @@ -1,4 +1,4 @@ -package com.stripe.model.error; +package com.seamlesspay.model.error; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/com/stripe/model/error/SPError.java b/src/main/java/com/seamlesspay/model/error/SPError.java similarity index 84% rename from src/main/java/com/stripe/model/error/SPError.java rename to src/main/java/com/seamlesspay/model/error/SPError.java index 165be3d7..31457f16 100644 --- a/src/main/java/com/stripe/model/error/SPError.java +++ b/src/main/java/com/seamlesspay/model/error/SPError.java @@ -1,7 +1,7 @@ -package com.stripe.model.error; +package com.seamlesspay.model.error; import com.google.gson.annotations.SerializedName; -import com.stripe.model.SPObject; +import com.seamlesspay.model.SPObject; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/com/stripe/model/error/UnprocessableError.java b/src/main/java/com/seamlesspay/model/error/UnprocessableError.java similarity index 89% rename from src/main/java/com/stripe/model/error/UnprocessableError.java rename to src/main/java/com/seamlesspay/model/error/UnprocessableError.java index 5161dca5..5c59ede4 100644 --- a/src/main/java/com/stripe/model/error/UnprocessableError.java +++ b/src/main/java/com/seamlesspay/model/error/UnprocessableError.java @@ -1,7 +1,6 @@ -package com.stripe.model.error; +package com.seamlesspay.model.error; import com.google.gson.annotations.SerializedName; -import com.stripe.model.SPObject; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/com/stripe/net/AbstractSPResponse.java b/src/main/java/com/seamlesspay/net/AbstractSPResponse.java similarity index 79% rename from src/main/java/com/stripe/net/AbstractSPResponse.java rename to src/main/java/com/seamlesspay/net/AbstractSPResponse.java index 57f307b7..fcb19996 100644 --- a/src/main/java/com/stripe/net/AbstractSPResponse.java +++ b/src/main/java/com/seamlesspay/net/AbstractSPResponse.java @@ -1,4 +1,4 @@ -package com.stripe.net; +package com.seamlesspay.net; import static java.util.Objects.requireNonNull; @@ -12,7 +12,7 @@ import lombok.experimental.Accessors; import lombok.experimental.NonFinal; -/** Common interface representing an HTTP response from Stripe. */ +/** Common interface representing an HTTP response from SeamlessPay. */ @Accessors(fluent = true) abstract class AbstractSPResponse { /** The HTTP status code of the response. */ @@ -43,9 +43,9 @@ public final T body() { int numRetries; /** - * Gets the date of the request, as returned by Stripe. + * Gets the date of the request, as returned by SeamlessPay. * - * @return the date of the request, as returned by Stripe + * @return the date of the request, as returned by SeamlessPay */ public Instant date() { Optional dateStr = this.headers.firstValue("Date"); @@ -56,18 +56,18 @@ public Instant date() { } /** - * Gets the idempotency key of the request, as returned by Stripe. + * Gets the idempotency key of the request, as returned by SeamlessPay. * - * @return the idempotency key of the request, as returned by Stripe + * @return the idempotency key of the request, as returned by SeamlessPay */ public String idempotencyKey() { return this.headers.firstValue("Idempotency-Key").orElse(null); } /** - * Gets the ID of the request, as returned by Stripe. + * Gets the ID of the request, as returned by SeamlessPay. * - * @return the ID of the request, as returned by Stripe + * @return the ID of the request, as returned by SeamlessPay */ public String requestId() { return this.headers.firstValue("Request-Id").orElse(null); diff --git a/src/main/java/com/stripe/net/ApiRequestParams.java b/src/main/java/com/seamlesspay/net/ApiRequestParams.java similarity index 91% rename from src/main/java/com/stripe/net/ApiRequestParams.java rename to src/main/java/com/seamlesspay/net/ApiRequestParams.java index baa6a0d8..888f9d76 100644 --- a/src/main/java/com/stripe/net/ApiRequestParams.java +++ b/src/main/java/com/seamlesspay/net/ApiRequestParams.java @@ -1,4 +1,4 @@ -package com.stripe.net; +package com.seamlesspay.net; import java.util.Map; @@ -15,13 +15,13 @@ public abstract class ApiRequestParams { * {@code @SerializedName(ApiRequestParams.EXTRA_PARAMS_KEY)}. Logic to handle this is in {@link * ApiRequestParamsConverter}. */ - public static final String EXTRA_PARAMS_KEY = "_stripe_java_extra_param_key"; + public static final String EXTRA_PARAMS_KEY = "_sp_java_extra_param_key"; /** Converter mapping typed API request parameters into an untyped map. */ private static final ApiRequestParamsConverter PARAMS_CONVERTER = new ApiRequestParamsConverter(); /** - * Interface implemented by all enum parameter to get the actual string value that Stripe API + * Interface implemented by all enum parameter to get the actual string value that SeamlessPay API * expects. Internally, it used in custom serialization {@link ApiRequestParamsConverter} * converting empty string enum to null. */ diff --git a/src/main/java/com/stripe/net/ApiRequestParamsConverter.java b/src/main/java/com/seamlesspay/net/ApiRequestParamsConverter.java similarity index 97% rename from src/main/java/com/stripe/net/ApiRequestParamsConverter.java rename to src/main/java/com/seamlesspay/net/ApiRequestParamsConverter.java index e2a1ea07..8c493570 100644 --- a/src/main/java/com/stripe/net/ApiRequestParamsConverter.java +++ b/src/main/java/com/seamlesspay/net/ApiRequestParamsConverter.java @@ -1,4 +1,4 @@ -package com.stripe.net; +package com.seamlesspay.net; import com.google.gson.FieldNamingPolicy; import com.google.gson.Gson; @@ -11,7 +11,7 @@ import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import com.seamlesspay.SPAPI; -import com.stripe.param.common.EmptyParam; +import com.seamlesspay.param.common.EmptyParam; import java.io.IOException; import java.util.Map; @@ -45,8 +45,7 @@ public void deserializeAndTransform( throw new IllegalStateException( String.format( "Unexpected schema for extra params. JSON object is expected at key `%s`, but found" - + " `%s`. This is likely a problem with this current library version `%s`. " - + "Please contact support@stripe.com for assistance.", + + " `%s`. This is likely a problem with this current library version `%s`. ", ApiRequestParams.EXTRA_PARAMS_KEY, jsonValue, SPAPI.VERSION)); } // JSON value now corresponds to the extra params map, and is also deserialized as a map. diff --git a/src/main/java/com/stripe/net/ApiResource.java b/src/main/java/com/seamlesspay/net/ApiResource.java similarity index 96% rename from src/main/java/com/stripe/net/ApiResource.java rename to src/main/java/com/seamlesspay/net/ApiResource.java index 9271c45b..9b285132 100644 --- a/src/main/java/com/stripe/net/ApiResource.java +++ b/src/main/java/com/seamlesspay/net/ApiResource.java @@ -1,11 +1,11 @@ -package com.stripe.net; +package com.seamlesspay.net; import com.google.gson.*; import com.seamlesspay.SPAPI; -import com.stripe.exception.InvalidRequestException; -import com.stripe.exception.SPException; -import com.stripe.model.*; -import com.stripe.util.StringUtils; +import com.seamlesspay.exception.InvalidRequestException; +import com.seamlesspay.exception.SPException; +import com.seamlesspay.model.*; +import com.seamlesspay.util.StringUtils; import java.io.InputStream; import java.io.UnsupportedEncodingException; @@ -47,7 +47,7 @@ private static String className(Class clazz) { String[] parts = clazz.getPackage().getName().split("\\.", -1); assert parts.length == 3 || parts.length == 4; if (parts.length == 4) { - // The first three parts are always "com.stripe.model", the fourth part is the sub-package + // The first three parts are always "com.seamlesspay.model", the fourth part is the sub-package className = parts[3] + "/" + className; } diff --git a/src/main/java/com/stripe/net/FormEncoder.java b/src/main/java/com/seamlesspay/net/FormEncoder.java similarity index 99% rename from src/main/java/com/stripe/net/FormEncoder.java rename to src/main/java/com/seamlesspay/net/FormEncoder.java index 38dfc390..b760b563 100644 --- a/src/main/java/com/stripe/net/FormEncoder.java +++ b/src/main/java/com/seamlesspay/net/FormEncoder.java @@ -1,4 +1,4 @@ -package com.stripe.net; +package com.seamlesspay.net; import java.io.File; import java.io.IOException; @@ -80,8 +80,8 @@ public static String createQueryString( /** * Returns a list of flattened parameters for the given map of parameters. * - *

This is a "pre-encoding" step necessary to send requests to Stripe's API. Form encoding can - * be ambiguous when it comes to nested parameters (lists or maps). Stripe's API relies heavily on + *

This is a "pre-encoding" step necessary to send requests to SeamlessPay's API. Form encoding can + * be ambiguous when it comes to nested parameters (lists or maps). SeamlessPay's API relies heavily on * such parameters and expects them to be encoded in a certain way. This method takes a map of * parameters that can contain deeply nested parameters and return a flat list of key/value pairs. * diff --git a/src/main/java/com/stripe/net/HttpClient.java b/src/main/java/com/seamlesspay/net/HttpClient.java similarity index 86% rename from src/main/java/com/stripe/net/HttpClient.java rename to src/main/java/com/seamlesspay/net/HttpClient.java index f4247af8..214cb928 100644 --- a/src/main/java/com/stripe/net/HttpClient.java +++ b/src/main/java/com/seamlesspay/net/HttpClient.java @@ -1,9 +1,9 @@ -package com.stripe.net; +package com.seamlesspay.net; import com.seamlesspay.SPAPI; -import com.stripe.exception.ApiConnectionException; -import com.stripe.exception.SPException; -import com.stripe.util.Stopwatch; +import com.seamlesspay.exception.ApiConnectionException; +import com.seamlesspay.exception.SPException; +import com.seamlesspay.util.Stopwatch; import java.net.ConnectException; import java.net.SocketTimeoutException; import java.time.Duration; @@ -12,7 +12,7 @@ import java.util.Optional; import java.util.concurrent.ThreadLocalRandom; -/** Base abstract class for HTTP clients used to send requests to Stripe's API. */ +/** Base abstract class for HTTP clients used to send requests to SeamlessPay's API. */ public abstract class HttpClient { /** Maximum sleep time between tries to send HTTP requests after network failure. */ public static final Duration maxNetworkRetriesDelay = Duration.ofSeconds(5); @@ -29,7 +29,7 @@ public abstract class HttpClient { protected HttpClient() {} /** - * Sends the given request to Stripe's API, buffering the response body into memory. + * Sends the given request to SeamlessPay's API, buffering the response body into memory. * * @param request the request * @return the response @@ -38,7 +38,7 @@ protected HttpClient() {} public abstract SPResponse request(SPRequest request) throws SPException; /** - * Sends the given request to Stripe's API, streaming the response body. + * Sends the given request to SeamlessPay's API, streaming the response body. * * @param request the request * @return the response @@ -73,7 +73,7 @@ private > T sendWithTelemetry( } /** - * Sends the given request to Stripe's API, handling telemetry if not disabled. + * Sends the given request to SeamlessPay's API, handling telemetry if not disabled. * * @param request the request * @return the response @@ -84,7 +84,7 @@ public SPResponse requestWithTelemetry(SPRequest request) throws SPException { } /** - * Sends the given request to Stripe's API, streaming the response, and handling telemetry if not + * Sends the given request to SeamlessPay's API, streaming the response, and handling telemetry if not * disabled. * * @param request the request @@ -134,7 +134,7 @@ public > T sendWithRetries( } /** - * Sends the given request to Stripe's API, retrying the request in cases of intermittent + * Sends the given request to SeamlessPay's API, retrying the request in cases of intermittent * problems. * * @param request the request @@ -146,7 +146,7 @@ public SPResponse requestWithRetries(SPRequest request) throws SPException { } /** - * Sends the given request to Stripe's API, streaming the response, retrying the request in cases + * Sends the given request to SeamlessPay's API, streaming the response, retrying the request in cases * of intermittent problems. * * @param request the request @@ -164,7 +164,7 @@ public SPResponseStream requestStreamWithRetries(SPRequest request) * @return a string containing the value of the {@code User-Agent} header */ protected static String buildUserAgentString() { - String userAgent = String.format("Stripe/v1 JavaBindings/%s", SPAPI.VERSION); + String userAgent = String.format("SeamlessPay/v1 JavaBindings/%s", SPAPI.VERSION); if (SPAPI.getAppInfo() != null) { userAgent += " " + formatAppInfo(SPAPI.getAppInfo()); @@ -174,11 +174,11 @@ protected static String buildUserAgentString() { } /** - * Builds the value of the {@code X-Stripe-Client-User-Agent} header. + * Builds the value of the {@code X-Client-User-Agent} header. * - * @return a string containing the value of the {@code X-Stripe-Client-User-Agent} header + * @return a string containing the value of the {@code X-Client-User-Agent} header */ - protected static String buildXStripeClientUserAgentString() { + protected static String buildXClientUserAgentString() { String[] propertyNames = { "os.name", "os.version", @@ -195,7 +195,7 @@ protected static String buildXStripeClientUserAgentString() { } propertyMap.put("bindings.version", SPAPI.VERSION); propertyMap.put("lang", "Java"); - propertyMap.put("publisher", "Stripe"); + propertyMap.put("publisher", "SeamlessPay"); if (SPAPI.getAppInfo() != null) { propertyMap.put("application", ApiResource.GSON.toJson(SPAPI.getAppInfo())); } @@ -235,7 +235,7 @@ private > boolean shouldRetry( // The API may ask us not to retry (eg; if doing so would be a no-op) // or advise us to retry (eg; in cases of lock timeouts); we defer to that. if ((response != null) && (response.headers() != null)) { - String value = response.headers().firstValue("Stripe-Should-Retry").orElse(null); + String value = response.headers().firstValue("SeamlessPay-Should-Retry").orElse(null); if ("true".equals(value)) { return true; @@ -253,7 +253,7 @@ private > boolean shouldRetry( // Retry on 500, 503, and other internal errors. // - // Note that we expect the Stripe-Should-Retry header to be false + // Note that we expect the SeamlessPay-Should-Retry header to be false // in most cases when a 500 is returned, since our idempotency framework // would typically replay it anyway. if ((response != null) && (response.code() >= 500)) { diff --git a/src/main/java/com/stripe/net/HttpContent.java b/src/main/java/com/seamlesspay/net/HttpContent.java similarity index 99% rename from src/main/java/com/stripe/net/HttpContent.java rename to src/main/java/com/seamlesspay/net/HttpContent.java index afddd54e..9f9e9dcd 100644 --- a/src/main/java/com/stripe/net/HttpContent.java +++ b/src/main/java/com/seamlesspay/net/HttpContent.java @@ -1,4 +1,4 @@ -package com.stripe.net; +package com.seamlesspay.net; import static java.util.Objects.requireNonNull; diff --git a/src/main/java/com/stripe/net/HttpHeaders.java b/src/main/java/com/seamlesspay/net/HttpHeaders.java similarity index 98% rename from src/main/java/com/stripe/net/HttpHeaders.java rename to src/main/java/com/seamlesspay/net/HttpHeaders.java index 9cb18b04..43afb40a 100644 --- a/src/main/java/com/stripe/net/HttpHeaders.java +++ b/src/main/java/com/seamlesspay/net/HttpHeaders.java @@ -1,8 +1,8 @@ -package com.stripe.net; +package com.seamlesspay.net; import static java.util.Objects.requireNonNull; -import com.stripe.util.CaseInsensitiveMap; +import com.seamlesspay.util.CaseInsensitiveMap; import java.util.Arrays; import java.util.Collections; import java.util.HashMap; diff --git a/src/main/java/com/stripe/net/HttpURLConnectionClient.java b/src/main/java/com/seamlesspay/net/HttpURLConnectionClient.java similarity index 82% rename from src/main/java/com/stripe/net/HttpURLConnectionClient.java rename to src/main/java/com/seamlesspay/net/HttpURLConnectionClient.java index 8e6e78cb..f1af8941 100644 --- a/src/main/java/com/stripe/net/HttpURLConnectionClient.java +++ b/src/main/java/com/seamlesspay/net/HttpURLConnectionClient.java @@ -1,7 +1,7 @@ -package com.stripe.net; +package com.seamlesspay.net; import com.seamlesspay.SPAPI; -import com.stripe.exception.ApiConnectionException; +import com.seamlesspay.exception.ApiConnectionException; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -41,7 +41,7 @@ public HttpURLConnectionClient() { } /** - * Sends the given request to Stripe's API. + * Sends the given request to SeamlessPay's API. * * @param request the request * @return the response @@ -50,7 +50,7 @@ public HttpURLConnectionClient() { @Override public SPResponseStream requestStream(SPRequest request) throws ApiConnectionException { try { - final HttpURLConnection conn = createStripeConnection(request); + final HttpURLConnection conn = createConnection(request); // Calling `getResponseCode()` triggers the request. final int responseCode = conn.getResponseCode(); @@ -69,17 +69,15 @@ public SPResponseStream requestStream(SPRequest request) throws ApiConnectionExc } catch (IOException e) { throw new ApiConnectionException( String.format( - "IOException during API request to Stripe (%s): %s " - + "Please check your internet connection and try again. If this problem persists," - + "you should check Stripe's service status at https://twitter.com/stripestatus," - + " or let us know at support@stripe.com.", + "IOException during API request to SeamlessPay (%s): %s " + + "Please check your internet connection and try again", SPAPI.getApiBase(), e.getMessage()), e); } } /** - * Sends the given request to Stripe's API, and returns a buffered response. + * Sends the given request to SeamlessPay's API, and returns a buffered response. * * @param request the request * @return the response @@ -93,10 +91,8 @@ public SPResponse request(SPRequest request) throws ApiConnectionException { } catch (IOException e) { throw new ApiConnectionException( String.format( - "IOException during API request to Stripe (%s): %s " - + "Please check your internet connection and try again. If this problem persists," - + "you should check Stripe's service status at https://twitter.com/stripestatus," - + " or let us know at support@stripe.com.", + "IOException during API request to SeamlessPay (%s): %s " + + "Please check your internet connection and try again.", SPAPI.getApiBase(), e.getMessage()), e); } @@ -107,12 +103,12 @@ static HttpHeaders getHeaders(SPRequest request) { userAgentHeadersMap.put("User-Agent", Arrays.asList(buildUserAgentString())); userAgentHeadersMap.put( - "X-Stripe-Client-User-Agent", Arrays.asList(buildXStripeClientUserAgentString())); + "X-SeamlessPay-Client-User-Agent", Arrays.asList(buildXClientUserAgentString())); return request.headers().withAdditionalHeaders(userAgentHeadersMap); } - private static HttpURLConnection createStripeConnection(SPRequest request) + private static HttpURLConnection createConnection(SPRequest request) throws IOException, ApiConnectionException { HttpURLConnection conn = null; diff --git a/src/main/java/com/stripe/net/JsonEncoder.java b/src/main/java/com/seamlesspay/net/JsonEncoder.java similarity index 98% rename from src/main/java/com/stripe/net/JsonEncoder.java rename to src/main/java/com/seamlesspay/net/JsonEncoder.java index 0181f0e6..714dea1c 100644 --- a/src/main/java/com/stripe/net/JsonEncoder.java +++ b/src/main/java/com/seamlesspay/net/JsonEncoder.java @@ -1,4 +1,4 @@ -package com.stripe.net; +package com.seamlesspay.net; import java.io.File; import java.io.InputStream; @@ -62,8 +62,8 @@ public static String createQueryString( /** * Returns a list of flattened parameters for the given map of parameters. * - *

This is a "pre-encoding" step necessary to send requests to Stripe's API. Form encoding can - * be ambiguous when it comes to nested parameters (lists or maps). Stripe's API relies heavily on + *

This is a "pre-encoding" step necessary to send requests to SeamlessPay's API. Form encoding can + * be ambiguous when it comes to nested parameters (lists or maps). SeamlessPay's API relies heavily on * such parameters and expects them to be encoded in a certain way. This method takes a map of * parameters that can contain deeply nested parameters and return a flat list of key/value pairs. * diff --git a/src/main/java/com/stripe/net/KeyValuePair.java b/src/main/java/com/seamlesspay/net/KeyValuePair.java similarity index 95% rename from src/main/java/com/stripe/net/KeyValuePair.java rename to src/main/java/com/seamlesspay/net/KeyValuePair.java index 895fe7c6..5599adf5 100644 --- a/src/main/java/com/stripe/net/KeyValuePair.java +++ b/src/main/java/com/seamlesspay/net/KeyValuePair.java @@ -1,4 +1,4 @@ -package com.stripe.net; +package com.seamlesspay.net; import java.util.AbstractMap; diff --git a/src/main/java/com/stripe/net/LiveResponseGetter.java b/src/main/java/com/seamlesspay/net/LiveResponseGetter.java similarity index 91% rename from src/main/java/com/stripe/net/LiveResponseGetter.java rename to src/main/java/com/seamlesspay/net/LiveResponseGetter.java index a9851099..5af0d3f6 100644 --- a/src/main/java/com/stripe/net/LiveResponseGetter.java +++ b/src/main/java/com/seamlesspay/net/LiveResponseGetter.java @@ -1,13 +1,13 @@ -package com.stripe.net; +package com.seamlesspay.net; import com.google.gson.JsonSyntaxException; import com.seamlesspay.SPAPI; -import com.stripe.exception.*; -import com.stripe.model.error.NotAuthenticatedError; -import com.stripe.model.error.NotFoundError; -import com.stripe.model.error.SPError; -import com.stripe.model.error.UnprocessableError; -import com.stripe.model.SPObjectInterface; +import com.seamlesspay.exception.*; +import com.seamlesspay.model.error.NotAuthenticatedError; +import com.seamlesspay.model.error.NotFoundError; +import com.seamlesspay.model.error.SPError; +import com.seamlesspay.model.error.UnprocessableError; +import com.seamlesspay.model.SPObjectInterface; import lombok.extern.slf4j.Slf4j; import java.io.IOException; @@ -88,10 +88,8 @@ public InputStream requestStream( } catch (IOException e) { throw new ApiConnectionException( String.format( - "IOException during API request to Stripe (%s): %s " - + "Please check your internet connection and try again. If this problem persists," - + "you should check Stripe's service status at https://twitter.com/stripestatus," - + " or let us know at support@stripe.com.", + "IOException during API request to SeamlessPay (%s): %s " + + "Please check your internet connection and try again", SPAPI.getApiBase(), e.getMessage()), e); } diff --git a/src/main/java/com/stripe/net/MultipartProcessor.java b/src/main/java/com/seamlesspay/net/MultipartProcessor.java similarity index 99% rename from src/main/java/com/stripe/net/MultipartProcessor.java rename to src/main/java/com/seamlesspay/net/MultipartProcessor.java index c870c50b..a284c4e4 100644 --- a/src/main/java/com/stripe/net/MultipartProcessor.java +++ b/src/main/java/com/seamlesspay/net/MultipartProcessor.java @@ -1,4 +1,4 @@ -package com.stripe.net; +package com.seamlesspay.net; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/com/stripe/net/RequestOptions.java b/src/main/java/com/seamlesspay/net/RequestOptions.java similarity index 88% rename from src/main/java/com/stripe/net/RequestOptions.java rename to src/main/java/com/seamlesspay/net/RequestOptions.java index eefd96c1..11ae2667 100644 --- a/src/main/java/com/stripe/net/RequestOptions.java +++ b/src/main/java/com/seamlesspay/net/RequestOptions.java @@ -1,4 +1,4 @@ -package com.stripe.net; +package com.seamlesspay.net; import com.seamlesspay.SPAPI; import lombok.EqualsAndHashCode; @@ -188,7 +188,7 @@ public int getConnectTimeout() { } /** - * Sets the timeout value that will be used for making new connections to the Stripe API (in + * Sets the timeout value that will be used for making new connections to the SeamlessPay API (in * milliseconds). * * @param timeout timeout value in milliseconds @@ -204,7 +204,7 @@ public int getReadTimeout() { /** * Sets the timeout value that will be used when reading data from an established connection to - * the Stripe API (in milliseconds). + * the SeamlessPay API (in milliseconds). * *

Note that this value should be set conservatively because some API requests can take time * and a short timeout increases the likelihood of causing a problem in the backend. @@ -266,7 +266,7 @@ public RequestOptionsBuilder setSeamlessPayAccount(String seamlessPayAccount) { return this; } - public RequestOptionsBuilder clearStripeAccount() { + public RequestOptionsBuilder clearAccount() { return setSeamlessPayAccount(null); } @@ -276,21 +276,21 @@ public String getSeamlessPayVersionOverride() { /** * Do not use this except for in API where JSON response is not fully deserialized into explicit - * Stripe classes, but only passed to other clients as raw data -- essentially making request on + * SeamlessPay classes, but only passed to other clients as raw data -- essentially making request on * behalf of others with their API version. Setting this value in a typical * scenario will result in deserialization error as the model classes have schema according to - * the pinned {@link Stripe#API_VERSION} and not the {@code stripeVersionOverride} + * the pinned {@link SPAPI#API_VERSION} * - * @param seamlessPayVersionOverride stripe version override which belongs to the client to make + * @param seamlessPayVersionOverride SeamlessPay version override which belongs to the client to make * request on behalf of. * @return option builder */ public RequestOptionsBuilder setSeamlessPayVersionOverride(String seamlessPayVersionOverride) { - this.seamlessPayVersionOverride = normalizeStripeVersion(seamlessPayVersionOverride); + this.seamlessPayVersionOverride = normalizeVersion(seamlessPayVersionOverride); return this; } - public RequestOptionsBuilder clearStripeVersionOverride() { + public RequestOptionsBuilder clearVersionOverride() { return setSeamlessPayVersionOverride(null); } @@ -300,8 +300,8 @@ public RequestOptions build() { normalizeApiKey(this.apiKey), normalizeClientId(this.clientId), normalizeIdempotencyKey(this.idempotencyKey), - normalizeStripeAccount(this.seamlessPayAccount), - normalizeStripeVersion(this.seamlessPayVersionOverride), + normalizeAccount(this.seamlessPayAccount), + normalizeVersion(this.seamlessPayVersionOverride), connectTimeout, readTimeout, maxNetworkRetries, @@ -334,14 +334,14 @@ private static String normalizeClientId(String clientId) { return normalized; } - private static String normalizeStripeVersion(String stripeVersion) { - // null stripeVersions are considered "valid" and use Stripe.apiVersion - if (stripeVersion == null) { + private static String normalizeVersion(String version) { + // null versions are considered "valid" and use SPAPI.apiVersion + if (version == null) { return null; } - String normalized = stripeVersion.trim(); + String normalized = version.trim(); if (normalized.isEmpty()) { - throw new InvalidRequestOptionsException("Empty Stripe version specified!"); + throw new InvalidRequestOptionsException("Empty SeamlessPay version specified!"); } return normalized; } @@ -363,13 +363,13 @@ private static String normalizeIdempotencyKey(String idempotencyKey) { return normalized; } - private static String normalizeStripeAccount(String stripeAccount) { - if (stripeAccount == null) { + private static String normalizeAccount(String seamlessPayAccount) { + if (seamlessPayAccount == null) { return null; } - String normalized = stripeAccount.trim(); + String normalized = seamlessPayAccount.trim(); if (normalized.isEmpty()) { - throw new InvalidRequestOptionsException("Empty stripe account specified!"); + throw new InvalidRequestOptionsException("Empty SeamlessPay account specified!"); } return normalized; } diff --git a/src/main/java/com/stripe/net/RequestTelemetry.java b/src/main/java/com/seamlesspay/net/RequestTelemetry.java similarity index 92% rename from src/main/java/com/stripe/net/RequestTelemetry.java rename to src/main/java/com/seamlesspay/net/RequestTelemetry.java index b477036d..2578ed9d 100644 --- a/src/main/java/com/stripe/net/RequestTelemetry.java +++ b/src/main/java/com/seamlesspay/net/RequestTelemetry.java @@ -1,4 +1,4 @@ -package com.stripe.net; +package com.seamlesspay.net; import com.google.gson.Gson; import com.google.gson.annotations.SerializedName; @@ -11,7 +11,7 @@ /** Helper class used by {@link LiveResponseGetter} to manage request telemetry. */ class RequestTelemetry { /** The name of the header used to send request telemetry in requests. */ - public static final String HEADER_NAME = "X-Stripe-Client-Telemetry"; + public static final String HEADER_NAME = "X-SeamlessPay-Client-Telemetry"; private static final int MAX_REQUEST_METRICS_QUEUE_SIZE = 100; @@ -21,7 +21,7 @@ class RequestTelemetry { new ConcurrentLinkedQueue(); /** - * Returns an {@link Optional} containing the value of the {@code X-Stripe-Telemetry} header to + * Returns an {@link Optional} containing the value of the {@code X-SeamlessPay-Telemetry} header to * add to the request. If the header is already present in the request, or if there is available * metrics, or if telemetry is disabled, then the returned {@code Optional} is empty. * @@ -49,7 +49,7 @@ public Optional getHeaderValue(HttpHeaders headers) { * If telemetry is enabled and the queue is not full, then enqueue a new metrics item; otherwise, * do nothing. * - * @param response the Stripe response + * @param response the SeamlessPay response * @param duration the request duration */ public void maybeEnqueueMetrics(AbstractSPResponse response, Duration duration) { diff --git a/src/main/java/com/stripe/net/ResponseGetter.java b/src/main/java/com/seamlesspay/net/ResponseGetter.java similarity index 73% rename from src/main/java/com/stripe/net/ResponseGetter.java rename to src/main/java/com/seamlesspay/net/ResponseGetter.java index 01a31053..67588282 100644 --- a/src/main/java/com/stripe/net/ResponseGetter.java +++ b/src/main/java/com/seamlesspay/net/ResponseGetter.java @@ -1,7 +1,7 @@ -package com.stripe.net; +package com.seamlesspay.net; -import com.stripe.exception.SPException; -import com.stripe.model.SPObjectInterface; +import com.seamlesspay.exception.SPException; +import com.seamlesspay.model.SPObjectInterface; import java.io.InputStream; import java.util.Map; @@ -22,6 +22,6 @@ default InputStream requestStream( RequestOptions options) throws SPException { throw new UnsupportedOperationException( - "requestStream is unimplemented for this StripeResponseGetter"); + "requestStream is unimplemented for this ResponseGetter"); } } diff --git a/src/main/java/com/stripe/net/SPRequest.java b/src/main/java/com/seamlesspay/net/SPRequest.java similarity index 89% rename from src/main/java/com/stripe/net/SPRequest.java rename to src/main/java/com/seamlesspay/net/SPRequest.java index 27ebd67e..cd61d550 100644 --- a/src/main/java/com/stripe/net/SPRequest.java +++ b/src/main/java/com/seamlesspay/net/SPRequest.java @@ -1,10 +1,10 @@ -package com.stripe.net; +package com.seamlesspay.net; import com.seamlesspay.SPAPI; -import com.stripe.exception.ApiConnectionException; -import com.stripe.exception.AuthenticationException; -import com.stripe.exception.SPException; -import com.stripe.util.StringUtils; +import com.seamlesspay.exception.ApiConnectionException; +import com.seamlesspay.exception.AuthenticationException; +import com.seamlesspay.exception.SPException; +import com.seamlesspay.util.StringUtils; import java.io.IOException; import java.net.URL; import java.util.Arrays; @@ -18,9 +18,9 @@ import lombok.Value; import lombok.experimental.Accessors; -import static com.stripe.net.ApiResource.RequestMethod.POST; +import static com.seamlesspay.net.ApiResource.RequestMethod.POST; -/** A request to Stripe's API. */ +/** A request to SeamlessPay's API. */ @Value @AllArgsConstructor(access = AccessLevel.PROTECTED) @Accessors(fluent = true) @@ -42,8 +42,8 @@ public class SPRequest { HttpContent content; /** - * The HTTP headers of the request ({@code Authorization}, {@code Stripe-Version}, {@code - * Stripe-Account}, {@code Idempotency-Key}...). + * The HTTP headers of the request ({@code Authorization}, {@code API-Version}, {@code + * SeamlessPay-Account}, {@code Idempotency-Key}...). */ HttpHeaders headers; @@ -78,10 +78,8 @@ public SPRequest( } catch (IOException e) { throw new ApiConnectionException( String.format( - "IOException during API request to Stripe (%s): %s " - + "Please check your internet connection and try again. If this problem persists," - + "you should check Stripe's service status at https://twitter.com/stripestatus," - + " or let us know at support@stripe.com.", + "IOException during API request to SeamlessPay (%s): %s " + + "Please check your internet connection and try again", SPAPI.getApiBase(), e.getMessage()), e); } @@ -168,7 +166,7 @@ private static HttpHeaders buildHeaders(ApiResource.RequestMethod method, Reques } headerMap.put("Authorization", Arrays.asList(String.format("Bearer %s", apiKey))); - // Stripe-Version + // SeamlessPay-Version if (options.getSeamlessPayVersionOverride() != null) { headerMap.put("API-Version", Arrays.asList(options.getSeamlessPayVersionOverride())); } else if (options.getSeamlessPayVersion() != null) { @@ -178,7 +176,7 @@ private static HttpHeaders buildHeaders(ApiResource.RequestMethod method, Reques "Either `SeamlessPayVersion` or `SeamlessPayVersionOverride` value must be set."); } - // Stripe-Account + // SeamlessPay-Account if (options.getSeamlessPayAccount() != null) { headerMap.put("SeamlessPay-Account", Arrays.asList(options.getSeamlessPayAccount())); } diff --git a/src/main/java/com/stripe/net/SPResponse.java b/src/main/java/com/seamlesspay/net/SPResponse.java similarity index 82% rename from src/main/java/com/stripe/net/SPResponse.java rename to src/main/java/com/seamlesspay/net/SPResponse.java index 570b9b2c..012920f4 100644 --- a/src/main/java/com/stripe/net/SPResponse.java +++ b/src/main/java/com/seamlesspay/net/SPResponse.java @@ -1,8 +1,8 @@ -package com.stripe.net; +package com.seamlesspay.net; import lombok.ToString; -/** A response from Stripe's API, with body represented as a String. */ +/** A response from SeamlessPay's API, with body represented as a String. */ @ToString public class SPResponse extends AbstractSPResponse { /** diff --git a/src/main/java/com/stripe/net/SPResponseStream.java b/src/main/java/com/seamlesspay/net/SPResponseStream.java similarity index 88% rename from src/main/java/com/stripe/net/SPResponseStream.java rename to src/main/java/com/seamlesspay/net/SPResponseStream.java index bf4cb903..cde39200 100644 --- a/src/main/java/com/stripe/net/SPResponseStream.java +++ b/src/main/java/com/seamlesspay/net/SPResponseStream.java @@ -1,6 +1,6 @@ -package com.stripe.net; +package com.seamlesspay.net; -import com.stripe.util.StreamUtils; +import com.seamlesspay.util.StreamUtils; import lombok.extern.slf4j.Slf4j; import java.io.IOException; @@ -21,9 +21,9 @@ public SPResponseStream(int code, HttpHeaders headers, InputStream body) { } /** - * Buffers the entire response body into a string, constructing the appropriate StripeResponse + * Buffers the entire response body into a string, constructing the appropriate SPResponse * - * @return the StripeResponse + * @return the SPResponse */ SPResponse unstream() throws IOException { final String bodyString = StreamUtils.readToEnd(this.body, ApiResource.CHARSET); diff --git a/src/main/java/com/stripe/net/UntypedMapDeserializer.java b/src/main/java/com/seamlesspay/net/UntypedMapDeserializer.java similarity index 97% rename from src/main/java/com/stripe/net/UntypedMapDeserializer.java rename to src/main/java/com/seamlesspay/net/UntypedMapDeserializer.java index bc16160b..4c448626 100644 --- a/src/main/java/com/stripe/net/UntypedMapDeserializer.java +++ b/src/main/java/com/seamlesspay/net/UntypedMapDeserializer.java @@ -1,4 +1,4 @@ -package com.stripe.net; +package com.seamlesspay.net; import com.google.gson.JsonArray; import com.google.gson.JsonElement; @@ -114,8 +114,7 @@ Object deserializeJsonElement(JsonElement element) { "Unknown JSON element type for element " + element + ". " - + "If you're seeing this message, it's probably a bug in the Stripe Java " - + "library. Please contact us by email at support@stripe.com."); + + "If you're seeing this message, it's probably a bug in the SeamlessPay Java library"); return null; } } diff --git a/src/main/java/com/stripe/net/Webhook.java b/src/main/java/com/seamlesspay/net/Webhook.java similarity index 73% rename from src/main/java/com/stripe/net/Webhook.java rename to src/main/java/com/seamlesspay/net/Webhook.java index c28e5915..855f017f 100644 --- a/src/main/java/com/stripe/net/Webhook.java +++ b/src/main/java/com/seamlesspay/net/Webhook.java @@ -1,6 +1,6 @@ -package com.stripe.net; +package com.seamlesspay.net; -import com.stripe.model.Event; +import com.seamlesspay.model.Event; public final class Webhook { @@ -8,7 +8,7 @@ public final class Webhook { * Returns an Event instance using the provided JSON payload. Throws a JsonSyntaxException if the * payload is not valid JSON. * - * @param payload the payload sent by Stripe. + * @param payload the payload sent by SeamlessPay. * @return the Event instance */ public static Event constructEvent(String payload) { diff --git a/src/main/java/com/stripe/param/ChargeCreateParams.java b/src/main/java/com/seamlesspay/param/ChargeCreateParams.java similarity index 89% rename from src/main/java/com/stripe/param/ChargeCreateParams.java rename to src/main/java/com/seamlesspay/param/ChargeCreateParams.java index f3b8ab1e..d163b8a8 100644 --- a/src/main/java/com/stripe/param/ChargeCreateParams.java +++ b/src/main/java/com/seamlesspay/param/ChargeCreateParams.java @@ -1,12 +1,12 @@ // File generated from our OpenAPI spec -package com.stripe.param; +package com.seamlesspay.param; import com.google.gson.annotations.SerializedName; -import com.stripe.model.DigitalWalletProgramType; -import com.stripe.model.Currency; -import com.stripe.model.EntryType; -import com.stripe.model.Order; -import com.stripe.net.ApiRequestParams; +import com.seamlesspay.model.DigitalWalletProgramType; +import com.seamlesspay.model.Currency; +import com.seamlesspay.model.EntryType; +import com.seamlesspay.model.Order; +import com.seamlesspay.net.ApiRequestParams; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/stripe/param/ChargeUpdateParams.java b/src/main/java/com/seamlesspay/param/ChargeUpdateParams.java similarity index 87% rename from src/main/java/com/stripe/param/ChargeUpdateParams.java rename to src/main/java/com/seamlesspay/param/ChargeUpdateParams.java index 937de8ba..0acaec0d 100644 --- a/src/main/java/com/stripe/param/ChargeUpdateParams.java +++ b/src/main/java/com/seamlesspay/param/ChargeUpdateParams.java @@ -1,10 +1,10 @@ // File generated from our OpenAPI spec -package com.stripe.param; +package com.seamlesspay.param; import com.google.gson.annotations.SerializedName; -import com.stripe.model.Order; -import com.stripe.model.TransactionMethod; -import com.stripe.net.ApiRequestParams; +import com.seamlesspay.model.Order; +import com.seamlesspay.model.TransactionMethod; +import com.seamlesspay.net.ApiRequestParams; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/stripe/param/ChargeVoidParams.java b/src/main/java/com/seamlesspay/param/ChargeVoidParams.java similarity index 87% rename from src/main/java/com/stripe/param/ChargeVoidParams.java rename to src/main/java/com/seamlesspay/param/ChargeVoidParams.java index 984cf8ae..6df0e3e8 100644 --- a/src/main/java/com/stripe/param/ChargeVoidParams.java +++ b/src/main/java/com/seamlesspay/param/ChargeVoidParams.java @@ -1,7 +1,7 @@ -package com.stripe.param; +package com.seamlesspay.param; import com.google.gson.annotations.SerializedName; -import com.stripe.net.ApiRequestParams; +import com.seamlesspay.net.ApiRequestParams; import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/com/stripe/param/RefundCreateParams.java b/src/main/java/com/seamlesspay/param/RefundCreateParams.java similarity index 90% rename from src/main/java/com/stripe/param/RefundCreateParams.java rename to src/main/java/com/seamlesspay/param/RefundCreateParams.java index c59f6f28..1780aa66 100644 --- a/src/main/java/com/stripe/param/RefundCreateParams.java +++ b/src/main/java/com/seamlesspay/param/RefundCreateParams.java @@ -1,9 +1,9 @@ // File generated from our OpenAPI spec -package com.stripe.param; +package com.seamlesspay.param; import com.google.gson.annotations.SerializedName; -import com.stripe.model.Currency; -import com.stripe.net.ApiRequestParams; +import com.seamlesspay.model.Currency; +import com.seamlesspay.net.ApiRequestParams; import lombok.*; @Data diff --git a/src/main/java/com/stripe/param/common/EmptyParam.java b/src/main/java/com/seamlesspay/param/common/EmptyParam.java similarity index 78% rename from src/main/java/com/stripe/param/common/EmptyParam.java rename to src/main/java/com/seamlesspay/param/common/EmptyParam.java index 25c7e31d..c721e340 100644 --- a/src/main/java/com/stripe/param/common/EmptyParam.java +++ b/src/main/java/com/seamlesspay/param/common/EmptyParam.java @@ -1,7 +1,7 @@ -package com.stripe.param.common; +package com.seamlesspay.param.common; import com.google.gson.annotations.SerializedName; -import com.stripe.net.ApiRequestParams; +import com.seamlesspay.net.ApiRequestParams; public enum EmptyParam implements ApiRequestParams.EnumParam { @SerializedName("") diff --git a/src/main/java/com/stripe/util/CaseInsensitiveMap.java b/src/main/java/com/seamlesspay/util/CaseInsensitiveMap.java similarity index 99% rename from src/main/java/com/stripe/util/CaseInsensitiveMap.java rename to src/main/java/com/seamlesspay/util/CaseInsensitiveMap.java index a7048e3c..ed50086c 100644 --- a/src/main/java/com/stripe/util/CaseInsensitiveMap.java +++ b/src/main/java/com/seamlesspay/util/CaseInsensitiveMap.java @@ -1,4 +1,4 @@ -package com.stripe.util; +package com.seamlesspay.util; import java.io.Serializable; import java.util.AbstractMap; diff --git a/src/main/java/com/stripe/util/Stopwatch.java b/src/main/java/com/seamlesspay/util/Stopwatch.java similarity index 98% rename from src/main/java/com/stripe/util/Stopwatch.java rename to src/main/java/com/seamlesspay/util/Stopwatch.java index 4a905bbb..7809e1b6 100644 --- a/src/main/java/com/stripe/util/Stopwatch.java +++ b/src/main/java/com/seamlesspay/util/Stopwatch.java @@ -1,4 +1,4 @@ -package com.stripe.util; +package com.seamlesspay.util; import java.time.Duration; diff --git a/src/main/java/com/stripe/util/StreamUtils.java b/src/main/java/com/seamlesspay/util/StreamUtils.java similarity index 97% rename from src/main/java/com/stripe/util/StreamUtils.java rename to src/main/java/com/seamlesspay/util/StreamUtils.java index 8f075397..22616268 100644 --- a/src/main/java/com/stripe/util/StreamUtils.java +++ b/src/main/java/com/seamlesspay/util/StreamUtils.java @@ -1,4 +1,4 @@ -package com.stripe.util; +package com.seamlesspay.util; import static java.util.Objects.requireNonNull; diff --git a/src/main/java/com/stripe/util/StringUtils.java b/src/main/java/com/seamlesspay/util/StringUtils.java similarity index 98% rename from src/main/java/com/stripe/util/StringUtils.java rename to src/main/java/com/seamlesspay/util/StringUtils.java index 95d758f8..1324f6c8 100644 --- a/src/main/java/com/stripe/util/StringUtils.java +++ b/src/main/java/com/seamlesspay/util/StringUtils.java @@ -1,4 +1,4 @@ -package com.stripe.util; +package com.seamlesspay.util; import static java.util.Objects.requireNonNull; diff --git a/src/main/java/com/stripe/net/ReflectionCheckingTypeAdapterFactory.java b/src/main/java/com/stripe/net/ReflectionCheckingTypeAdapterFactory.java deleted file mode 100644 index 40acde38..00000000 --- a/src/main/java/com/stripe/net/ReflectionCheckingTypeAdapterFactory.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.stripe.net; - -import com.google.gson.Gson; -import com.google.gson.TypeAdapter; -import com.google.gson.TypeAdapterFactory; -import com.google.gson.internal.bind.ReflectiveTypeAdapterFactory; -import com.google.gson.reflect.TypeToken; - -/** - * {@link TypeAdapterFactory} that checks that we don't use {@link ReflectiveTypeAdapterFactory} - * accidentally for classes outside {@code com.stripe} packages. This usually happens when we forget - * to mark a field {@code transient}. - */ -class ReflectionCheckingTypeAdapterFactory implements TypeAdapterFactory { - @Override - public TypeAdapter create(Gson gson, TypeToken type) { - if (!type.getType().getTypeName().startsWith("com.stripe.")) { - TypeAdapter adapter = gson.getDelegateAdapter(this, type); - if (adapter instanceof ReflectiveTypeAdapterFactory.Adapter) { - throw new IllegalArgumentException( - "Refusing to create type reflection-based type adapter for external class: " + type); - } - } - return null; - } -} diff --git a/src/test/java/com/stripe/functional/seamlesspay/WebhookTest.java b/src/test/java/com/seamlesspay/functional/WebhookTest.java similarity index 88% rename from src/test/java/com/stripe/functional/seamlesspay/WebhookTest.java rename to src/test/java/com/seamlesspay/functional/WebhookTest.java index 7db80b8d..f54b475c 100644 --- a/src/test/java/com/stripe/functional/seamlesspay/WebhookTest.java +++ b/src/test/java/com/seamlesspay/functional/WebhookTest.java @@ -1,7 +1,7 @@ -package com.stripe.functional.seamlesspay; +package com.seamlesspay.functional; -import com.stripe.model.Event; -import com.stripe.net.Webhook; +import com.seamlesspay.model.Event; +import com.seamlesspay.net.Webhook; import org.junit.jupiter.api.Test; import org.junit.runner.RunWith; import org.mockito.InjectMocks; diff --git a/src/test/java/com/stripe/functional/seamlesspay/batch/BatchCloseTest.java b/src/test/java/com/seamlesspay/functional/batch/BatchCloseTest.java similarity index 83% rename from src/test/java/com/stripe/functional/seamlesspay/batch/BatchCloseTest.java rename to src/test/java/com/seamlesspay/functional/batch/BatchCloseTest.java index c3708c6f..f473be72 100644 --- a/src/test/java/com/stripe/functional/seamlesspay/batch/BatchCloseTest.java +++ b/src/test/java/com/seamlesspay/functional/batch/BatchCloseTest.java @@ -1,14 +1,14 @@ -package com.stripe.functional.seamlesspay.batch; +package com.seamlesspay.functional.batch; import com.seamlesspay.SPAPI; -import com.stripe.exception.ApiException; -import com.stripe.exception.AuthenticationException; -import com.stripe.exception.SPException; -import com.stripe.model.Batch; -import com.stripe.model.BatchCloseResult; -import com.stripe.model.Charge; -import com.stripe.net.RequestOptions; -import com.stripe.param.ChargeCreateParams; +import com.seamlesspay.exception.ApiException; +import com.seamlesspay.exception.AuthenticationException; +import com.seamlesspay.exception.SPException; +import com.seamlesspay.model.Batch; +import com.seamlesspay.model.BatchCloseResult; +import com.seamlesspay.model.Charge; +import com.seamlesspay.net.RequestOptions; +import com.seamlesspay.param.ChargeCreateParams; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -16,7 +16,7 @@ import org.mockito.InjectMocks; import org.mockito.junit.MockitoJUnitRunner; -import static com.stripe.model.Currency.USD; +import static com.seamlesspay.model.Currency.USD; import static org.junit.jupiter.api.Assertions.*; @Slf4j diff --git a/src/test/java/com/stripe/functional/seamlesspay/charge/ChargeCaptureTest.java b/src/test/java/com/seamlesspay/functional/charge/ChargeCaptureTest.java similarity index 83% rename from src/test/java/com/stripe/functional/seamlesspay/charge/ChargeCaptureTest.java rename to src/test/java/com/seamlesspay/functional/charge/ChargeCaptureTest.java index a680ee7c..90d39927 100644 --- a/src/test/java/com/stripe/functional/seamlesspay/charge/ChargeCaptureTest.java +++ b/src/test/java/com/seamlesspay/functional/charge/ChargeCaptureTest.java @@ -1,10 +1,10 @@ -package com.stripe.functional.seamlesspay.charge; +package com.seamlesspay.functional.charge; import com.seamlesspay.SPAPI; -import com.stripe.exception.SPException; -import com.stripe.model.Charge; -import com.stripe.net.RequestOptions; -import com.stripe.param.ChargeCreateParams; +import com.seamlesspay.exception.SPException; +import com.seamlesspay.model.Charge; +import com.seamlesspay.net.RequestOptions; +import com.seamlesspay.param.ChargeCreateParams; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/stripe/functional/seamlesspay/charge/ChargeCreateTest.java b/src/test/java/com/seamlesspay/functional/charge/ChargeCreateTest.java similarity index 87% rename from src/test/java/com/stripe/functional/seamlesspay/charge/ChargeCreateTest.java rename to src/test/java/com/seamlesspay/functional/charge/ChargeCreateTest.java index 5e68272b..3eb7228f 100644 --- a/src/test/java/com/stripe/functional/seamlesspay/charge/ChargeCreateTest.java +++ b/src/test/java/com/seamlesspay/functional/charge/ChargeCreateTest.java @@ -1,14 +1,14 @@ -package com.stripe.functional.seamlesspay.charge; +package com.seamlesspay.functional.charge; import com.seamlesspay.SPAPI; -import com.stripe.exception.ApiException; -import com.stripe.exception.AuthenticationException; -import com.stripe.exception.SPException; -import com.stripe.model.Charge; -import com.stripe.model.Order; -import com.stripe.model.ShippingAddress; -import com.stripe.net.RequestOptions; -import com.stripe.param.ChargeCreateParams; +import com.seamlesspay.exception.ApiException; +import com.seamlesspay.exception.AuthenticationException; +import com.seamlesspay.exception.SPException; +import com.seamlesspay.model.Charge; +import com.seamlesspay.model.Order; +import com.seamlesspay.model.ShippingAddress; +import com.seamlesspay.net.RequestOptions; +import com.seamlesspay.param.ChargeCreateParams; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.runner.RunWith; @@ -18,7 +18,7 @@ import java.util.Arrays; import java.util.List; -import static com.stripe.model.Currency.USD; +import static com.seamlesspay.model.Currency.USD; import static org.junit.jupiter.api.Assertions.*; @RunWith(MockitoJUnitRunner.class) diff --git a/src/test/java/com/stripe/functional/seamlesspay/charge/ChargeListTest.java b/src/test/java/com/seamlesspay/functional/charge/ChargeListTest.java similarity index 83% rename from src/test/java/com/stripe/functional/seamlesspay/charge/ChargeListTest.java rename to src/test/java/com/seamlesspay/functional/charge/ChargeListTest.java index 6979da3e..a0ae5a93 100644 --- a/src/test/java/com/stripe/functional/seamlesspay/charge/ChargeListTest.java +++ b/src/test/java/com/seamlesspay/functional/charge/ChargeListTest.java @@ -1,12 +1,12 @@ -package com.stripe.functional.seamlesspay.charge; +package com.seamlesspay.functional.charge; import com.seamlesspay.SPAPI; -import com.stripe.exception.AuthenticationException; -import com.stripe.exception.SPException; -import com.stripe.model.Charge; -import com.stripe.model.ChargeCollection; -import com.stripe.net.RequestOptions; -import com.stripe.param.ChargeCreateParams; +import com.seamlesspay.exception.AuthenticationException; +import com.seamlesspay.exception.SPException; +import com.seamlesspay.model.Charge; +import com.seamlesspay.model.ChargeCollection; +import com.seamlesspay.net.RequestOptions; +import com.seamlesspay.param.ChargeCreateParams; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/stripe/functional/seamlesspay/charge/ChargeRetrieveTest.java b/src/test/java/com/seamlesspay/functional/charge/ChargeRetrieveTest.java similarity index 87% rename from src/test/java/com/stripe/functional/seamlesspay/charge/ChargeRetrieveTest.java rename to src/test/java/com/seamlesspay/functional/charge/ChargeRetrieveTest.java index 161d18e4..fc06a2b4 100644 --- a/src/test/java/com/stripe/functional/seamlesspay/charge/ChargeRetrieveTest.java +++ b/src/test/java/com/seamlesspay/functional/charge/ChargeRetrieveTest.java @@ -1,11 +1,11 @@ -package com.stripe.functional.seamlesspay.charge; +package com.seamlesspay.functional.charge; import com.seamlesspay.SPAPI; -import com.stripe.exception.ApiException; -import com.stripe.exception.AuthenticationException; -import com.stripe.exception.SPException; -import com.stripe.model.Charge; -import com.stripe.net.RequestOptions; +import com.seamlesspay.exception.ApiException; +import com.seamlesspay.exception.AuthenticationException; +import com.seamlesspay.exception.SPException; +import com.seamlesspay.model.Charge; +import com.seamlesspay.net.RequestOptions; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/stripe/functional/seamlesspay/charge/ChargeUpdateTest.java b/src/test/java/com/seamlesspay/functional/charge/ChargeUpdateTest.java similarity index 91% rename from src/test/java/com/stripe/functional/seamlesspay/charge/ChargeUpdateTest.java rename to src/test/java/com/seamlesspay/functional/charge/ChargeUpdateTest.java index 5f3c52f1..e5d39262 100644 --- a/src/test/java/com/stripe/functional/seamlesspay/charge/ChargeUpdateTest.java +++ b/src/test/java/com/seamlesspay/functional/charge/ChargeUpdateTest.java @@ -1,13 +1,13 @@ -package com.stripe.functional.seamlesspay.charge; +package com.seamlesspay.functional.charge; import com.seamlesspay.SPAPI; -import com.stripe.exception.ApiException; -import com.stripe.exception.AuthenticationException; -import com.stripe.exception.InvalidRequestException; -import com.stripe.exception.SPException; -import com.stripe.model.Charge; -import com.stripe.net.RequestOptions; -import com.stripe.param.ChargeUpdateParams; +import com.seamlesspay.exception.ApiException; +import com.seamlesspay.exception.AuthenticationException; +import com.seamlesspay.exception.InvalidRequestException; +import com.seamlesspay.exception.SPException; +import com.seamlesspay.model.Charge; +import com.seamlesspay.net.RequestOptions; +import com.seamlesspay.param.ChargeUpdateParams; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/stripe/functional/seamlesspay/charge/ChargeVoidTest.java b/src/test/java/com/seamlesspay/functional/charge/ChargeVoidTest.java similarity index 86% rename from src/test/java/com/stripe/functional/seamlesspay/charge/ChargeVoidTest.java rename to src/test/java/com/seamlesspay/functional/charge/ChargeVoidTest.java index 7639535f..5a22182d 100644 --- a/src/test/java/com/stripe/functional/seamlesspay/charge/ChargeVoidTest.java +++ b/src/test/java/com/seamlesspay/functional/charge/ChargeVoidTest.java @@ -1,13 +1,13 @@ -package com.stripe.functional.seamlesspay.charge; +package com.seamlesspay.functional.charge; import com.seamlesspay.SPAPI; -import com.stripe.exception.ApiException; -import com.stripe.exception.AuthenticationException; -import com.stripe.exception.SPException; -import com.stripe.model.Charge; -import com.stripe.net.RequestOptions; -import com.stripe.param.ChargeCreateParams; -import com.stripe.param.ChargeVoidParams; +import com.seamlesspay.exception.ApiException; +import com.seamlesspay.exception.AuthenticationException; +import com.seamlesspay.exception.SPException; +import com.seamlesspay.model.Charge; +import com.seamlesspay.net.RequestOptions; +import com.seamlesspay.param.ChargeCreateParams; +import com.seamlesspay.param.ChargeVoidParams; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/stripe/functional/seamlesspay/refund/RefundTest.java b/src/test/java/com/seamlesspay/functional/refund/RefundTest.java similarity index 88% rename from src/test/java/com/stripe/functional/seamlesspay/refund/RefundTest.java rename to src/test/java/com/seamlesspay/functional/refund/RefundTest.java index b1862846..fc5c23f8 100644 --- a/src/test/java/com/stripe/functional/seamlesspay/refund/RefundTest.java +++ b/src/test/java/com/seamlesspay/functional/refund/RefundTest.java @@ -1,13 +1,13 @@ -package com.stripe.functional.seamlesspay.refund; +package com.seamlesspay.functional.refund; import com.seamlesspay.SPAPI; -import com.stripe.exception.ApiException; -import com.stripe.exception.AuthenticationException; -import com.stripe.exception.SPException; -import com.stripe.model.*; -import com.stripe.net.RequestOptions; -import com.stripe.param.ChargeCreateParams; -import com.stripe.param.RefundCreateParams; +import com.seamlesspay.exception.ApiException; +import com.seamlesspay.exception.AuthenticationException; +import com.seamlesspay.exception.SPException; +import com.seamlesspay.model.*; +import com.seamlesspay.net.RequestOptions; +import com.seamlesspay.param.ChargeCreateParams; +import com.seamlesspay.param.RefundCreateParams; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -15,7 +15,7 @@ import org.mockito.InjectMocks; import org.mockito.junit.MockitoJUnitRunner; -import static com.stripe.model.Currency.USD; +import static com.seamlesspay.model.Currency.USD; import static org.junit.jupiter.api.Assertions.*; @Slf4j