group upstream apis into a package in subscription module

Author: ashutoshgngwr

src/integrationTest/java/com/trynoice/api/subscription/SubscriptionControllerTest.java

@@ -5,7 +5,6 @@
 import com.stripe.exception.StripeException;
 import com.stripe.model.checkout.Session;
 import com.trynoice.api.identity.entities.AuthUser;
-import com.trynoice.api.subscription.ecb.ForeignExchangeRatesProvider;
 import com.trynoice.api.subscription.entities.Customer;
 import com.trynoice.api.subscription.entities.CustomerRepository;
 import com.trynoice.api.subscription.entities.GiftCardRepository;
@@ -15,6 +14,9 @@
 import com.trynoice.api.subscription.entities.SubscriptionRepository;
 import com.trynoice.api.subscription.payload.SubscriptionFlowParams;
 import com.trynoice.api.subscription.payload.SubscriptionPlanResponse;
+import com.trynoice.api.subscription.upstream.AndroidPublisherApi;
+import com.trynoice.api.subscription.upstream.ForeignExchangeRatesProvider;
+import com.trynoice.api.subscription.upstream.StripeApi;
 import com.trynoice.api.testing.AuthTestUtils;
 import lombok.NonNull;
 import lombok.val;

src/integrationTest/java/com/trynoice/api/subscription/SubscriptionControllerV2Test.java

@@ -4,14 +4,15 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.stripe.model.checkout.Session;
 import com.trynoice.api.identity.entities.AuthUser;
-import com.trynoice.api.subscription.ecb.ForeignExchangeRatesProvider;
 import com.trynoice.api.subscription.entities.CustomerRepository;
 import com.trynoice.api.subscription.entities.GiftCardRepository;
 import com.trynoice.api.subscription.entities.Subscription;
 import com.trynoice.api.subscription.entities.SubscriptionPlan;
 import com.trynoice.api.subscription.entities.SubscriptionPlanRepository;
 import com.trynoice.api.subscription.entities.SubscriptionRepository;
 import com.trynoice.api.subscription.payload.SubscriptionFlowParams;
+import com.trynoice.api.subscription.upstream.ForeignExchangeRatesProvider;
+import com.trynoice.api.subscription.upstream.StripeApi;
 import com.trynoice.api.testing.AuthTestUtils;
 import lombok.NonNull;
 import lombok.val;

src/integrationTest/java/com/trynoice/api/subscription/SubscriptionServiceTest.java

@@ -9,7 +9,9 @@
 import com.trynoice.api.subscription.entities.SubscriptionPlan;
 import com.trynoice.api.subscription.entities.SubscriptionRepository;
 import com.trynoice.api.subscription.payload.GooglePlayDeveloperNotification;
-import com.trynoice.api.subscription.payload.GooglePlaySubscriptionPurchase;
+import com.trynoice.api.subscription.upstream.AndroidPublisherApi;
+import com.trynoice.api.subscription.upstream.StripeApi;
+import com.trynoice.api.subscription.upstream.models.GooglePlaySubscriptionPurchase;
 import lombok.NonNull;
 import lombok.val;
 import org.junit.jupiter.api.Test;

src/main/java/com/trynoice/api/subscription/SubscriptionBeans.java

@@ -10,8 +10,10 @@
 import com.google.cloud.spring.pubsub.integration.inbound.PubSubInboundChannelAdapter;
 import com.google.cloud.spring.pubsub.support.converter.JacksonPubSubMessageConverter;
 import com.google.cloud.spring.pubsub.support.converter.PubSubMessageConverter;
-import com.trynoice.api.subscription.ecb.ForeignExchangeRatesProvider;
 import com.trynoice.api.subscription.payload.GooglePlayDeveloperNotification;
+import com.trynoice.api.subscription.upstream.AndroidPublisherApi;
+import com.trynoice.api.subscription.upstream.ForeignExchangeRatesProvider;
+import com.trynoice.api.subscription.upstream.StripeApi;
 import lombok.NonNull;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;

src/main/java/com/trynoice/api/subscription/SubscriptionService.java

@@ -6,7 +6,6 @@
 import com.stripe.model.checkout.Session;
 import com.trynoice.api.contracts.AccountServiceContract;
 import com.trynoice.api.contracts.SubscriptionServiceContract;
-import com.trynoice.api.subscription.ecb.ForeignExchangeRatesProvider;
 import com.trynoice.api.subscription.entities.Customer;
 import com.trynoice.api.subscription.entities.CustomerRepository;
 import com.trynoice.api.subscription.entities.GiftCard;
@@ -27,12 +26,15 @@
 import com.trynoice.api.subscription.exceptions.WebhookPayloadException;
 import com.trynoice.api.subscription.payload.GiftCardResponse;
 import com.trynoice.api.subscription.payload.GooglePlayDeveloperNotification;
-import com.trynoice.api.subscription.payload.GooglePlaySubscriptionPurchase;
 import com.trynoice.api.subscription.payload.StripeCustomerPortalUrlResponse;
 import com.trynoice.api.subscription.payload.SubscriptionFlowParams;
 import com.trynoice.api.subscription.payload.SubscriptionFlowResponseV2;
 import com.trynoice.api.subscription.payload.SubscriptionPlanResponse;
 import com.trynoice.api.subscription.payload.SubscriptionResponseV2;
