killbill-aplcache

junction: Fix major typo where recurringBillingMode ends

8/28/2015 12:36:51 AM

Details

diff --git a/junction/src/main/java/org/killbill/billing/junction/plumbing/billing/DefaultBillingEventSet.java b/junction/src/main/java/org/killbill/billing/junction/plumbing/billing/DefaultBillingEventSet.java
index 4586db9..fbe8bc8 100644
--- a/junction/src/main/java/org/killbill/billing/junction/plumbing/billing/DefaultBillingEventSet.java
+++ b/junction/src/main/java/org/killbill/billing/junction/plumbing/billing/DefaultBillingEventSet.java
@@ -45,7 +45,7 @@ public class DefaultBillingEventSet extends TreeSet<BillingEvent> implements Sor
 
     private boolean accountAutoInvoiceOff = false;
     private List<UUID> subscriptionIdsWithAutoInvoiceOff = new ArrayList<UUID>();
-    private BillingMode recurrringBillingMode;
+    private BillingMode recurringBillingMode;
 
     /* (non-Javadoc)
     * @see org.killbill.billing.junction.plumbing.billing.BillingEventSet#isAccountAutoInvoiceOff()
@@ -57,7 +57,7 @@ public class DefaultBillingEventSet extends TreeSet<BillingEvent> implements Sor
 
     @Override
     public BillingMode getRecurringBillingMode() {
-        return null;
+        return recurringBillingMode;
     }
 
     /* (non-Javadoc)
@@ -90,12 +90,8 @@ public class DefaultBillingEventSet extends TreeSet<BillingEvent> implements Sor
         this.accountAutoInvoiceOff = accountAutoInvoiceIsOff;
     }
 
-    public BillingMode getRecurrringBillingMode() {
-        return recurrringBillingMode;
-    }
-
-    public void setRecurrringBillingMode(final BillingMode recurrringBillingMode) {
-        this.recurrringBillingMode = recurrringBillingMode;
+    public void setRecurringBillingMode(final BillingMode recurringBillingMode) {
+        this.recurringBillingMode = recurringBillingMode;
     }
 
     @Override
diff --git a/junction/src/main/java/org/killbill/billing/junction/plumbing/billing/DefaultInternalBillingApi.java b/junction/src/main/java/org/killbill/billing/junction/plumbing/billing/DefaultInternalBillingApi.java
index 84a3050..7eddd1a 100644
--- a/junction/src/main/java/org/killbill/billing/junction/plumbing/billing/DefaultInternalBillingApi.java
+++ b/junction/src/main/java/org/killbill/billing/junction/plumbing/billing/DefaultInternalBillingApi.java
@@ -86,7 +86,7 @@ public class DefaultInternalBillingApi implements BillingInternalApi {
         final List<SubscriptionBaseBundle> bundles = subscriptionApi.getBundlesForAccount(accountId, context);
         final DefaultBillingEventSet result = new DefaultBillingEventSet();
         final StaticCatalog currentCatalog = catalogService.getCurrentCatalog(context);
-        result.setRecurrringBillingMode(currentCatalog.getRecurringBillingMode());
+        result.setRecurringBillingMode(currentCatalog.getRecurringBillingMode());
 
         try {
             final Account account = accountApi.getAccountById(accountId, context);