killbill-uncached

diff --git a/entitlement/src/main/java/org/killbill/billing/entitlement/api/EntitlementDateHelper.java b/entitlement/src/main/java/org/killbill/billing/entitlement/api/EntitlementDateHelper.java
index e5ba8e1..3b0b63b 100644
--- a/entitlement/src/main/java/org/killbill/billing/entitlement/api/EntitlementDateHelper.java
+++ b/entitlement/src/main/java/org/killbill/billing/entitlement/api/EntitlementDateHelper.java
@@ -18,6 +18,7 @@ package org.killbill.billing.entitlement.api;
 
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeZone;
+import org.joda.time.Interval;
 import org.joda.time.LocalDate;
 
 import org.killbill.billing.account.api.Account;
@@ -25,6 +26,7 @@ import org.killbill.billing.account.api.AccountApiException;
 import org.killbill.billing.account.api.AccountInternalApi;
 import org.killbill.billing.callcontext.InternalTenantContext;
 import org.killbill.clock.Clock;
+import org.killbill.clock.ClockUtil;
 
 public class EntitlementDateHelper {
 
@@ -36,70 +38,15 @@ public class EntitlementDateHelper {
         this.clock = clock;
     }
 
-    public DateTime fromNowAndReferenceTime(final DateTime referenceDateTime, final InternalTenantContext callContext) throws EntitlementApiException {
-        try {
-            final Account account = accountApi.getAccountByRecordId(callContext.getAccountRecordId(), callContext);
-            return fromNowAndReferenceTime(referenceDateTime, account.getTimeZone());
-        } catch (AccountApiException e) {
-            throw new EntitlementApiException(e);
-        }
-    }
-
-    public DateTime fromNowAndReferenceTime(final DateTime referenceDateTime, final DateTimeZone accountTimeZone) {
-        final LocalDate localDateNowInAccountTimezone = new LocalDate(clock.getUTCNow(), accountTimeZone);
-        return fromLocalDateAndReferenceTime(localDateNowInAccountTimezone, referenceDateTime, accountTimeZone);
-    }
-
     public DateTime fromLocalDateAndReferenceTime(final LocalDate requestedDate, final DateTime referenceDateTime, final InternalTenantContext callContext) throws EntitlementApiException {
         try {
             final Account account = accountApi.getAccountByRecordId(callContext.getAccountRecordId(), callContext);
-            return fromLocalDateAndReferenceTime(requestedDate, referenceDateTime, account.getTimeZone());
+            return ClockUtil.computeDateTimeWithUTCReferenceTime(requestedDate, referenceDateTime.toDateTime(DateTimeZone.UTC).toLocalTime(), account.getTimeZone(), clock);
         } catch (AccountApiException e) {
             throw new EntitlementApiException(e);
         }
     }
 
-    public DateTime fromLocalDateAndReferenceTime(final LocalDate requestedDate, final DateTime referenceDateTime, final DateTimeZone accountTimeZone) {
-        final LocalDate localDateNowInAccountTimezone = new LocalDate(requestedDate, accountTimeZone);
-        // Datetime from local date in account timezone and with given reference time
-        final DateTime t1 = localDateNowInAccountTimezone.toDateTime(referenceDateTime.toLocalTime(), accountTimeZone);
-        // Datetime converted back in UTC
-        final DateTime t2 = new DateTime(t1, DateTimeZone.UTC);
-
-        //
-        // Ok, in the case of a LocalDate of today we expect any change to be immediate, so we check that DateTime returned is not in the future
-        // (which means that reference time might not be honored, but this is not very important).
-        //
-        return adjustDateTimeToNotBeInFutureIfLocaDateIsToday(t2, accountTimeZone);
-    }
-
-    private DateTime adjustDateTimeToNotBeInFutureIfLocaDateIsToday(final DateTime inputUtc, final DateTimeZone accountTimeZone) {
-        // If the LocalDate is TODAY but after adding the reference time we end up in the future, we correct it to be NOW,
-        // so change occurs immediately.
-        // If the LocalDate is TODAY but after adding the reference time we end up in the past, we also correct it to NOW,
-        // so we don't end up having events between this time and NOW.
-        // Note that in both these cases, we won't respect the reference time.
-        if (isEqualsToday(inputUtc, accountTimeZone)) {
-            return clock.getUTCNow();
-        } else {
-            return inputUtc;
-        }
-    }
-
-    /**
-     * Check if the date portion of a date/time is equals at today (as returned by the clock).
-     *
-     * @param inputDate       the fully qualified DateTime
-     * @param accountTimeZone the account timezone
-     * @return true if the inputDate, once converted into a LocalDate using account timezone is equals at today
-     */
-    private boolean isEqualsToday(final DateTime inputDate, final DateTimeZone accountTimeZone) {
-        final LocalDate localDateNowInAccountTimezone = new LocalDate(clock.getUTCNow(), accountTimeZone);
-        final LocalDate targetDateInAccountTimezone = new LocalDate(inputDate, accountTimeZone);
-
-        return targetDateInAccountTimezone.compareTo(localDateNowInAccountTimezone) == 0;
-    }
-
     /**
      * Check if the date portion of a date/time is before or equals at now (as returned by the clock).
      *
@@ -107,10 +54,10 @@ public class EntitlementDateHelper {
      * @param accountTimeZone the account timezone
      * @return true if the inputDate, once converted into a LocalDate using account timezone is less or equals than today
      */
+    // TODO Move to ClockUtils
     public boolean isBeforeOrEqualsToday(final DateTime inputDate, final DateTimeZone accountTimeZone) {
         final LocalDate localDateNowInAccountTimezone = new LocalDate(clock.getUTCNow(), accountTimeZone);
         final LocalDate targetDateInAccountTimezone = new LocalDate(inputDate, accountTimeZone);
-
         return targetDateInAccountTimezone.compareTo(localDateNowInAccountTimezone) <= 0;
     }
 }