+import com.trynoice.api.subscription.upstream.AndroidPublisherApi;
+import com.trynoice.api.subscription.upstream.ForeignExchangeRatesProvider;
+import com.trynoice.api.subscription.upstream.StripeApi;
+import com.trynoice.api.subscription.upstream.models.GooglePlaySubscriptionPurchase;
 import lombok.NonNull;
 import lombok.val;
 import org.springframework.beans.factory.annotation.Autowired;

…pi/subscription/AndroidPublisherApi.java …iption/upstream/AndroidPublisherApi.javasrc/main/java/com/trynoice/api/subscription/AndroidPublisherApi.java renamed to src/main/java/com/trynoice/api/subscription/upstream/AndroidPublisherApi.java src/main/java/com/trynoice/api/subscription/AndroidPublisherApi.java renamed to src/main/java/com/trynoice/api/subscription/upstream/AndroidPublisherApi.java

@@ -1,12 +1,12 @@
-package com.trynoice.api.subscription;
+package com.trynoice.api.subscription.upstream;
 
 import com.google.api.client.googleapis.javanet.GoogleNetHttpTransport;
 import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.services.androidpublisher.AndroidPublisher;
 import com.google.api.services.androidpublisher.model.SubscriptionPurchasesAcknowledgeRequest;
 import com.google.auth.http.HttpCredentialsAdapter;
 import com.google.auth.oauth2.GoogleCredentials;
-import com.trynoice.api.subscription.payload.GooglePlaySubscriptionPurchase;
+import com.trynoice.api.subscription.upstream.models.GooglePlaySubscriptionPurchase;
 import lombok.NonNull;
 import lombok.val;
 
