overdue: Remove joda Period from OverdueState (and use KB duration)

killbill · Apr 6, 2017 · 66a68f8 · 66a68f8 · pierre · Apr 6, 2017
1 parent e58d9f5
commit 66a68f8
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/OverdueStateConfigJson.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/OverdueStateConfigJson.java
@@ -64,7 +64,7 @@ public OverdueStateConfigJson(final OverdueState input) {
         this.subscriptionCancellationPolicy = input.getOverdueCancellationPolicy();
         Integer tmpAutoReevaluationIntervalDays = null;
         try {
-            tmpAutoReevaluationIntervalDays = input.getAutoReevaluationInterval().getDays();
+            tmpAutoReevaluationIntervalDays = input.getAutoReevaluationInterval().toJodaPeriod().getDays();
         } catch (final OverdueApiException e) {
         } finally {
             this.autoReevaluationIntervalDays = tmpAutoReevaluationIntervalDays;

diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/OverdueStateJson.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/OverdueStateJson.java
@@ -64,7 +64,7 @@ public OverdueStateJson(final OverdueState overdueState, final PaymentConfig pay
 
         Period reevaluationIntervalPeriod = null;
         try {
-            reevaluationIntervalPeriod = overdueState.getAutoReevaluationInterval();
+            reevaluationIntervalPeriod = overdueState.getAutoReevaluationInterval().toJodaPeriod();
         } catch (final OverdueApiException ignored) {
         }
 

diff --git a/overdue/src/main/java/org/killbill/billing/overdue/applicator/OverdueStateApplicator.java b/overdue/src/main/java/org/killbill/billing/overdue/applicator/OverdueStateApplicator.java
@@ -189,7 +189,7 @@ private Period getReevaluationInterval(final OverdueStateSet overdueStateSet, fi
             if (nextOverdueState.isClearState()) {
                 return overdueStateSet.getInitialReevaluationInterval();
             } else {
-                return nextOverdueState.getAutoReevaluationInterval();
+                return nextOverdueState.getAutoReevaluationInterval().toJodaPeriod();
             }
         } catch (final OverdueApiException e) {
             if (e.getCode() == ErrorCode.OVERDUE_NO_REEVALUATION_INTERVAL.getCode()) {

diff --git a/overdue/src/main/java/org/killbill/billing/overdue/config/DefaultOverdueState.java b/overdue/src/main/java/org/killbill/billing/overdue/config/DefaultOverdueState.java
@@ -26,6 +26,7 @@
 
 import org.joda.time.Period;
 import org.killbill.billing.ErrorCode;
+import org.killbill.billing.catalog.api.Duration;
 import org.killbill.billing.catalog.api.TimeUnit;
 import org.killbill.billing.overdue.ConditionEvaluation;
 import org.killbill.billing.overdue.api.EmailNotification;
@@ -112,11 +113,11 @@ public OverdueCancellationPolicy getOverdueCancellationPolicy() {
     }
 
     @Override
-    public Period getAutoReevaluationInterval() throws OverdueApiException {
+    public Duration getAutoReevaluationInterval() throws OverdueApiException {
         if (autoReevaluationInterval == null || autoReevaluationInterval.getUnit() == TimeUnit.UNLIMITED || autoReevaluationInterval.getNumber() == 0) {
             throw new OverdueApiException(ErrorCode.OVERDUE_NO_REEVALUATION_INTERVAL, name);
         }
-        return autoReevaluationInterval.toJodaPeriod();
+        return autoReevaluationInterval;
     }
 
     public void setAutoReevaluationInterval(final DefaultDuration autoReevaluationInterval) {