Details
diff --git a/api/src/main/java/org/killbill/billing/overdue/OverdueInternalApi.java b/api/src/main/java/org/killbill/billing/overdue/OverdueInternalApi.java
index 0b376b8..77ad539 100644
--- a/api/src/main/java/org/killbill/billing/overdue/OverdueInternalApi.java
+++ b/api/src/main/java/org/killbill/billing/overdue/OverdueInternalApi.java
@@ -1,7 +1,9 @@
/*
* Copyright 2010-2013 Ning, Inc.
+ * Copyright 2014-2016 Groupon, Inc
+ * Copyright 2014-2016 The Billing Project, LLC
*
- * Ning licenses this file to you under the Apache License, version 2.0
+ * The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
* License. You may obtain a copy of the License at:
*
@@ -16,8 +18,10 @@
package org.killbill.billing.overdue;
+import java.util.UUID;
+
import org.killbill.billing.account.api.ImmutableAccountData;
-import org.killbill.billing.overdue.api.OverdueApiException;
+import org.killbill.billing.callcontext.InternalCallContext;
import org.killbill.billing.overdue.api.OverdueState;
import org.killbill.billing.overdue.config.api.BillingState;
import org.killbill.billing.overdue.config.api.OverdueException;
@@ -26,12 +30,13 @@ import org.killbill.billing.util.callcontext.TenantContext;
public interface OverdueInternalApi {
- public OverdueState refreshOverdueStateFor(ImmutableAccountData overdueable, CallContext context) throws OverdueException, OverdueApiException;
+ public void scheduleOverdueRefresh(UUID accountId, InternalCallContext context);
+
+ public void scheduleOverdueClear(UUID accountId, InternalCallContext context);
public void setOverrideBillingStateForAccount(ImmutableAccountData overdueable, BillingState state, CallContext context) throws OverdueException;
public OverdueState getOverdueStateFor(ImmutableAccountData overdueable, TenantContext context) throws OverdueException;
public BillingState getBillingStateFor(ImmutableAccountData overdueable, TenantContext context) throws OverdueException;
-
}
diff --git a/overdue/src/main/java/org/killbill/billing/overdue/api/DefaultOverdueInternalApi.java b/overdue/src/main/java/org/killbill/billing/overdue/api/DefaultOverdueInternalApi.java
index d676cf9..81c4002 100644
--- a/overdue/src/main/java/org/killbill/billing/overdue/api/DefaultOverdueInternalApi.java
+++ b/overdue/src/main/java/org/killbill/billing/overdue/api/DefaultOverdueInternalApi.java
@@ -1,7 +1,9 @@
/*
* Copyright 2010-2013 Ning, Inc.
+ * Copyright 2014-2016 Groupon, Inc
+ * Copyright 2014-2016 The Billing Project, LLC
*
- * Ning licenses this file to you under the Apache License, version 2.0
+ * The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
* License. You may obtain a copy of the License at:
*
@@ -16,8 +18,11 @@
package org.killbill.billing.overdue.api;
+import java.util.UUID;
+
+import javax.inject.Named;
+
import org.killbill.billing.ErrorCode;
-import org.killbill.billing.ObjectType;
import org.killbill.billing.account.api.ImmutableAccountData;
import org.killbill.billing.callcontext.InternalCallContext;
import org.killbill.billing.callcontext.InternalTenantContext;
@@ -27,14 +32,21 @@ import org.killbill.billing.overdue.OverdueInternalApi;
import org.killbill.billing.overdue.OverdueService;
import org.killbill.billing.overdue.caching.OverdueConfigCache;
import org.killbill.billing.overdue.config.DefaultOverdueConfig;
+import org.killbill.billing.overdue.config.DefaultOverdueState;
import org.killbill.billing.overdue.config.api.BillingState;
import org.killbill.billing.overdue.config.api.OverdueException;
import org.killbill.billing.overdue.config.api.OverdueStateSet;
+import org.killbill.billing.overdue.glue.DefaultOverdueModule;
+import org.killbill.billing.overdue.notification.OverdueAsyncBusNotificationKey;
+import org.killbill.billing.overdue.notification.OverdueAsyncBusNotificationKey.OverdueAsyncBusNotificationAction;
+import org.killbill.billing.overdue.notification.OverdueAsyncBusNotifier;
+import org.killbill.billing.overdue.notification.OverduePoster;
import org.killbill.billing.overdue.wrapper.OverdueWrapper;
import org.killbill.billing.overdue.wrapper.OverdueWrapperFactory;
import org.killbill.billing.util.callcontext.CallContext;
import org.killbill.billing.util.callcontext.InternalCallContextFactory;
import org.killbill.billing.util.callcontext.TenantContext;
+import org.killbill.clock.Clock;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -42,20 +54,26 @@ import com.google.inject.Inject;
public class DefaultOverdueInternalApi implements OverdueInternalApi {
- Logger log = LoggerFactory.getLogger(DefaultOverdueInternalApi.class);
+ private static final Logger log = LoggerFactory.getLogger(DefaultOverdueInternalApi.class);
private final OverdueWrapperFactory factory;
private final BlockingInternalApi accessApi;
- private final InternalCallContextFactory internalCallContextFactory;
+ private final Clock clock;
+ private final OverduePoster asyncPoster;
private final OverdueConfigCache overdueConfigCache;
+ private final InternalCallContextFactory internalCallContextFactory;
@Inject
public DefaultOverdueInternalApi(final OverdueWrapperFactory factory,
final BlockingInternalApi accessApi,
+ final Clock clock,
+ @Named(DefaultOverdueModule.OVERDUE_NOTIFIER_ASYNC_BUS_NAMED) final OverduePoster asyncPoster,
final OverdueConfigCache overdueConfigCache,
final InternalCallContextFactory internalCallContextFactory) {
this.factory = factory;
this.accessApi = accessApi;
+ this.clock = clock;
+ this.asyncPoster = asyncPoster;
this.overdueConfigCache = overdueConfigCache;
this.internalCallContextFactory = internalCallContextFactory;
}
@@ -69,7 +87,7 @@ public class DefaultOverdueInternalApi implements OverdueInternalApi {
final OverdueConfig overdueConfig = overdueConfigCache.getOverdueConfig(internalTenantContext);
final OverdueStateSet states = ((DefaultOverdueConfig) overdueConfig).getOverdueStatesAccount();
return states.findState(stateName);
- } catch (OverdueApiException e) {
+ } catch (final OverdueApiException e) {
throw new OverdueException(e, ErrorCode.OVERDUE_CAT_ERROR_ENCOUNTERED, overdueable.getId(), overdueable.getClass().getSimpleName());
}
}
@@ -84,15 +102,43 @@ public class DefaultOverdueInternalApi implements OverdueInternalApi {
}
@Override
- public OverdueState refreshOverdueStateFor(final ImmutableAccountData blockable, final CallContext context) throws OverdueException, OverdueApiException {
- log.info("Refresh of blockable {} ({}) requested", blockable.getId(), blockable.getClass());
- final InternalCallContext internalCallContext = createInternalCallContext(blockable, context);
- final OverdueWrapper wrapper = factory.createOverdueWrapperFor(blockable, internalCallContext);
- return wrapper.refresh(internalCallContext);
+ public void scheduleOverdueRefresh(final UUID accountId, final InternalCallContext internalCallContext) {
+ insertBusEventIntoNotificationQueue(accountId, OverdueAsyncBusNotificationAction.REFRESH, internalCallContext);
+ }
+
+ @Override
+ public void scheduleOverdueClear(final UUID accountId, final InternalCallContext internalCallContext) {
+ insertBusEventIntoNotificationQueue(accountId, OverdueAsyncBusNotificationAction.CLEAR, internalCallContext);
+ }
+
+ private void insertBusEventIntoNotificationQueue(final UUID accountId, final OverdueAsyncBusNotificationAction action, final InternalCallContext callContext) {
+ final boolean shouldInsertNotification = shouldInsertNotification(callContext);
+
+ if (shouldInsertNotification) {
+ final OverdueAsyncBusNotificationKey notificationKey = new OverdueAsyncBusNotificationKey(accountId, action);
+ asyncPoster.insertOverdueNotification(accountId, clock.getUTCNow(), OverdueAsyncBusNotifier.OVERDUE_ASYNC_BUS_NOTIFIER_QUEUE, notificationKey, callContext);
+ }
}
- private InternalCallContext createInternalCallContext(final ImmutableAccountData blockable, final CallContext context) {
- return internalCallContextFactory.createInternalCallContext(blockable.getId(), ObjectType.ACCOUNT, context);
+ // Optimization: don't bother running the Overdue machinery if it's disabled
+ private boolean shouldInsertNotification(final InternalTenantContext internalTenantContext) {
+ OverdueConfig overdueConfig;
+ try {
+ overdueConfig = overdueConfigCache.getOverdueConfig(internalTenantContext);
+ } catch (final OverdueApiException e) {
+ log.warn("Failed to extract overdue config for tenant " + internalTenantContext.getTenantRecordId());
+ overdueConfig = null;
+ }
+ if (overdueConfig == null || overdueConfig.getOverdueStatesAccount() == null || overdueConfig.getOverdueStatesAccount().getStates() == null) {
+ return false;
+ }
+
+ for (final DefaultOverdueState state : ((DefaultOverdueConfig) overdueConfig).getOverdueStatesAccount().getStates()) {
+ if (state.getConditionEvaluation() != null) {
+ return true;
+ }
+ }
+ return false;
}
@Override
diff --git a/overdue/src/main/java/org/killbill/billing/overdue/listener/OverdueListener.java b/overdue/src/main/java/org/killbill/billing/overdue/listener/OverdueListener.java
index 0e5df31..30d2690 100644
--- a/overdue/src/main/java/org/killbill/billing/overdue/listener/OverdueListener.java
+++ b/overdue/src/main/java/org/killbill/billing/overdue/listener/OverdueListener.java
@@ -20,33 +20,19 @@ package org.killbill.billing.overdue.listener;
import java.util.UUID;
-import javax.inject.Named;
-
import org.killbill.billing.ObjectType;
import org.killbill.billing.callcontext.InternalCallContext;
-import org.killbill.billing.callcontext.InternalTenantContext;
import org.killbill.billing.events.ControlTagCreationInternalEvent;
import org.killbill.billing.events.ControlTagDeletionInternalEvent;
import org.killbill.billing.events.InvoiceAdjustmentInternalEvent;
import org.killbill.billing.events.PaymentErrorInternalEvent;
import org.killbill.billing.events.PaymentInfoInternalEvent;
-import org.killbill.billing.overdue.OverdueService;
-import org.killbill.billing.overdue.api.OverdueApiException;
-import org.killbill.billing.overdue.api.OverdueConfig;
-import org.killbill.billing.overdue.caching.OverdueConfigCache;
-import org.killbill.billing.overdue.config.DefaultOverdueConfig;
-import org.killbill.billing.overdue.config.DefaultOverdueState;
-import org.killbill.billing.overdue.glue.DefaultOverdueModule;
-import org.killbill.billing.overdue.notification.OverdueAsyncBusNotificationKey;
-import org.killbill.billing.overdue.notification.OverdueAsyncBusNotificationKey.OverdueAsyncBusNotificationAction;
-import org.killbill.billing.overdue.notification.OverdueAsyncBusNotifier;
-import org.killbill.billing.overdue.notification.OverduePoster;
+import org.killbill.billing.overdue.OverdueInternalApi;
import org.killbill.billing.util.callcontext.CallOrigin;
import org.killbill.billing.util.callcontext.InternalCallContextFactory;
import org.killbill.billing.util.callcontext.UserType;
import org.killbill.billing.util.tag.ControlTagType;
import org.killbill.bus.api.BusEvent;
-import org.killbill.clock.Clock;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -56,21 +42,15 @@ import com.google.inject.Inject;
public class OverdueListener {
- private final InternalCallContextFactory internalCallContextFactory;
- private final OverduePoster asyncPoster;
- private final Clock clock;
- private final OverdueConfigCache overdueConfigCache;
-
private static final Logger log = LoggerFactory.getLogger(OverdueListener.class);
+ private final OverdueInternalApi overdueInternalApi;
+ private final InternalCallContextFactory internalCallContextFactory;
+
@Inject
- public OverdueListener(final Clock clock,
- @Named(DefaultOverdueModule.OVERDUE_NOTIFIER_ASYNC_BUS_NAMED) final OverduePoster asyncPoster,
- final OverdueConfigCache overdueConfigCache,
+ public OverdueListener(final OverdueInternalApi overdueInternalApi,
final InternalCallContextFactory internalCallContextFactory) {
- this.asyncPoster = asyncPoster;
- this.clock = clock;
- this.overdueConfigCache = overdueConfigCache;
+ this.overdueInternalApi = overdueInternalApi;
this.internalCallContextFactory = internalCallContextFactory;
}
@@ -78,7 +58,8 @@ public class OverdueListener {
@Subscribe
public void handle_OVERDUE_ENFORCEMENT_OFF_Insert(final ControlTagCreationInternalEvent event) {
if (event.getTagDefinition().getName().equals(ControlTagType.OVERDUE_ENFORCEMENT_OFF.toString()) && event.getObjectType() == ObjectType.ACCOUNT) {
- insertBusEventIntoNotificationQueue(event.getObjectId(), event, OverdueAsyncBusNotificationAction.CLEAR, event.getSearchKey2());
+ final InternalCallContext callContext = createCallContext(event.getUserToken(), event.getSearchKey1(), event.getSearchKey2());
+ overdueInternalApi.scheduleOverdueClear(event.getObjectId(), callContext);
}
}
@@ -86,7 +67,7 @@ public class OverdueListener {
@Subscribe
public void handle_OVERDUE_ENFORCEMENT_OFF_Removal(final ControlTagDeletionInternalEvent event) {
if (event.getTagDefinition().getName().equals(ControlTagType.OVERDUE_ENFORCEMENT_OFF.toString()) && event.getObjectType() == ObjectType.ACCOUNT) {
- insertBusEventIntoNotificationQueue(event.getObjectId(), event, OverdueAsyncBusNotificationAction.REFRESH, event.getSearchKey2());
+ insertBusEventIntoNotificationQueue(event.getObjectId(), event);
}
}
@@ -94,52 +75,26 @@ public class OverdueListener {
@Subscribe
public void handlePaymentInfoEvent(final PaymentInfoInternalEvent event) {
log.debug("Received PaymentInfo event {}", event);
- insertBusEventIntoNotificationQueue(event.getAccountId(), event, OverdueAsyncBusNotificationAction.REFRESH, event.getSearchKey2());
+ insertBusEventIntoNotificationQueue(event.getAccountId(), event);
}
@AllowConcurrentEvents
@Subscribe
public void handlePaymentErrorEvent(final PaymentErrorInternalEvent event) {
log.debug("Received PaymentError event {}", event);
- insertBusEventIntoNotificationQueue(event.getAccountId(), event, OverdueAsyncBusNotificationAction.REFRESH, event.getSearchKey2());
+ insertBusEventIntoNotificationQueue(event.getAccountId(), event);
}
@AllowConcurrentEvents
@Subscribe
public void handleInvoiceAdjustmentEvent(final InvoiceAdjustmentInternalEvent event) {
log.debug("Received InvoiceAdjustment event {}", event);
- insertBusEventIntoNotificationQueue(event.getAccountId(), event, OverdueAsyncBusNotificationAction.REFRESH, event.getSearchKey2());
+ insertBusEventIntoNotificationQueue(event.getAccountId(), event);
}
- private void insertBusEventIntoNotificationQueue(final UUID accountId, final BusEvent event, final OverdueAsyncBusNotificationAction action, final Long tenantRecordId) {
- final InternalTenantContext tenantContext = internalCallContextFactory.createInternalTenantContext(tenantRecordId, null);
- final boolean shouldInsertNotification = shouldInsertNotification(tenantContext);
-
- if (shouldInsertNotification) {
- final OverdueAsyncBusNotificationKey notificationKey = new OverdueAsyncBusNotificationKey(accountId, action);
- asyncPoster.insertOverdueNotification(accountId, clock.getUTCNow(), OverdueAsyncBusNotifier.OVERDUE_ASYNC_BUS_NOTIFIER_QUEUE, notificationKey, createCallContext(event.getUserToken(), event.getSearchKey1(), event.getSearchKey2()));
- }
- }
-
- // Optimization: don't bother running the Overdue machinery if it's disabled
- private boolean shouldInsertNotification(final InternalTenantContext internalTenantContext) {
- OverdueConfig overdueConfig;
- try {
- overdueConfig = overdueConfigCache.getOverdueConfig(internalTenantContext);
- } catch (OverdueApiException e) {
- log.warn("Failed to extract overdue config for tenant " + internalTenantContext.getTenantRecordId());
- overdueConfig = null;
- }
- if (overdueConfig == null || overdueConfig.getOverdueStatesAccount() == null || overdueConfig.getOverdueStatesAccount().getStates() == null) {
- return false;
- }
-
- for (final DefaultOverdueState state : ((DefaultOverdueConfig) overdueConfig).getOverdueStatesAccount().getStates()) {
- if (state.getConditionEvaluation() != null) {
- return true;
- }
- }
- return false;
+ private void insertBusEventIntoNotificationQueue(final UUID accountId, final BusEvent event) {
+ final InternalCallContext callContext = createCallContext(event.getUserToken(), event.getSearchKey1(), event.getSearchKey2());
+ overdueInternalApi.scheduleOverdueRefresh(accountId, callContext);
}
private InternalCallContext createCallContext(final UUID userToken, final Long accountRecordId, final Long tenantRecordId) {
diff --git a/overdue/src/main/java/org/killbill/billing/overdue/notification/OverdueAsyncBusNotifier.java b/overdue/src/main/java/org/killbill/billing/overdue/notification/OverdueAsyncBusNotifier.java
index 9aca856..be98671 100644
--- a/overdue/src/main/java/org/killbill/billing/overdue/notification/OverdueAsyncBusNotifier.java
+++ b/overdue/src/main/java/org/killbill/billing/overdue/notification/OverdueAsyncBusNotifier.java
@@ -1,7 +1,9 @@
/*
* Copyright 2010-2013 Ning, Inc.
+ * Copyright 2014-2016 Groupon, Inc
+ * Copyright 2014-2016 The Billing Project, LLC
*
- * Ning licenses this file to you under the Apache License, version 2.0
+ * The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
* License. You may obtain a copy of the License at:
*
@@ -19,18 +21,13 @@ package org.killbill.billing.overdue.notification;
import java.util.UUID;
import org.joda.time.DateTime;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.killbill.billing.callcontext.InternalCallContext;
-import org.killbill.notificationq.api.NotificationEvent;
-import org.killbill.notificationq.api.NotificationQueueService;
import org.killbill.billing.overdue.OverdueProperties;
import org.killbill.billing.overdue.listener.OverdueDispatcher;
-import org.killbill.billing.overdue.listener.OverdueListener;
-import org.killbill.billing.util.callcontext.CallOrigin;
import org.killbill.billing.util.callcontext.InternalCallContextFactory;
-import org.killbill.billing.util.callcontext.UserType;
+import org.killbill.notificationq.api.NotificationEvent;
+import org.killbill.notificationq.api.NotificationQueueService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.inject.Inject;
diff --git a/overdue/src/main/java/org/killbill/billing/overdue/notification/OverdueCheckNotifier.java b/overdue/src/main/java/org/killbill/billing/overdue/notification/OverdueCheckNotifier.java
index 22417cd..bd644dd 100644
--- a/overdue/src/main/java/org/killbill/billing/overdue/notification/OverdueCheckNotifier.java
+++ b/overdue/src/main/java/org/killbill/billing/overdue/notification/OverdueCheckNotifier.java
@@ -1,7 +1,9 @@
/*
* Copyright 2010-2013 Ning, Inc.
+ * Copyright 2014-2016 Groupon, Inc
+ * Copyright 2014-2016 The Billing Project, LLC
*
- * Ning licenses this file to you under the Apache License, version 2.0
+ * The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
* License. You may obtain a copy of the License at:
*
@@ -19,15 +21,13 @@ package org.killbill.billing.overdue.notification;
import java.util.UUID;
import org.joda.time.DateTime;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.killbill.notificationq.api.NotificationEvent;
-import org.killbill.notificationq.api.NotificationQueueService;
import org.killbill.billing.overdue.OverdueProperties;
import org.killbill.billing.overdue.listener.OverdueDispatcher;
-import org.killbill.billing.overdue.listener.OverdueListener;
import org.killbill.billing.util.callcontext.InternalCallContextFactory;
+import org.killbill.notificationq.api.NotificationEvent;
+import org.killbill.notificationq.api.NotificationQueueService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.inject.Inject;
diff --git a/payment/src/main/java/org/killbill/billing/payment/invoice/InvoicePaymentControlPluginApi.java b/payment/src/main/java/org/killbill/billing/payment/invoice/InvoicePaymentControlPluginApi.java
index 1acbb9f..cdeb15c 100644
--- a/payment/src/main/java/org/killbill/billing/payment/invoice/InvoicePaymentControlPluginApi.java
+++ b/payment/src/main/java/org/killbill/billing/payment/invoice/InvoicePaymentControlPluginApi.java
@@ -31,8 +31,6 @@ import javax.inject.Named;
import org.joda.time.DateTime;
import org.killbill.billing.ErrorCode;
import org.killbill.billing.ObjectType;
-import org.killbill.billing.account.api.Account;
-import org.killbill.billing.account.api.AccountApiException;
import org.killbill.billing.account.api.AccountInternalApi;
import org.killbill.billing.callcontext.InternalCallContext;
import org.killbill.billing.callcontext.InternalTenantContext;
@@ -49,8 +47,6 @@ import org.killbill.billing.invoice.api.InvoiceInternalApi;
import org.killbill.billing.invoice.api.InvoiceItem;
import org.killbill.billing.invoice.api.InvoicePayment;
import org.killbill.billing.overdue.OverdueInternalApi;
-import org.killbill.billing.overdue.api.OverdueApiException;
-import org.killbill.billing.overdue.config.api.OverdueException;
import org.killbill.billing.payment.api.PaymentApiException;
import org.killbill.billing.payment.api.PluginProperty;
import org.killbill.billing.payment.api.TransactionStatus;
@@ -551,15 +547,6 @@ public final class InvoicePaymentControlPluginApi implements PaymentControlPlugi
// See https://github.com/killbill/killbill/issues/472
private void refreshOverdue(final PaymentControlContext paymentControlContext, final InternalCallContext internalContext) {
- try {
- final Account account = accountApi.getAccountById(paymentControlContext.getAccountId(), internalContext);
- overdueApi.refreshOverdueStateFor(account, internalContext.toCallContext(paymentControlContext.getTenantId()));
- } catch (final AccountApiException e) {
- log.warn("Unable to refresh overdue for accountId={}: {}", paymentControlContext.getAccountId(), e);
- } catch (final OverdueApiException e) {
- log.warn("Unable to refresh overdue for accountId={}: {}", paymentControlContext.getAccountId(), e);
- } catch (final OverdueException e) {
- log.warn("Unable to refresh overdue for accountId={}: {}", paymentControlContext.getAccountId(), e);
- }
+ overdueApi.scheduleOverdueRefresh(paymentControlContext.getAccountId(), internalContext);
}
}