@@ -40,7 +40,7 @@ public AndroidPublisherApi(
      * @see com.google.api.services.androidpublisher.AndroidPublisher.Purchases.Subscriptionsv2#get(String, String)
      */
     @NonNull
-    GooglePlaySubscriptionPurchase getSubscriptionPurchase(@NonNull String purchaseToken) throws IOException {
+    public GooglePlaySubscriptionPurchase getSubscriptionPurchase(@NonNull String purchaseToken) throws IOException {
         return new GooglePlaySubscriptionPurchase(
             client.purchases()
                 .subscriptionsv2()
@@ -52,7 +52,7 @@ GooglePlaySubscriptionPurchase getSubscriptionPurchase(@NonNull String purchaseT
      * @see com.google.api.services.androidpublisher.AndroidPublisher.Purchases.Subscriptions#acknowledge(
      *String, String, String, SubscriptionPurchasesAcknowledgeRequest)
      */
-    void acknowledgePurchase(@NonNull String productId, @NonNull String purchaseToken) throws IOException {
+    public void acknowledgePurchase(@NonNull String productId, @NonNull String purchaseToken) throws IOException {
         client.purchases()
             .subscriptions()
             .acknowledge(clientAppId, productId, purchaseToken, new SubscriptionPurchasesAcknowledgeRequest())
@@ -65,7 +65,7 @@ void acknowledgePurchase(@NonNull String productId, @NonNull String purchaseToke
      * @see com.google.api.services.androidpublisher.AndroidPublisher.Purchases.Subscriptions#cancel(String, String, String)
      * @see <a href="https://developer.android.com/google/play/billing/subscriptions#cancel">Cancellations</a>
      */
-    void cancelSubscription(@NonNull String purchaseToken) throws IOException {
+    public void cancelSubscription(@NonNull String purchaseToken) throws IOException {
         val purchase = getSubscriptionPurchase(purchaseToken);
         if ("SUBSCRIPTION_STATE_CANCELED".equals(purchase.getSubscriptionState())) {
             // subscription is already cancelled.

…on/ecb/ForeignExchangeRatesProvider.java …stream/ForeignExchangeRatesProvider.javasrc/main/java/com/trynoice/api/subscription/ecb/ForeignExchangeRatesProvider.java renamed to src/main/java/com/trynoice/api/subscription/upstream/ForeignExchangeRatesProvider.java src/main/java/com/trynoice/api/subscription/ecb/ForeignExchangeRatesProvider.java renamed to src/main/java/com/trynoice/api/subscription/upstream/ForeignExchangeRatesProvider.java

@@ -1,4 +1,4 @@
-package com.trynoice.api.subscription.ecb;
+package com.trynoice.api.subscription.upstream;
 
 import lombok.NonNull;
 import lombok.val;

…trynoice/api/subscription/StripeApi.java …api/subscription/upstream/StripeApi.javasrc/main/java/com/trynoice/api/subscription/StripeApi.java renamed to src/main/java/com/trynoice/api/subscription/upstream/StripeApi.java src/main/java/com/trynoice/api/subscription/StripeApi.java renamed to src/main/java/com/trynoice/api/subscription/upstream/StripeApi.java

@@ -1,4 +1,4 @@
-package com.trynoice.api.subscription;
+package com.trynoice.api.subscription.upstream;
 
 
 import com.stripe.Stripe;
@@ -53,7 +53,7 @@ public StripeApi(@NonNull String apiKey) {
      * @throws StripeException on api call error
      */
     @NonNull
-    Session createCheckoutSession(
+    public Session createCheckoutSession(
         @NonNull String successUrl,
         @NonNull String cancelUrl,
         @NonNull String priceId,
@@ -86,7 +86,7 @@ Session createCheckoutSession(
      * @see Webhook#constructEvent(String, String, String)
      */
     @NonNull
-    Event decodeWebhookPayload(
+    public Event decodeWebhookPayload(
         @NonNull String payload,
         @NonNull String signature,
         @NonNull String secret
@@ -98,7 +98,7 @@ Event decodeWebhookPayload(
      * @see Subscription#retrieve(String)
      */
     @NonNull
-    Subscription getSubscription(@NonNull String id) throws StripeException {
+    public Subscription getSubscription(@NonNull String id) throws StripeException {
         return Subscription.retrieve(id);
     }
 
@@ -110,7 +110,7 @@ Subscription getSubscription(@NonNull String id) throws StripeException {
      * @see Subscription#update(SubscriptionUpdateParams)
      * @see Subscription#cancel(SubscriptionCancelParams)
      */
-    void cancelSubscription(@NonNull String id) throws StripeException {
+    public void cancelSubscription(@NonNull String id) throws StripeException {
         val subscription = getSubscription(id);
         if ("canceled".equals(subscription.getStatus())) {
             return;
@@ -130,7 +130,7 @@ void cancelSubscription(@NonNull String id) throws StripeException {
      * @param id id of the stripe subscription.
      * @throws StripeException on Stripe API errors.
      */
-    void refundSubscription(@NonNull String id) throws StripeException {
+    public void refundSubscription(@NonNull String id) throws StripeException {
         val subscription = Subscription.retrieve(
             id,
             SubscriptionRetrieveParams.builder()
@@ -156,7 +156,7 @@ void refundSubscription(@NonNull String id) throws StripeException {
      * @see com.stripe.model.billingportal.Session#create(com.stripe.param.billingportal.SessionCreateParams)
      */
     @NonNull
-    com.stripe.model.billingportal.Session createCustomerPortalSession(
+    public com.stripe.model.billingportal.Session createCustomerPortalSession(
         @NonNull String customerId,
         String returnUrl
     ) throws StripeException {
@@ -174,7 +174,7 @@ com.stripe.model.billingportal.Session createCustomerPortalSession(
      * @param customerId a not {@literal null} customer id recognised by Stripe API.
      * @throws StripeException on upstream errors.
      */
-    void resetCustomerNameAndEmail(@NonNull String customerId) throws StripeException {
+    public void resetCustomerNameAndEmail(@NonNull String customerId) throws StripeException {
         Customer.retrieve(customerId).update(
             CustomerUpdateParams.builder()
                 .setName(EmptyParam.EMPTY)

…load/GooglePlaySubscriptionPurchase.java …dels/GooglePlaySubscriptionPurchase.javasrc/main/java/com/trynoice/api/subscription/payload/GooglePlaySubscriptionPurchase.java renamed to src/main/java/com/trynoice/api/subscription/upstream/models/GooglePlaySubscriptionPurchase.java src/main/java/com/trynoice/api/subscription/payload/GooglePlaySubscriptionPurchase.java renamed to src/main/java/com/trynoice/api/subscription/upstream/models/GooglePlaySubscriptionPurchase.java

@@ -1,4 +1,4 @@
-package com.trynoice.api.subscription.payload;
+package com.trynoice.api.subscription.upstream.models;
 
 import com.google.api.client.util.DateTime;
 import com.google.api.services.androidpublisher.model.SubscriptionPurchaseLineItem;

src/test/java/com/trynoice/api/subscription/SubscriptionServiceTest.java

@@ -4,7 +4,6 @@
 import com.stripe.exception.StripeException;
 import com.stripe.model.checkout.Session;
 import com.trynoice.api.contracts.AccountServiceContract;
-import com.trynoice.api.subscription.ecb.ForeignExchangeRatesProvider;
 import com.trynoice.api.subscription.entities.Customer;
 import com.trynoice.api.subscription.entities.CustomerRepository;
 import com.trynoice.api.subscription.entities.GiftCard;
@@ -22,6 +21,9 @@
 import com.trynoice.api.subscription.exceptions.SubscriptionPlanNotFoundException;
 import com.trynoice.api.subscription.exceptions.UnsupportedSubscriptionPlanProviderException;
 import com.trynoice.api.subscription.payload.SubscriptionFlowParams;
+import com.trynoice.api.subscription.upstream.AndroidPublisherApi;
+import com.trynoice.api.subscription.upstream.ForeignExchangeRatesProvider;
+import com.trynoice.api.subscription.upstream.StripeApi;
 import lombok.NonNull;
 import lombok.val;
 import org.junit.jupiter.api.BeforeEach;