killbill-memoizeit
Changes
payment/pom.xml 2(+1 -1)
payment/src/main/java/org/killbill/billing/payment/core/janitor/PendingTransactionTask.java 4(+2 -2)
payment/src/main/java/org/killbill/billing/payment/core/PluginRoutingPaymentProcessor.java 31(+15 -16)
payment/src/main/java/org/killbill/billing/payment/core/sm/PluginRoutingPaymentAutomatonRunner.java 12(+6 -6)
payment/src/main/java/org/killbill/billing/payment/core/sm/RetryAuthorizeOperationCallback.java 28(+14 -14)
payment/src/main/java/org/killbill/billing/payment/core/sm/RetryCaptureOperationCallback.java 4(+2 -2)
payment/src/main/java/org/killbill/billing/payment/core/sm/RetryChargebackOperationCallback.java 22(+11 -11)
payment/src/main/java/org/killbill/billing/payment/core/sm/RetryCompletionOperationCallback.java 8(+4 -4)
payment/src/main/java/org/killbill/billing/payment/core/sm/RetryCreditOperationCallback.java 28(+14 -14)
payment/src/main/java/org/killbill/billing/payment/core/sm/RetryPurchaseOperationCallback.java 28(+14 -14)
payment/src/main/java/org/killbill/billing/payment/core/sm/RetryRefundOperationCallback.java 24(+12 -12)
payment/src/main/java/org/killbill/billing/payment/core/sm/RetryVoidOperationCallback.java 20(+10 -10)
payment/src/main/java/org/killbill/billing/payment/glue/DefaultPaymentRoutingProviderPluginRegistryProvider.java 28(+14 -14)
payment/src/main/java/org/killbill/billing/payment/invoice/dao/InvoicePaymentRoutingDao.java 6(+3 -3)
payment/src/main/java/org/killbill/billing/payment/invoice/dao/PluginAutoPayOffModelDao.java 2(+1 -1)
payment/src/main/java/org/killbill/billing/payment/invoice/InvoicePaymentRoutingPluginApi.java 172(+87 -85)
payment/src/main/java/org/killbill/billing/payment/provider/DefaultNoOpPaymentRoutingProviderPlugin.java 32(+17 -15)
payment/src/main/java/org/killbill/billing/payment/provider/DefaultPaymentRoutingProviderPlugin.java 25(+13 -12)
payment/src/main/java/org/killbill/billing/payment/provider/DefaultPaymentRoutingProviderPluginRegistry.java 18(+9 -9)
payment/src/main/java/org/killbill/billing/payment/retry/DefaultPriorPaymentRoutingResult.java 9(+5 -4)
payment/src/test/java/org/killbill/billing/payment/core/sm/MockRetryablePaymentAutomatonRunner.java 10(+4 -6)
payment/src/test/java/org/killbill/billing/payment/core/sm/MockRetryAuthorizeOperationCallback.java 4(+2 -2)
payment/src/test/java/org/killbill/billing/payment/invoice/dao/TestInvoicePaymentRoutingDao.java 8(+4 -4)
payment/src/test/java/org/killbill/billing/payment/provider/MockPaymentRoutingProviderPlugin.java 29(+15 -14)
pom.xml 2(+1 -1)
Details
diff --git a/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestIntegrationBase.java b/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestIntegrationBase.java
index cdd9e5a..65df382 100644
--- a/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestIntegrationBase.java
+++ b/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestIntegrationBase.java
@@ -81,7 +81,7 @@ import org.killbill.billing.payment.api.PaymentMethodPlugin;
import org.killbill.billing.payment.api.PaymentOptions;
import org.killbill.billing.payment.api.PluginProperty;
import org.killbill.billing.payment.api.TestPaymentMethodPluginBase;
-import org.killbill.billing.payment.control.InvoicePaymentControlPluginApi;
+import org.killbill.billing.payment.invoice.InvoicePaymentRoutingPluginApi;
import org.killbill.billing.payment.provider.MockPaymentProviderPlugin;
import org.killbill.billing.subscription.api.SubscriptionBase;
import org.killbill.billing.subscription.api.SubscriptionBaseService;
@@ -131,7 +131,7 @@ public class TestIntegrationBase extends BeatrixTestSuiteWithEmbeddedDB {
@Override
public List<String> getPaymentControlPluginNames() {
- return ImmutableList.<String>of(InvoicePaymentControlPluginApi.PLUGIN_NAME);
+ return ImmutableList.<String>of(InvoicePaymentRoutingPluginApi.PLUGIN_NAME);
}
};
@@ -143,7 +143,7 @@ public class TestIntegrationBase extends BeatrixTestSuiteWithEmbeddedDB {
@Override
public List<String> getPaymentControlPluginNames() {
- return ImmutableList.<String>of(InvoicePaymentControlPluginApi.PLUGIN_NAME);
+ return ImmutableList.<String>of(InvoicePaymentRoutingPluginApi.PLUGIN_NAME);
}
};
@@ -416,7 +416,7 @@ public class TestIntegrationBase extends BeatrixTestSuiteWithEmbeddedDB {
try {
final List<PluginProperty> properties = new ArrayList<PluginProperty>();
- final PluginProperty prop1 = new PluginProperty(InvoicePaymentControlPluginApi.PROP_IPCD_INVOICE_ID, invoice.getId().toString(), false);
+ final PluginProperty prop1 = new PluginProperty(InvoicePaymentRoutingPluginApi.PROP_IPCD_INVOICE_ID, invoice.getId().toString(), false);
properties.add(prop1);
return paymentApi.createPurchaseWithPaymentControl(account, account.getPaymentMethodId(), null, amount, currency, UUID.randomUUID().toString(),
UUID.randomUUID().toString(), properties, PAYMENT_OPTIONS, callContext);
@@ -434,7 +434,7 @@ public class TestIntegrationBase extends BeatrixTestSuiteWithEmbeddedDB {
public Payment apply(@Nullable final Void input) {
try {
final List<PluginProperty> properties = new ArrayList<PluginProperty>();
- final PluginProperty prop1 = new PluginProperty(InvoicePaymentControlPluginApi.PROP_IPCD_INVOICE_ID, invoice.getId().toString(), false);
+ final PluginProperty prop1 = new PluginProperty(InvoicePaymentRoutingPluginApi.PROP_IPCD_INVOICE_ID, invoice.getId().toString(), false);
properties.add(prop1);
return paymentApi.createPurchaseWithPaymentControl(account, account.getPaymentMethodId(), null, invoice.getBalance(), invoice.getCurrency(), UUID.randomUUID().toString(),
@@ -454,7 +454,7 @@ public class TestIntegrationBase extends BeatrixTestSuiteWithEmbeddedDB {
try {
final List<PluginProperty> properties = new ArrayList<PluginProperty>();
- final PluginProperty prop1 = new PluginProperty(InvoicePaymentControlPluginApi.PROP_IPCD_INVOICE_ID, invoice.getId().toString(), false);
+ final PluginProperty prop1 = new PluginProperty(InvoicePaymentRoutingPluginApi.PROP_IPCD_INVOICE_ID, invoice.getId().toString(), false);
properties.add(prop1);
return paymentApi.createPurchaseWithPaymentControl(account, account.getPaymentMethodId(), null, invoice.getBalance(), invoice.getCurrency(), UUID.randomUUID().toString(),
@@ -488,7 +488,7 @@ public class TestIntegrationBase extends BeatrixTestSuiteWithEmbeddedDB {
public Payment apply(@Nullable final Void input) {
final List<PluginProperty> properties = new ArrayList<PluginProperty>();
- final PluginProperty prop1 = new PluginProperty(InvoicePaymentControlPluginApi.PROP_IPCD_REFUND_WITH_ADJUSTMENTS, "true", false);
+ final PluginProperty prop1 = new PluginProperty(InvoicePaymentRoutingPluginApi.PROP_IPCD_REFUND_WITH_ADJUSTMENTS, "true", false);
properties.add(prop1);
try {
return paymentApi.createRefundWithPaymentControl(account, payment.getId(), payment.getPurchasedAmount(), payment.getCurrency(), UUID.randomUUID().toString(),
@@ -507,9 +507,9 @@ public class TestIntegrationBase extends BeatrixTestSuiteWithEmbeddedDB {
public Payment apply(@Nullable final Void input) {
final List<PluginProperty> properties = new ArrayList<PluginProperty>();
- final PluginProperty prop1 = new PluginProperty(InvoicePaymentControlPluginApi.PROP_IPCD_REFUND_WITH_ADJUSTMENTS, "true", false);
+ final PluginProperty prop1 = new PluginProperty(InvoicePaymentRoutingPluginApi.PROP_IPCD_REFUND_WITH_ADJUSTMENTS, "true", false);
properties.add(prop1);
- final PluginProperty prop2 = new PluginProperty(InvoicePaymentControlPluginApi.PROP_IPCD_REFUND_IDS_WITH_AMOUNT_KEY, iias, false);
+ final PluginProperty prop2 = new PluginProperty(InvoicePaymentRoutingPluginApi.PROP_IPCD_REFUND_IDS_WITH_AMOUNT_KEY, iias, false);
properties.add(prop2);
try {
diff --git a/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestTagApi.java b/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestTagApi.java
index 85a6aaa..80b5505 100644
--- a/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestTagApi.java
+++ b/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestTagApi.java
@@ -99,7 +99,7 @@ public class TestTagApi extends TestIntegrationBase {
assertListenerStatus();
//
- // Add 2 Tags on the invoice (1 control tag and 1 user tag)
+ // Add 2 Tags on the invoice (1 invoice tag and 1 user tag)
//
busHandler.pushExpectedEvents(NextEvent.TAG);
tagUserApi.addTag(invoice.getId(), ObjectType.INVOICE, ControlTagType.WRITTEN_OFF.getId(), callContext);
diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/JaxRsResourceBase.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/JaxRsResourceBase.java
index e2ede5d..ac7e9b6 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/JaxRsResourceBase.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/JaxRsResourceBase.java
@@ -374,7 +374,7 @@ public abstract class JaxRsResourceBase implements JaxrsResource {
@Override
public List<String> getPaymentControlPluginNames() {
- /* Will default to org.killbill.payment.control.plugin in payment sub-system */
+ /* Will default to org.killbill.payment.invoice.plugin in payment sub-system */
return null;
}
};
payment/pom.xml 2(+1 -1)
diff --git a/payment/pom.xml b/payment/pom.xml
index fbac2a8..a87f5b7 100644
--- a/payment/pom.xml
+++ b/payment/pom.xml
@@ -127,7 +127,7 @@
</dependency>
<dependency>
<groupId>org.kill-bill.billing.plugin</groupId>
- <artifactId>killbill-plugin-api-retry</artifactId>
+ <artifactId>killbill-plugin-api-routing</artifactId>
</dependency>
<dependency>
<groupId>org.kill-bill.commons</groupId>
diff --git a/payment/src/main/java/org/killbill/billing/payment/api/DefaultPaymentApi.java b/payment/src/main/java/org/killbill/billing/payment/api/DefaultPaymentApi.java
index 15ec0cb..2bf74bb 100644
--- a/payment/src/main/java/org/killbill/billing/payment/api/DefaultPaymentApi.java
+++ b/payment/src/main/java/org/killbill/billing/payment/api/DefaultPaymentApi.java
@@ -31,7 +31,7 @@ import org.killbill.billing.callcontext.InternalCallContext;
import org.killbill.billing.catalog.api.Currency;
import org.killbill.billing.payment.core.PaymentMethodProcessor;
import org.killbill.billing.payment.core.PaymentProcessor;
-import org.killbill.billing.payment.core.PluginControlledPaymentProcessor;
+import org.killbill.billing.payment.core.PluginRoutingPaymentProcessor;
import org.killbill.billing.util.callcontext.CallContext;
import org.killbill.billing.util.callcontext.InternalCallContextFactory;
import org.killbill.billing.util.callcontext.TenantContext;
@@ -51,15 +51,15 @@ public class DefaultPaymentApi implements PaymentApi {
private final PaymentConfig paymentConfig;
private final PaymentProcessor paymentProcessor;
private final PaymentMethodProcessor paymentMethodProcessor;
- private final PluginControlledPaymentProcessor pluginControlledPaymentProcessor;
+ private final PluginRoutingPaymentProcessor pluginRoutingPaymentProcessor;
private final InternalCallContextFactory internalCallContextFactory;
@Inject
- public DefaultPaymentApi(final PaymentConfig paymentConfig, final PaymentProcessor paymentProcessor, final PaymentMethodProcessor paymentMethodProcessor, final PluginControlledPaymentProcessor pluginControlledPaymentProcessor, final InternalCallContextFactory internalCallContextFactory) {
+ public DefaultPaymentApi(final PaymentConfig paymentConfig, final PaymentProcessor paymentProcessor, final PaymentMethodProcessor paymentMethodProcessor, final PluginRoutingPaymentProcessor pluginRoutingPaymentProcessor, final InternalCallContextFactory internalCallContextFactory) {
this.paymentConfig = paymentConfig;
this.paymentProcessor = paymentProcessor;
this.paymentMethodProcessor = paymentMethodProcessor;
- this.pluginControlledPaymentProcessor = pluginControlledPaymentProcessor;
+ this.pluginRoutingPaymentProcessor = pluginRoutingPaymentProcessor;
this.internalCallContextFactory = internalCallContextFactory;
}
@@ -139,7 +139,7 @@ public class DefaultPaymentApi implements PaymentApi {
final UUID nonNulPaymentMethodId = (paymentMethodId != null) ?
paymentMethodId :
paymentMethodProcessor.createOrGetExternalPaymentMethod(UUID.randomUUID().toString(), account, properties, callContext, internalCallContext);
- return pluginControlledPaymentProcessor.createPurchase(IS_API_PAYMENT, account, nonNulPaymentMethodId, paymentId, amount, currency, paymentExternalKey, paymentTransactionExternalKey,
+ return pluginRoutingPaymentProcessor.createPurchase(IS_API_PAYMENT, account, nonNulPaymentMethodId, paymentId, amount, currency, paymentExternalKey, paymentTransactionExternalKey,
properties, toPaymentControlPluginNames(paymentOptions), callContext, internalCallContext);
}
@@ -194,7 +194,7 @@ public class DefaultPaymentApi implements PaymentApi {
logAPICall(TransactionType.REFUND.name(), account, null, paymentId, null, amount, currency, null, paymentTransactionExternalKey);
final InternalCallContext internalCallContext = internalCallContextFactory.createInternalCallContext(account.getId(), callContext);
- return pluginControlledPaymentProcessor.createRefund(IS_API_PAYMENT, account, paymentId, amount, currency, paymentTransactionExternalKey,
+ return pluginRoutingPaymentProcessor.createRefund(IS_API_PAYMENT, account, paymentId, amount, currency, paymentTransactionExternalKey,
properties, toPaymentControlPluginNames(paymentOptions), callContext, internalCallContext);
}
@@ -261,7 +261,7 @@ public class DefaultPaymentApi implements PaymentApi {
checkPositiveAmount(amount);
final InternalCallContext internalCallContext = internalCallContextFactory.createInternalCallContext(account.getId(), callContext);
- return pluginControlledPaymentProcessor.createChargeback(account, paymentId, paymentTransactionExternalKey, amount, currency,
+ return pluginRoutingPaymentProcessor.createChargeback(account, paymentId, paymentTransactionExternalKey, amount, currency,
toPaymentControlPluginNames(paymentOptions), callContext, internalCallContext);
}
diff --git a/payment/src/main/java/org/killbill/billing/payment/bus/InvoiceHandler.java b/payment/src/main/java/org/killbill/billing/payment/bus/InvoiceHandler.java
index 0157839..a904698 100644
--- a/payment/src/main/java/org/killbill/billing/payment/bus/InvoiceHandler.java
+++ b/payment/src/main/java/org/killbill/billing/payment/bus/InvoiceHandler.java
@@ -32,8 +32,8 @@ import org.killbill.billing.callcontext.InternalCallContext;
import org.killbill.billing.events.InvoiceCreationInternalEvent;
import org.killbill.billing.payment.api.PaymentApiException;
import org.killbill.billing.payment.api.PluginProperty;
-import org.killbill.billing.payment.control.InvoicePaymentControlPluginApi;
-import org.killbill.billing.payment.core.PluginControlledPaymentProcessor;
+import org.killbill.billing.payment.invoice.InvoicePaymentRoutingPluginApi;
+import org.killbill.billing.payment.core.PluginRoutingPaymentProcessor;
import org.killbill.billing.util.cache.Cachable.CacheType;
import org.killbill.billing.util.cache.CacheControllerDispatcher;
import org.killbill.billing.util.callcontext.CallContext;
@@ -53,7 +53,7 @@ public class InvoiceHandler {
private final AccountInternalApi accountApi;
private final InternalCallContextFactory internalCallContextFactory;
- private final PluginControlledPaymentProcessor pluginControlledPaymentProcessor;
+ private final PluginRoutingPaymentProcessor pluginRoutingPaymentProcessor;
private final NonEntityDao nonEntityDao;
private final CacheControllerDispatcher controllerDispatcher;
private final PaymentConfig paymentConfig;
@@ -63,14 +63,14 @@ public class InvoiceHandler {
@Inject
public InvoiceHandler(final PaymentConfig paymentConfig,
final AccountInternalApi accountApi,
- final PluginControlledPaymentProcessor pluginControlledPaymentProcessor,
+ final PluginRoutingPaymentProcessor pluginRoutingPaymentProcessor,
final NonEntityDao nonEntityDao,
final InternalCallContextFactory internalCallContextFactory,
final CacheControllerDispatcher controllerDispatcher) {
this.paymentConfig = paymentConfig;
this.accountApi = accountApi;
this.internalCallContextFactory = internalCallContextFactory;
- this.pluginControlledPaymentProcessor = pluginControlledPaymentProcessor;
+ this.pluginRoutingPaymentProcessor = pluginRoutingPaymentProcessor;
this.nonEntityDao = nonEntityDao;
this.controllerDispatcher = controllerDispatcher;
}
@@ -87,14 +87,14 @@ public class InvoiceHandler {
account = accountApi.getAccountById(event.getAccountId(), internalContext);
final List<PluginProperty> properties = new ArrayList<PluginProperty>();
- final PluginProperty prop1 = new PluginProperty(InvoicePaymentControlPluginApi.PROP_IPCD_INVOICE_ID, event.getInvoiceId().toString(), false);
+ final PluginProperty prop1 = new PluginProperty(InvoicePaymentRoutingPluginApi.PROP_IPCD_INVOICE_ID, event.getInvoiceId().toString(), false);
properties.add(prop1);
final CallContext callContext = internalContext.toCallContext(nonEntityDao.retrieveIdFromObject(internalContext.getTenantRecordId(), ObjectType.TENANT, controllerDispatcher.getCacheController(CacheType.OBJECT_ID)));
final BigDecimal amountToBePaid = null; // We let the plugin compute how much should be paid
- final List<String> paymentControlPluginNames = paymentConfig.getPaymentControlPluginNames() != null ? paymentConfig.getPaymentControlPluginNames() : ImmutableList.of(InvoicePaymentControlPluginApi.PLUGIN_NAME);
- pluginControlledPaymentProcessor.createPurchase(false, account, account.getPaymentMethodId(), null, amountToBePaid, account.getCurrency(), UUID.randomUUID().toString(), UUID.randomUUID().toString(),
+ final List<String> paymentControlPluginNames = paymentConfig.getPaymentControlPluginNames() != null ? paymentConfig.getPaymentControlPluginNames() : ImmutableList.of(InvoicePaymentRoutingPluginApi.PLUGIN_NAME);
+ pluginRoutingPaymentProcessor.createPurchase(false, account, account.getPaymentMethodId(), null, amountToBePaid, account.getCurrency(), UUID.randomUUID().toString(), UUID.randomUUID().toString(),
properties, paymentControlPluginNames, callContext, internalContext);
} catch (final AccountApiException e) {
log.error("Failed to process invoice payment", e);
diff --git a/payment/src/main/java/org/killbill/billing/payment/core/janitor/AttemptCompletionTask.java b/payment/src/main/java/org/killbill/billing/payment/core/janitor/AttemptCompletionTask.java
index 717142d..fcf5796 100644
--- a/payment/src/main/java/org/killbill/billing/payment/core/janitor/AttemptCompletionTask.java
+++ b/payment/src/main/java/org/killbill/billing/payment/core/janitor/AttemptCompletionTask.java
@@ -29,7 +29,7 @@ import org.killbill.billing.osgi.api.OSGIServiceRegistration;
import org.killbill.billing.payment.api.PaymentApiException;
import org.killbill.billing.payment.api.TransactionStatus;
import org.killbill.billing.payment.core.sm.PaymentStateMachineHelper;
-import org.killbill.billing.payment.core.sm.PluginControlledPaymentAutomatonRunner;
+import org.killbill.billing.payment.core.sm.PluginRoutingPaymentAutomatonRunner;
import org.killbill.billing.payment.core.sm.RetryStateMachineHelper;
import org.killbill.billing.payment.core.sm.RetryablePaymentStateContext;
import org.killbill.billing.payment.dao.PaymentAttemptModelDao;
@@ -59,7 +59,7 @@ final class AttemptCompletionTask extends CompletionTaskBase<PaymentAttemptModel
public AttemptCompletionTask(final Janitor janitor, final InternalCallContextFactory internalCallContextFactory, final PaymentConfig paymentConfig,
final NonEntityDao nonEntityDao, final PaymentDao paymentDao, final Clock clock, final PaymentStateMachineHelper paymentStateMachineHelper,
final RetryStateMachineHelper retrySMHelper, final CacheControllerDispatcher controllerDispatcher, final AccountInternalApi accountInternalApi,
- final PluginControlledPaymentAutomatonRunner pluginControlledPaymentAutomatonRunner, final OSGIServiceRegistration<PaymentPluginApi> pluginRegistry) {
+ final PluginRoutingPaymentAutomatonRunner pluginControlledPaymentAutomatonRunner, final OSGIServiceRegistration<PaymentPluginApi> pluginRegistry) {
super(janitor, internalCallContextFactory, paymentConfig, nonEntityDao, paymentDao, clock, paymentStateMachineHelper, retrySMHelper, controllerDispatcher, accountInternalApi, pluginControlledPaymentAutomatonRunner, pluginRegistry);
}
diff --git a/payment/src/main/java/org/killbill/billing/payment/core/janitor/CompletionTaskBase.java b/payment/src/main/java/org/killbill/billing/payment/core/janitor/CompletionTaskBase.java
index 9f68a5e..18d7616 100644
--- a/payment/src/main/java/org/killbill/billing/payment/core/janitor/CompletionTaskBase.java
+++ b/payment/src/main/java/org/killbill/billing/payment/core/janitor/CompletionTaskBase.java
@@ -28,7 +28,7 @@ import org.killbill.billing.callcontext.InternalCallContext;
import org.killbill.billing.callcontext.InternalTenantContext;
import org.killbill.billing.osgi.api.OSGIServiceRegistration;
import org.killbill.billing.payment.core.sm.PaymentStateMachineHelper;
-import org.killbill.billing.payment.core.sm.PluginControlledPaymentAutomatonRunner;
+import org.killbill.billing.payment.core.sm.PluginRoutingPaymentAutomatonRunner;
import org.killbill.billing.payment.core.sm.RetryStateMachineHelper;
import org.killbill.billing.payment.dao.PaymentDao;
import org.killbill.billing.payment.plugin.api.PaymentPluginApi;
@@ -61,14 +61,14 @@ abstract class CompletionTaskBase<T> implements Runnable {
protected final RetryStateMachineHelper retrySMHelper;
protected final CacheControllerDispatcher controllerDispatcher;
protected final AccountInternalApi accountInternalApi;
- protected final PluginControlledPaymentAutomatonRunner pluginControlledPaymentAutomatonRunner;
+ protected final PluginRoutingPaymentAutomatonRunner pluginControlledPaymentAutomatonRunner;
protected final OSGIServiceRegistration<PaymentPluginApi> pluginRegistry;
public CompletionTaskBase(final Janitor janitor, final InternalCallContextFactory internalCallContextFactory, final PaymentConfig paymentConfig,
final NonEntityDao nonEntityDao, final PaymentDao paymentDao, final Clock clock, final PaymentStateMachineHelper paymentStateMachineHelper,
final RetryStateMachineHelper retrySMHelper, final CacheControllerDispatcher controllerDispatcher, final AccountInternalApi accountInternalApi,
- final PluginControlledPaymentAutomatonRunner pluginControlledPaymentAutomatonRunner, final OSGIServiceRegistration<PaymentPluginApi> pluginRegistry) {
+ final PluginRoutingPaymentAutomatonRunner pluginControlledPaymentAutomatonRunner, final OSGIServiceRegistration<PaymentPluginApi> pluginRegistry) {
this.janitor = janitor;
this.internalCallContextFactory = internalCallContextFactory;
this.paymentConfig = paymentConfig;
diff --git a/payment/src/main/java/org/killbill/billing/payment/core/janitor/ErroredPaymentTask.java b/payment/src/main/java/org/killbill/billing/payment/core/janitor/ErroredPaymentTask.java
index 2654372..44c098b 100644
--- a/payment/src/main/java/org/killbill/billing/payment/core/janitor/ErroredPaymentTask.java
+++ b/payment/src/main/java/org/killbill/billing/payment/core/janitor/ErroredPaymentTask.java
@@ -18,13 +18,11 @@
package org.killbill.billing.payment.core.janitor;
import java.math.BigDecimal;
-import java.util.ArrayList;
import java.util.List;
import javax.annotation.Nullable;
import org.joda.time.DateTime;
-import org.killbill.automaton.StateMachine;
import org.killbill.billing.ObjectType;
import org.killbill.billing.account.api.AccountInternalApi;
import org.killbill.billing.callcontext.InternalCallContext;
@@ -35,7 +33,7 @@ import org.killbill.billing.payment.api.PluginProperty;
import org.killbill.billing.payment.api.TransactionStatus;
import org.killbill.billing.payment.core.sm.PaymentEnteringStateCallback;
import org.killbill.billing.payment.core.sm.PaymentStateMachineHelper;
-import org.killbill.billing.payment.core.sm.PluginControlledPaymentAutomatonRunner;
+import org.killbill.billing.payment.core.sm.PluginRoutingPaymentAutomatonRunner;
import org.killbill.billing.payment.core.sm.RetryStateMachineHelper;
import org.killbill.billing.payment.dao.PaymentDao;
import org.killbill.billing.payment.dao.PaymentMethodModelDao;
@@ -66,7 +64,7 @@ public class ErroredPaymentTask extends CompletionTaskBase<PaymentModelDao> {
public ErroredPaymentTask(final Janitor janitor, final InternalCallContextFactory internalCallContextFactory, final PaymentConfig paymentConfig,
final NonEntityDao nonEntityDao, final PaymentDao paymentDao, final Clock clock,
final PaymentStateMachineHelper paymentStateMachineHelper, final RetryStateMachineHelper retrySMHelper, final CacheControllerDispatcher controllerDispatcher, final AccountInternalApi accountInternalApi,
- final PluginControlledPaymentAutomatonRunner pluginControlledPaymentAutomatonRunner, final OSGIServiceRegistration<PaymentPluginApi> pluginRegistry) {
+ final PluginRoutingPaymentAutomatonRunner pluginControlledPaymentAutomatonRunner, final OSGIServiceRegistration<PaymentPluginApi> pluginRegistry) {
super(janitor, internalCallContextFactory, paymentConfig, nonEntityDao, paymentDao, clock, paymentStateMachineHelper, retrySMHelper, controllerDispatcher, accountInternalApi, pluginControlledPaymentAutomatonRunner, pluginRegistry);
}
diff --git a/payment/src/main/java/org/killbill/billing/payment/core/janitor/Janitor.java b/payment/src/main/java/org/killbill/billing/payment/core/janitor/Janitor.java
index 0bc4c0e..a87d870 100644
--- a/payment/src/main/java/org/killbill/billing/payment/core/janitor/Janitor.java
+++ b/payment/src/main/java/org/killbill/billing/payment/core/janitor/Janitor.java
@@ -26,7 +26,7 @@ import javax.inject.Named;
import org.killbill.billing.account.api.AccountInternalApi;
import org.killbill.billing.osgi.api.OSGIServiceRegistration;
import org.killbill.billing.payment.core.sm.PaymentStateMachineHelper;
-import org.killbill.billing.payment.core.sm.PluginControlledPaymentAutomatonRunner;
+import org.killbill.billing.payment.core.sm.PluginRoutingPaymentAutomatonRunner;
import org.killbill.billing.payment.core.sm.RetryStateMachineHelper;
import org.killbill.billing.payment.dao.PaymentDao;
import org.killbill.billing.payment.glue.PaymentModule;
@@ -63,7 +63,7 @@ public class Janitor {
final Clock clock,
final NonEntityDao nonEntityDao,
final InternalCallContextFactory internalCallContextFactory,
- final PluginControlledPaymentAutomatonRunner pluginControlledPaymentAutomatonRunner,
+ final PluginRoutingPaymentAutomatonRunner pluginControlledPaymentAutomatonRunner,
@Named(PaymentModule.JANITOR_EXECUTOR_NAMED) final ScheduledExecutorService janitorExecutor,
final PaymentStateMachineHelper paymentSMHelper,
final RetryStateMachineHelper retrySMHelper,
diff --git a/payment/src/main/java/org/killbill/billing/payment/core/janitor/PendingTransactionTask.java b/payment/src/main/java/org/killbill/billing/payment/core/janitor/PendingTransactionTask.java
index 99369a2..d5f40d0 100644
--- a/payment/src/main/java/org/killbill/billing/payment/core/janitor/PendingTransactionTask.java
+++ b/payment/src/main/java/org/killbill/billing/payment/core/janitor/PendingTransactionTask.java
@@ -23,7 +23,7 @@ import org.killbill.billing.account.api.AccountInternalApi;
import org.killbill.billing.osgi.api.OSGIServiceRegistration;
import org.killbill.billing.payment.api.TransactionStatus;
import org.killbill.billing.payment.core.sm.PaymentStateMachineHelper;
-import org.killbill.billing.payment.core.sm.PluginControlledPaymentAutomatonRunner;
+import org.killbill.billing.payment.core.sm.PluginRoutingPaymentAutomatonRunner;
import org.killbill.billing.payment.core.sm.RetryStateMachineHelper;
import org.killbill.billing.payment.dao.PaymentDao;
import org.killbill.billing.payment.plugin.api.PaymentPluginApi;
@@ -46,7 +46,7 @@ final class PendingTransactionTask extends CompletionTaskBase<Integer> {
public PendingTransactionTask(final Janitor janitor, final InternalCallContextFactory internalCallContextFactory, final PaymentConfig paymentConfig,
final NonEntityDao nonEntityDao, final PaymentDao paymentDao, final Clock clock, final PaymentStateMachineHelper paymentStateMachineHelper,
final RetryStateMachineHelper retrySMHelper, final CacheControllerDispatcher controllerDispatcher, final AccountInternalApi accountInternalApi,
- final PluginControlledPaymentAutomatonRunner pluginControlledPaymentAutomatonRunner, final OSGIServiceRegistration<PaymentPluginApi> pluginRegistry) {
+ final PluginRoutingPaymentAutomatonRunner pluginControlledPaymentAutomatonRunner, final OSGIServiceRegistration<PaymentPluginApi> pluginRegistry) {
super(janitor, internalCallContextFactory, paymentConfig, nonEntityDao, paymentDao, clock, paymentStateMachineHelper, retrySMHelper, controllerDispatcher, accountInternalApi, pluginControlledPaymentAutomatonRunner, pluginRegistry);
this.itemsForIterations = ImmutableList.of(new Integer(1));
}
diff --git a/payment/src/main/java/org/killbill/billing/payment/core/sm/PaymentAutomatonRunner.java b/payment/src/main/java/org/killbill/billing/payment/core/sm/PaymentAutomatonRunner.java
index 1b2e645..7d79cfb 100644
--- a/payment/src/main/java/org/killbill/billing/payment/core/sm/PaymentAutomatonRunner.java
+++ b/payment/src/main/java/org/killbill/billing/payment/core/sm/PaymentAutomatonRunner.java
@@ -45,7 +45,7 @@ import org.killbill.billing.osgi.api.OSGIServiceRegistration;
import org.killbill.billing.payment.api.PaymentApiException;
import org.killbill.billing.payment.api.PluginProperty;
import org.killbill.billing.payment.api.TransactionType;
-import org.killbill.billing.payment.control.InvoicePaymentControlPluginApi;
+import org.killbill.billing.payment.invoice.InvoicePaymentRoutingPluginApi;
import org.killbill.billing.payment.dao.PaymentDao;
import org.killbill.billing.payment.dao.PaymentModelDao;
import org.killbill.billing.payment.dispatcher.PluginDispatcher;
@@ -205,7 +205,7 @@ public class PaymentAutomatonRunner {
final PluginProperty invoiceProperty = Iterables.tryFind(properties, new Predicate<PluginProperty>() {
@Override
public boolean apply(final PluginProperty input) {
- return InvoicePaymentControlPluginApi.PROP_IPCD_INVOICE_ID.equals(input.getKey());
+ return InvoicePaymentRoutingPluginApi.PROP_IPCD_INVOICE_ID.equals(input.getKey());
}
}).orNull();
diff --git a/payment/src/main/java/org/killbill/billing/payment/core/sm/RetryAuthorizeOperationCallback.java b/payment/src/main/java/org/killbill/billing/payment/core/sm/RetryAuthorizeOperationCallback.java
index e92d14d..7f19f27 100644
--- a/payment/src/main/java/org/killbill/billing/payment/core/sm/RetryAuthorizeOperationCallback.java
+++ b/payment/src/main/java/org/killbill/billing/payment/core/sm/RetryAuthorizeOperationCallback.java
@@ -22,29 +22,29 @@ import org.killbill.billing.payment.api.Payment;
import org.killbill.billing.payment.api.PaymentApiException;
import org.killbill.billing.payment.core.PaymentProcessor;
import org.killbill.billing.payment.dispatcher.PluginDispatcher;
-import org.killbill.billing.retry.plugin.api.PaymentControlPluginApi;
+import org.killbill.billing.routing.plugin.api.PaymentRoutingPluginApi;
import org.killbill.commons.locker.GlobalLocker;
public class RetryAuthorizeOperationCallback extends RetryOperationCallback {
- public RetryAuthorizeOperationCallback(final GlobalLocker locker, final PluginDispatcher<OperationResult> paymentPluginDispatcher, final RetryablePaymentStateContext paymentStateContext, final PaymentProcessor paymentProcessor, final OSGIServiceRegistration<PaymentControlPluginApi> paymentControlPluginRegistry) {
+ public RetryAuthorizeOperationCallback(final GlobalLocker locker, final PluginDispatcher<OperationResult> paymentPluginDispatcher, final RetryablePaymentStateContext paymentStateContext, final PaymentProcessor paymentProcessor, final OSGIServiceRegistration<PaymentRoutingPluginApi> paymentControlPluginRegistry) {
super(locker, paymentPluginDispatcher, paymentStateContext, paymentProcessor, paymentControlPluginRegistry);
}
@Override
protected Payment doCallSpecificOperationCallback() throws PaymentApiException {
return paymentProcessor.createAuthorization(retryablePaymentStateContext.isApiPayment(),
- retryablePaymentStateContext.getAttemptId(),
- retryablePaymentStateContext.getAccount(),
- retryablePaymentStateContext.getPaymentMethodId(),
- retryablePaymentStateContext.getPaymentId(),
- retryablePaymentStateContext.getAmount(),
- retryablePaymentStateContext.getCurrency(),
- retryablePaymentStateContext.getPaymentExternalKey(),
- retryablePaymentStateContext.getPaymentTransactionExternalKey(),
- false,
- retryablePaymentStateContext.getProperties(),
- retryablePaymentStateContext.getCallContext(),
- retryablePaymentStateContext.getInternalCallContext());
+ retryablePaymentStateContext.getAttemptId(),
+ retryablePaymentStateContext.getAccount(),
+ retryablePaymentStateContext.getPaymentMethodId(),
+ retryablePaymentStateContext.getPaymentId(),
+ retryablePaymentStateContext.getAmount(),
+ retryablePaymentStateContext.getCurrency(),
+ retryablePaymentStateContext.getPaymentExternalKey(),
+ retryablePaymentStateContext.getPaymentTransactionExternalKey(),
+ false,
+ retryablePaymentStateContext.getProperties(),
+ retryablePaymentStateContext.getCallContext(),
+ retryablePaymentStateContext.getInternalCallContext());
}
}
diff --git a/payment/src/main/java/org/killbill/billing/payment/core/sm/RetryCaptureOperationCallback.java b/payment/src/main/java/org/killbill/billing/payment/core/sm/RetryCaptureOperationCallback.java
index ad4d31b..1e5454e 100644
--- a/payment/src/main/java/org/killbill/billing/payment/core/sm/RetryCaptureOperationCallback.java
+++ b/payment/src/main/java/org/killbill/billing/payment/core/sm/RetryCaptureOperationCallback.java
@@ -22,12 +22,12 @@ import org.killbill.billing.payment.api.Payment;
import org.killbill.billing.payment.api.PaymentApiException;
import org.killbill.billing.payment.core.PaymentProcessor;
import org.killbill.billing.payment.dispatcher.PluginDispatcher;
-import org.killbill.billing.retry.plugin.api.PaymentControlPluginApi;
+import org.killbill.billing.routing.plugin.api.PaymentRoutingPluginApi;
import org.killbill.commons.locker.GlobalLocker;
public class RetryCaptureOperationCallback extends RetryOperationCallback {
- public RetryCaptureOperationCallback(final GlobalLocker locker, final PluginDispatcher<OperationResult> paymentPluginDispatcher, final RetryablePaymentStateContext paymentStateContext, final PaymentProcessor paymentProcessor, final OSGIServiceRegistration<PaymentControlPluginApi> paymentControlPluginRegistry) {
+ public RetryCaptureOperationCallback(final GlobalLocker locker, final PluginDispatcher<OperationResult> paymentPluginDispatcher, final RetryablePaymentStateContext paymentStateContext, final PaymentProcessor paymentProcessor, final OSGIServiceRegistration<PaymentRoutingPluginApi> paymentControlPluginRegistry) {
super(locker, paymentPluginDispatcher, paymentStateContext, paymentProcessor, paymentControlPluginRegistry);
}
diff --git a/payment/src/main/java/org/killbill/billing/payment/core/sm/RetryChargebackOperationCallback.java b/payment/src/main/java/org/killbill/billing/payment/core/sm/RetryChargebackOperationCallback.java
index 5992f9a..607b4c3 100644
--- a/payment/src/main/java/org/killbill/billing/payment/core/sm/RetryChargebackOperationCallback.java
+++ b/payment/src/main/java/org/killbill/billing/payment/core/sm/RetryChargebackOperationCallback.java
@@ -23,26 +23,26 @@ import org.killbill.billing.payment.api.Payment;
import org.killbill.billing.payment.api.PaymentApiException;
import org.killbill.billing.payment.core.PaymentProcessor;
import org.killbill.billing.payment.dispatcher.PluginDispatcher;
-import org.killbill.billing.retry.plugin.api.PaymentControlPluginApi;
+import org.killbill.billing.routing.plugin.api.PaymentRoutingPluginApi;
import org.killbill.commons.locker.GlobalLocker;
public class RetryChargebackOperationCallback extends RetryOperationCallback {
- public RetryChargebackOperationCallback(final GlobalLocker locker, final PluginDispatcher<OperationResult> paymentPluginDispatcher, final RetryablePaymentStateContext paymentStateContext, final PaymentProcessor paymentProcessor, final OSGIServiceRegistration<PaymentControlPluginApi> paymentControlPluginRegistry) {
+ public RetryChargebackOperationCallback(final GlobalLocker locker, final PluginDispatcher<OperationResult> paymentPluginDispatcher, final RetryablePaymentStateContext paymentStateContext, final PaymentProcessor paymentProcessor, final OSGIServiceRegistration<PaymentRoutingPluginApi> paymentControlPluginRegistry) {
super(locker, paymentPluginDispatcher, paymentStateContext, paymentProcessor, paymentControlPluginRegistry);
}
@Override
protected Payment doCallSpecificOperationCallback() throws PaymentApiException {
return paymentProcessor.createChargeback(retryablePaymentStateContext.isApiPayment(),
- retryablePaymentStateContext.getAttemptId(),
- retryablePaymentStateContext.getAccount(),
- retryablePaymentStateContext.getPaymentId(),
- retryablePaymentStateContext.getPaymentTransactionExternalKey(),
- retryablePaymentStateContext.getAmount(),
- retryablePaymentStateContext.getCurrency(),
- false,
- retryablePaymentStateContext.getCallContext(),
- retryablePaymentStateContext.getInternalCallContext());
+ retryablePaymentStateContext.getAttemptId(),
+ retryablePaymentStateContext.getAccount(),
+ retryablePaymentStateContext.getPaymentId(),
+ retryablePaymentStateContext.getPaymentTransactionExternalKey(),
+ retryablePaymentStateContext.getAmount(),
+ retryablePaymentStateContext.getCurrency(),
+ false,
+ retryablePaymentStateContext.getCallContext(),
+ retryablePaymentStateContext.getInternalCallContext());
}
}
diff --git a/payment/src/main/java/org/killbill/billing/payment/core/sm/RetryCompletionOperationCallback.java b/payment/src/main/java/org/killbill/billing/payment/core/sm/RetryCompletionOperationCallback.java
index 4dab872..8b6a41a 100644
--- a/payment/src/main/java/org/killbill/billing/payment/core/sm/RetryCompletionOperationCallback.java
+++ b/payment/src/main/java/org/killbill/billing/payment/core/sm/RetryCompletionOperationCallback.java
@@ -27,13 +27,13 @@ import org.killbill.billing.payment.core.ProcessorBase.WithAccountLockCallback;
import org.killbill.billing.payment.dao.PaymentTransactionModelDao;
import org.killbill.billing.payment.dispatcher.PluginDispatcher;
import org.killbill.billing.payment.dispatcher.PluginDispatcher.PluginDispatcherReturnType;
-import org.killbill.billing.retry.plugin.api.PaymentControlContext;
-import org.killbill.billing.retry.plugin.api.PaymentControlPluginApi;
+import org.killbill.billing.routing.plugin.api.PaymentRoutingContext;
+import org.killbill.billing.routing.plugin.api.PaymentRoutingPluginApi;
import org.killbill.commons.locker.GlobalLocker;
public class RetryCompletionOperationCallback extends RetryOperationCallback {
- public RetryCompletionOperationCallback(final GlobalLocker locker, final PluginDispatcher<OperationResult> paymentPluginDispatcher, final RetryablePaymentStateContext paymentStateContext, final PaymentProcessor paymentProcessor, final OSGIServiceRegistration<PaymentControlPluginApi> retryPluginRegistry) {
+ public RetryCompletionOperationCallback(final GlobalLocker locker, final PluginDispatcher<OperationResult> paymentPluginDispatcher, final RetryablePaymentStateContext paymentStateContext, final PaymentProcessor paymentProcessor, final OSGIServiceRegistration<PaymentRoutingPluginApi> retryPluginRegistry) {
super(locker, paymentPluginDispatcher, paymentStateContext, paymentProcessor, retryPluginRegistry);
}
@@ -44,7 +44,7 @@ public class RetryCompletionOperationCallback extends RetryOperationCallback {
@Override
public PluginDispatcherReturnType<OperationResult> doOperation() throws OperationException {
final PaymentTransactionModelDao transaction = paymentStateContext.getPaymentTransactionModelDao();
- final PaymentControlContext updatedPaymentControlContext = new DefaultPaymentControlContext(paymentStateContext.getAccount(),
+ final PaymentRoutingContext updatedPaymentControlContext = new DefaultPaymentRoutingContext(paymentStateContext.getAccount(),
paymentStateContext.getPaymentMethodId(),
retryablePaymentStateContext.getAttemptId(),
transaction.getPaymentId(),
diff --git a/payment/src/main/java/org/killbill/billing/payment/core/sm/RetryCreditOperationCallback.java b/payment/src/main/java/org/killbill/billing/payment/core/sm/RetryCreditOperationCallback.java
index 90c8ae3..1965889 100644
--- a/payment/src/main/java/org/killbill/billing/payment/core/sm/RetryCreditOperationCallback.java
+++ b/payment/src/main/java/org/killbill/billing/payment/core/sm/RetryCreditOperationCallback.java
@@ -22,29 +22,29 @@ import org.killbill.billing.payment.api.Payment;
import org.killbill.billing.payment.api.PaymentApiException;
import org.killbill.billing.payment.core.PaymentProcessor;
import org.killbill.billing.payment.dispatcher.PluginDispatcher;
-import org.killbill.billing.retry.plugin.api.PaymentControlPluginApi;
+import org.killbill.billing.routing.plugin.api.PaymentRoutingPluginApi;
import org.killbill.commons.locker.GlobalLocker;
public class RetryCreditOperationCallback extends RetryOperationCallback {
- public RetryCreditOperationCallback(final GlobalLocker locker, final PluginDispatcher<OperationResult> paymentPluginDispatcher, final RetryablePaymentStateContext paymentStateContext, final PaymentProcessor paymentProcessor, final OSGIServiceRegistration<PaymentControlPluginApi> paymentControlPluginRegistry) {
+ public RetryCreditOperationCallback(final GlobalLocker locker, final PluginDispatcher<OperationResult> paymentPluginDispatcher, final RetryablePaymentStateContext paymentStateContext, final PaymentProcessor paymentProcessor, final OSGIServiceRegistration<PaymentRoutingPluginApi> paymentControlPluginRegistry) {
super(locker, paymentPluginDispatcher, paymentStateContext, paymentProcessor, paymentControlPluginRegistry);
}
@Override
protected Payment doCallSpecificOperationCallback() throws PaymentApiException {
return paymentProcessor.createCredit(retryablePaymentStateContext.isApiPayment(),
- retryablePaymentStateContext.getAttemptId(),
- retryablePaymentStateContext.getAccount(),
- retryablePaymentStateContext.getPaymentMethodId(),
- retryablePaymentStateContext.getPaymentId(),
- retryablePaymentStateContext.getAmount(),
- retryablePaymentStateContext.getCurrency(),
- retryablePaymentStateContext.getPaymentExternalKey(),
- retryablePaymentStateContext.getPaymentTransactionExternalKey(),
- false,
- retryablePaymentStateContext.getProperties(),
- retryablePaymentStateContext.getCallContext(),
- retryablePaymentStateContext.getInternalCallContext());
+ retryablePaymentStateContext.getAttemptId(),
+ retryablePaymentStateContext.getAccount(),
+ retryablePaymentStateContext.getPaymentMethodId(),
+ retryablePaymentStateContext.getPaymentId(),
+ retryablePaymentStateContext.getAmount(),
+ retryablePaymentStateContext.getCurrency(),
+ retryablePaymentStateContext.getPaymentExternalKey(),
+ retryablePaymentStateContext.getPaymentTransactionExternalKey(),
+ false,
+ retryablePaymentStateContext.getProperties(),
+ retryablePaymentStateContext.getCallContext(),
+ retryablePaymentStateContext.getInternalCallContext());
}
}
diff --git a/payment/src/main/java/org/killbill/billing/payment/core/sm/RetryEnteringStateCallback.java b/payment/src/main/java/org/killbill/billing/payment/core/sm/RetryEnteringStateCallback.java
index 1b9554d..d0247b6 100644
--- a/payment/src/main/java/org/killbill/billing/payment/core/sm/RetryEnteringStateCallback.java
+++ b/payment/src/main/java/org/killbill/billing/payment/core/sm/RetryEnteringStateCallback.java
@@ -29,11 +29,11 @@ import org.killbill.billing.payment.retry.BaseRetryService.RetryServiceScheduler
public class RetryEnteringStateCallback implements EnteringStateCallback {
- private PluginControlledPaymentAutomatonRunner retryablePaymentAutomatonRunner;
+ private PluginRoutingPaymentAutomatonRunner retryablePaymentAutomatonRunner;
private final RetryablePaymentStateContext paymentStateContext;
private final RetryServiceScheduler retryServiceScheduler;
- public RetryEnteringStateCallback(final PluginControlledPaymentAutomatonRunner retryablePaymentAutomatonRunner, final RetryablePaymentStateContext paymentStateContext,
+ public RetryEnteringStateCallback(final PluginRoutingPaymentAutomatonRunner retryablePaymentAutomatonRunner, final RetryablePaymentStateContext paymentStateContext,
final RetryServiceScheduler retryServiceScheduler) {
this.retryablePaymentAutomatonRunner = retryablePaymentAutomatonRunner;
this.paymentStateContext = paymentStateContext;
diff --git a/payment/src/main/java/org/killbill/billing/payment/core/sm/RetryLeavingStateCallback.java b/payment/src/main/java/org/killbill/billing/payment/core/sm/RetryLeavingStateCallback.java
index cd9f2c3..8de364c 100644
--- a/payment/src/main/java/org/killbill/billing/payment/core/sm/RetryLeavingStateCallback.java
+++ b/payment/src/main/java/org/killbill/billing/payment/core/sm/RetryLeavingStateCallback.java
@@ -31,14 +31,14 @@ import com.google.common.base.Preconditions;
public class RetryLeavingStateCallback implements LeavingStateCallback {
- private PluginControlledPaymentAutomatonRunner retryablePaymentAutomatonRunner;
+ private PluginRoutingPaymentAutomatonRunner retryablePaymentAutomatonRunner;
private final RetryablePaymentStateContext stateContext;
private final State initialState;
private final State retriedState;
private final TransactionType transactionType;
private final PaymentDao paymentDao;
- public RetryLeavingStateCallback(final PluginControlledPaymentAutomatonRunner retryablePaymentAutomatonRunner, final PaymentStateContext stateContext, final PaymentDao paymentDao,
+ public RetryLeavingStateCallback(final PluginRoutingPaymentAutomatonRunner retryablePaymentAutomatonRunner, final PaymentStateContext stateContext, final PaymentDao paymentDao,
final State initialState, final State retriedState, final TransactionType transactionType) {
this.retryablePaymentAutomatonRunner = retryablePaymentAutomatonRunner;
this.paymentDao = paymentDao;
diff --git a/payment/src/main/java/org/killbill/billing/payment/core/sm/RetryOperationCallback.java b/payment/src/main/java/org/killbill/billing/payment/core/sm/RetryOperationCallback.java
index 64cf0ba..c118d18 100644
--- a/payment/src/main/java/org/killbill/billing/payment/core/sm/RetryOperationCallback.java
+++ b/payment/src/main/java/org/killbill/billing/payment/core/sm/RetryOperationCallback.java
@@ -42,11 +42,11 @@ import org.killbill.billing.payment.core.PaymentProcessor;
import org.killbill.billing.payment.core.ProcessorBase.WithAccountLockCallback;
import org.killbill.billing.payment.dispatcher.PluginDispatcher;
import org.killbill.billing.payment.dispatcher.PluginDispatcher.PluginDispatcherReturnType;
-import org.killbill.billing.retry.plugin.api.FailureCallResult;
-import org.killbill.billing.retry.plugin.api.PaymentControlApiException;
-import org.killbill.billing.retry.plugin.api.PaymentControlContext;
-import org.killbill.billing.retry.plugin.api.PaymentControlPluginApi;
-import org.killbill.billing.retry.plugin.api.PriorPaymentControlResult;
+import org.killbill.billing.routing.plugin.api.OnFailurePaymentRoutingResult;
+import org.killbill.billing.routing.plugin.api.PaymentRoutingApiException;
+import org.killbill.billing.routing.plugin.api.PaymentRoutingContext;
+import org.killbill.billing.routing.plugin.api.PaymentRoutingPluginApi;
+import org.killbill.billing.routing.plugin.api.PriorPaymentRoutingResult;
import org.killbill.billing.util.callcontext.CallContext;
import org.killbill.commons.locker.GlobalLocker;
import org.killbill.commons.locker.LockFailedException;
@@ -55,14 +55,14 @@ import org.slf4j.LoggerFactory;
public abstract class RetryOperationCallback extends OperationCallbackBase<Payment, PaymentApiException> implements OperationCallback {
- private final OSGIServiceRegistration<PaymentControlPluginApi> paymentControlPluginRegistry;
+ private final OSGIServiceRegistration<PaymentRoutingPluginApi> paymentControlPluginRegistry;
protected final PaymentProcessor paymentProcessor;
protected final RetryablePaymentStateContext retryablePaymentStateContext;
private final Logger logger = LoggerFactory.getLogger(RetryOperationCallback.class);
- protected RetryOperationCallback(final GlobalLocker locker, final PluginDispatcher<OperationResult> paymentPluginDispatcher, final RetryablePaymentStateContext paymentStateContext, final PaymentProcessor paymentProcessor, final OSGIServiceRegistration<PaymentControlPluginApi> retryPluginRegistry) {
+ protected RetryOperationCallback(final GlobalLocker locker, final PluginDispatcher<OperationResult> paymentPluginDispatcher, final RetryablePaymentStateContext paymentStateContext, final PaymentProcessor paymentProcessor, final OSGIServiceRegistration<PaymentRoutingPluginApi> retryPluginRegistry) {
super(locker, paymentPluginDispatcher, paymentStateContext);
this.paymentProcessor = paymentProcessor;
this.paymentControlPluginRegistry = retryPluginRegistry;
@@ -80,7 +80,7 @@ public abstract class RetryOperationCallback extends OperationCallbackBase<Payme
@Override
public PluginDispatcherReturnType<OperationResult> doOperation() throws OperationException {
- final PaymentControlContext paymentControlContext = new DefaultPaymentControlContext(paymentStateContext.getAccount(),
+ final PaymentRoutingContext paymentControlContext = new DefaultPaymentRoutingContext(paymentStateContext.getAccount(),
paymentStateContext.getPaymentMethodId(),
retryablePaymentStateContext.getAttemptId(),
paymentStateContext.getPaymentId(),
@@ -93,14 +93,14 @@ public abstract class RetryOperationCallback extends OperationCallbackBase<Payme
retryablePaymentStateContext.isApiPayment(),
paymentStateContext.callContext);
- final PriorPaymentControlResult pluginResult;
+ final PriorPaymentRoutingResult pluginResult;
try {
pluginResult = getPluginResult(retryablePaymentStateContext.getPaymentControlPluginNames(), paymentControlContext);
if (pluginResult.isAborted()) {
// Transition to ABORTED
return PluginDispatcher.createPluginDispatcherReturnType(OperationResult.EXCEPTION);
}
- } catch (final PaymentControlApiException e) {
+ } catch (final PaymentRoutingApiException e) {
// Transition to ABORTED and throw PaymentControlApiException to caller.
throw new OperationException(e, OperationResult.EXCEPTION);
}
@@ -116,7 +116,7 @@ public abstract class RetryOperationCallback extends OperationCallbackBase<Payme
success = transaction.getTransactionStatus() == TransactionStatus.SUCCESS || transaction.getTransactionStatus() == TransactionStatus.PENDING;
if (success) {
- final PaymentControlContext updatedPaymentControlContext = new DefaultPaymentControlContext(paymentStateContext.account,
+ final PaymentRoutingContext updatedPaymentRoutingContext = new DefaultPaymentRoutingContext(paymentStateContext.account,
paymentStateContext.paymentMethodId,
retryablePaymentStateContext.getAttemptId(),
result.getId(),
@@ -132,7 +132,7 @@ public abstract class RetryOperationCallback extends OperationCallbackBase<Payme
retryablePaymentStateContext.isApiPayment(),
paymentStateContext.callContext);
- onCompletion(retryablePaymentStateContext.getPaymentControlPluginNames(), updatedPaymentControlContext);
+ onCompletion(retryablePaymentStateContext.getPaymentControlPluginNames(), updatedPaymentRoutingContext);
return PluginDispatcher.createPluginDispatcherReturnType(OperationResult.SUCCESS);
} else {
throw new OperationException(null, getOperationResultAndSetContext(retryablePaymentStateContext, paymentControlContext));
@@ -175,20 +175,20 @@ public abstract class RetryOperationCallback extends OperationCallbackBase<Payme
return new OperationException(e, getOperationResultOnException(paymentStateContext));
}
- protected void onCompletion(final List<String> paymentControlPluginNames, final PaymentControlContext paymentControlContext) {
+ protected void onCompletion(final List<String> paymentControlPluginNames, final PaymentRoutingContext paymentControlContext) {
for (String pluginName : paymentControlPluginNames) {
- final PaymentControlPluginApi plugin = paymentControlPluginRegistry.getServiceForName(pluginName);
+ final PaymentRoutingPluginApi plugin = paymentControlPluginRegistry.getServiceForName(pluginName);
if (plugin != null) {
try {
plugin.onSuccessCall(paymentControlContext, paymentStateContext.getProperties());
- } catch (final PaymentControlApiException e) {
+ } catch (final PaymentRoutingApiException e) {
logger.warn("Plugin " + pluginName + " failed to complete onCompletion call for " + paymentControlContext.getPaymentExternalKey(), e);
}
}
}
}
- private final void adjustStateContextValues(final PaymentStateContext inputContext, final PriorPaymentControlResult pluginResult) {
+ private final void adjustStateContextValues(final PaymentStateContext inputContext, final PriorPaymentRoutingResult pluginResult) {
final RetryablePaymentStateContext input = (RetryablePaymentStateContext) inputContext;
if (pluginResult.getAdjustedAmount() != null) {
@@ -208,33 +208,33 @@ public abstract class RetryOperationCallback extends OperationCallbackBase<Payme
return operationResult;
}
- private PriorPaymentControlResult getPluginResult(final List<String> paymentControlPluginNames, final PaymentControlContext paymentControlContextArg) throws PaymentControlApiException {
+ private PriorPaymentRoutingResult getPluginResult(final List<String> paymentControlPluginNames, final PaymentRoutingContext paymentControlContextArg) throws PaymentRoutingApiException {
// Return as soon as the first plugin aborts, or the last result for the last plugin
- PriorPaymentControlResult prevResult = null;
+ PriorPaymentRoutingResult prevResult = null;
- PaymentControlContext inputPaymentControlContext = paymentControlContextArg;
+ PaymentRoutingContext inputPaymentRoutingContext = paymentControlContextArg;
for (String pluginName : paymentControlPluginNames) {
- final PaymentControlPluginApi plugin = paymentControlPluginRegistry.getServiceForName(pluginName);
+ final PaymentRoutingPluginApi plugin = paymentControlPluginRegistry.getServiceForName(pluginName);
if (plugin == null) {
// First call to plugin, we log warn, if plugin is not registered
- logger.warn("Skipping payment plugin control {} when fetching results", pluginName);
+ logger.warn("Skipping payment plugin invoice {} when fetching results", pluginName);
continue;
}
- prevResult = plugin.priorCall(inputPaymentControlContext, paymentStateContext.getProperties());
+ prevResult = plugin.priorCall(inputPaymentRoutingContext, paymentStateContext.getProperties());
if (prevResult.isAborted()) {
break;
}
- inputPaymentControlContext = new DefaultPaymentControlContext(paymentStateContext.getAccount(),
- prevResult.getAdjustedPaymentMethodId() != null ? prevResult.getAdjustedPaymentMethodId() : inputPaymentControlContext.getPaymentMethodId(),
+ inputPaymentRoutingContext = new DefaultPaymentRoutingContext(paymentStateContext.getAccount(),
+ prevResult.getAdjustedPaymentMethodId() != null ? prevResult.getAdjustedPaymentMethodId() : inputPaymentRoutingContext.getPaymentMethodId(),
retryablePaymentStateContext.getAttemptId(),
paymentStateContext.getPaymentId(),
paymentStateContext.getPaymentExternalKey(),
paymentStateContext.getPaymentTransactionExternalKey(),
paymentStateContext.getTransactionType(),
- prevResult.getAdjustedAmount() != null ? prevResult.getAdjustedAmount() : inputPaymentControlContext.getAmount(),
- prevResult.getAdjustedCurrency() != null ? prevResult.getAdjustedCurrency() : inputPaymentControlContext.getCurrency(),
+ prevResult.getAdjustedAmount() != null ? prevResult.getAdjustedAmount() : inputPaymentRoutingContext.getAmount(),
+ prevResult.getAdjustedCurrency() != null ? prevResult.getAdjustedCurrency() : inputPaymentRoutingContext.getCurrency(),
paymentStateContext.getProperties(),
retryablePaymentStateContext.isApiPayment(),
paymentStateContext.callContext);
@@ -243,7 +243,7 @@ public abstract class RetryOperationCallback extends OperationCallbackBase<Payme
return prevResult;
}
- private OperationResult getOperationResultAndSetContext(final RetryablePaymentStateContext retryablePaymentStateContext, final PaymentControlContext paymentControlContext) {
+ private OperationResult getOperationResultAndSetContext(final RetryablePaymentStateContext retryablePaymentStateContext, final PaymentRoutingContext paymentControlContext) {
final DateTime retryDate = getNextRetryDate(retryablePaymentStateContext.getPaymentControlPluginNames(), paymentControlContext);
if (retryDate != null) {
((RetryablePaymentStateContext) paymentStateContext).setRetryDate(retryDate);
@@ -253,19 +253,19 @@ public abstract class RetryOperationCallback extends OperationCallbackBase<Payme
}
}
- private DateTime getNextRetryDate(final List<String> paymentControlPluginNames, final PaymentControlContext paymentControlContext) {
+ private DateTime getNextRetryDate(final List<String> paymentControlPluginNames, final PaymentRoutingContext paymentControlContext) {
DateTime candidate = null;
for (String pluginName : paymentControlPluginNames) {
- final PaymentControlPluginApi plugin = paymentControlPluginRegistry.getServiceForName(pluginName);
+ final PaymentRoutingPluginApi plugin = paymentControlPluginRegistry.getServiceForName(pluginName);
if (plugin != null) {
try {
- final FailureCallResult result = plugin.onFailureCall(paymentControlContext, paymentStateContext.getProperties());
+ final OnFailurePaymentRoutingResult result = plugin.onFailureCall(paymentControlContext, paymentStateContext.getProperties());
if (candidate == null) {
candidate = result.getNextRetryDate();
} else if (result.getNextRetryDate() != null) {
candidate = candidate.compareTo(result.getNextRetryDate()) > 0 ? result.getNextRetryDate() : candidate;
}
- } catch (final PaymentControlApiException e) {
+ } catch (final PaymentRoutingApiException e) {
logger.warn("Plugin " + pluginName + " failed to return next retryDate for payment " + paymentControlContext.getPaymentExternalKey(), e);
return candidate;
}
@@ -274,7 +274,7 @@ public abstract class RetryOperationCallback extends OperationCallbackBase<Payme
return candidate;
}
- public static class DefaultPaymentControlContext extends DefaultCallContext implements PaymentControlContext {
+ public static class DefaultPaymentRoutingContext extends DefaultCallContext implements PaymentRoutingContext {
private final Account account;
private final UUID paymentMethodId;
@@ -291,12 +291,12 @@ public abstract class RetryOperationCallback extends OperationCallbackBase<Payme
private final boolean isApiPayment;
private final Iterable<PluginProperty> properties;
- public DefaultPaymentControlContext(final Account account, final UUID paymentMethodId, final UUID attemptId, @Nullable final UUID paymentId, final String paymentExternalKey, final String transactionExternalKey, final TransactionType transactionType, final BigDecimal amount, final Currency currency,
+ public DefaultPaymentRoutingContext(final Account account, final UUID paymentMethodId, final UUID attemptId, @Nullable final UUID paymentId, final String paymentExternalKey, final String transactionExternalKey, final TransactionType transactionType, final BigDecimal amount, final Currency currency,
final Iterable<PluginProperty> properties, final boolean isApiPayment, final CallContext callContext) {
this(account, paymentMethodId, attemptId, paymentId, paymentExternalKey, null, transactionExternalKey, transactionType, amount, currency, null, null, properties, isApiPayment, callContext);
}
- public DefaultPaymentControlContext(final Account account, final UUID paymentMethodId, final UUID attemptId, @Nullable final UUID paymentId, final String paymentExternalKey, @Nullable final UUID transactionId, final String transactionExternalKey, final TransactionType transactionType,
+ public DefaultPaymentRoutingContext(final Account account, final UUID paymentMethodId, final UUID attemptId, @Nullable final UUID paymentId, final String paymentExternalKey, @Nullable final UUID transactionId, final String transactionExternalKey, final TransactionType transactionType,
final BigDecimal amount, final Currency currency, @Nullable final BigDecimal processedAmount, @Nullable final Currency processedCurrency, final Iterable<PluginProperty> properties, final boolean isApiPayment, final CallContext callContext) {
super(callContext.getTenantId(), callContext.getUserName(), callContext.getCallOrigin(), callContext.getUserType(), callContext.getReasonCode(), callContext.getComments(), callContext.getUserToken(), callContext.getCreatedDate(), callContext.getUpdatedDate());
this.account = account;
@@ -386,7 +386,7 @@ public abstract class RetryOperationCallback extends OperationCallbackBase<Payme
@Override
public String toString() {
- return "DefaultPaymentControlContext{" +
+ return "DefaultPaymentRoutingContext{" +
"account=" + account +
", paymentMethodId=" + paymentMethodId +
", attemptId=" + attemptId +
diff --git a/payment/src/main/java/org/killbill/billing/payment/core/sm/RetryPurchaseOperationCallback.java b/payment/src/main/java/org/killbill/billing/payment/core/sm/RetryPurchaseOperationCallback.java
index 5154d4f..111935c 100644
--- a/payment/src/main/java/org/killbill/billing/payment/core/sm/RetryPurchaseOperationCallback.java
+++ b/payment/src/main/java/org/killbill/billing/payment/core/sm/RetryPurchaseOperationCallback.java
@@ -22,29 +22,29 @@ import org.killbill.billing.payment.api.Payment;
import org.killbill.billing.payment.api.PaymentApiException;
import org.killbill.billing.payment.core.PaymentProcessor;
import org.killbill.billing.payment.dispatcher.PluginDispatcher;
-import org.killbill.billing.retry.plugin.api.PaymentControlPluginApi;
+import org.killbill.billing.routing.plugin.api.PaymentRoutingPluginApi;
import org.killbill.commons.locker.GlobalLocker;
public class RetryPurchaseOperationCallback extends RetryOperationCallback {
- public RetryPurchaseOperationCallback(final GlobalLocker locker, final PluginDispatcher<OperationResult> paymentPluginDispatcher, final RetryablePaymentStateContext paymentStateContext, final PaymentProcessor paymentProcessor, final OSGIServiceRegistration<PaymentControlPluginApi> retryPluginRegistry) {
+ public RetryPurchaseOperationCallback(final GlobalLocker locker, final PluginDispatcher<OperationResult> paymentPluginDispatcher, final RetryablePaymentStateContext paymentStateContext, final PaymentProcessor paymentProcessor, final OSGIServiceRegistration<PaymentRoutingPluginApi> retryPluginRegistry) {
super(locker, paymentPluginDispatcher, paymentStateContext, paymentProcessor, retryPluginRegistry);
}
@Override
protected Payment doCallSpecificOperationCallback() throws PaymentApiException {
return paymentProcessor.createPurchase(retryablePaymentStateContext.isApiPayment(),
- retryablePaymentStateContext.getAttemptId(),
- retryablePaymentStateContext.getAccount(),
- retryablePaymentStateContext.getPaymentMethodId(),
- retryablePaymentStateContext.getPaymentId(),
- retryablePaymentStateContext.getAmount(),
- retryablePaymentStateContext.getCurrency(),
- retryablePaymentStateContext.getPaymentExternalKey(),
- retryablePaymentStateContext.getPaymentTransactionExternalKey(),
- false,
- retryablePaymentStateContext.getProperties(),
- retryablePaymentStateContext.getCallContext(),
- retryablePaymentStateContext.getInternalCallContext());
+ retryablePaymentStateContext.getAttemptId(),
+ retryablePaymentStateContext.getAccount(),
+ retryablePaymentStateContext.getPaymentMethodId(),
+ retryablePaymentStateContext.getPaymentId(),
+ retryablePaymentStateContext.getAmount(),
+ retryablePaymentStateContext.getCurrency(),
+ retryablePaymentStateContext.getPaymentExternalKey(),
+ retryablePaymentStateContext.getPaymentTransactionExternalKey(),
+ false,
+ retryablePaymentStateContext.getProperties(),
+ retryablePaymentStateContext.getCallContext(),
+ retryablePaymentStateContext.getInternalCallContext());
}
}
diff --git a/payment/src/main/java/org/killbill/billing/payment/core/sm/RetryRefundOperationCallback.java b/payment/src/main/java/org/killbill/billing/payment/core/sm/RetryRefundOperationCallback.java
index f4cb3c0..0952c83 100644
--- a/payment/src/main/java/org/killbill/billing/payment/core/sm/RetryRefundOperationCallback.java
+++ b/payment/src/main/java/org/killbill/billing/payment/core/sm/RetryRefundOperationCallback.java
@@ -22,27 +22,27 @@ import org.killbill.billing.payment.api.Payment;
import org.killbill.billing.payment.api.PaymentApiException;
import org.killbill.billing.payment.core.PaymentProcessor;
import org.killbill.billing.payment.dispatcher.PluginDispatcher;
-import org.killbill.billing.retry.plugin.api.PaymentControlPluginApi;
+import org.killbill.billing.routing.plugin.api.PaymentRoutingPluginApi;
import org.killbill.commons.locker.GlobalLocker;
public class RetryRefundOperationCallback extends RetryOperationCallback {
- public RetryRefundOperationCallback(final GlobalLocker locker, final PluginDispatcher<OperationResult> paymentPluginDispatcher, final RetryablePaymentStateContext paymentStateContext, final PaymentProcessor paymentProcessor, final OSGIServiceRegistration<PaymentControlPluginApi> paymentControlPluginRegistry) {
+ public RetryRefundOperationCallback(final GlobalLocker locker, final PluginDispatcher<OperationResult> paymentPluginDispatcher, final RetryablePaymentStateContext paymentStateContext, final PaymentProcessor paymentProcessor, final OSGIServiceRegistration<PaymentRoutingPluginApi> paymentControlPluginRegistry) {
super(locker, paymentPluginDispatcher, paymentStateContext, paymentProcessor, paymentControlPluginRegistry);
}
@Override
protected Payment doCallSpecificOperationCallback() throws PaymentApiException {
return paymentProcessor.createRefund(retryablePaymentStateContext.isApiPayment(),
- retryablePaymentStateContext.getAttemptId(),
- retryablePaymentStateContext.getAccount(),
- retryablePaymentStateContext.getPaymentId(),
- retryablePaymentStateContext.getAmount(),
- retryablePaymentStateContext.getCurrency(),
- retryablePaymentStateContext.getPaymentTransactionExternalKey(),
- false,
- retryablePaymentStateContext.getProperties(),
- retryablePaymentStateContext.getCallContext(),
- retryablePaymentStateContext.getInternalCallContext());
+ retryablePaymentStateContext.getAttemptId(),
+ retryablePaymentStateContext.getAccount(),
+ retryablePaymentStateContext.getPaymentId(),
+ retryablePaymentStateContext.getAmount(),
+ retryablePaymentStateContext.getCurrency(),
+ retryablePaymentStateContext.getPaymentTransactionExternalKey(),
+ false,
+ retryablePaymentStateContext.getProperties(),
+ retryablePaymentStateContext.getCallContext(),
+ retryablePaymentStateContext.getInternalCallContext());
}
}
diff --git a/payment/src/main/java/org/killbill/billing/payment/core/sm/RetryVoidOperationCallback.java b/payment/src/main/java/org/killbill/billing/payment/core/sm/RetryVoidOperationCallback.java
index 090e2e0..f55f5e9 100644
--- a/payment/src/main/java/org/killbill/billing/payment/core/sm/RetryVoidOperationCallback.java
+++ b/payment/src/main/java/org/killbill/billing/payment/core/sm/RetryVoidOperationCallback.java
@@ -22,25 +22,25 @@ import org.killbill.billing.payment.api.Payment;
import org.killbill.billing.payment.api.PaymentApiException;
import org.killbill.billing.payment.core.PaymentProcessor;
import org.killbill.billing.payment.dispatcher.PluginDispatcher;
-import org.killbill.billing.retry.plugin.api.PaymentControlPluginApi;
+import org.killbill.billing.routing.plugin.api.PaymentRoutingPluginApi;
import org.killbill.commons.locker.GlobalLocker;
public class RetryVoidOperationCallback extends RetryOperationCallback {
- public RetryVoidOperationCallback(final GlobalLocker locker, final PluginDispatcher<OperationResult> paymentPluginDispatcher, final RetryablePaymentStateContext paymentStateContext, final PaymentProcessor paymentProcessor, final OSGIServiceRegistration<PaymentControlPluginApi> paymentControlPluginRegistry) {
+ public RetryVoidOperationCallback(final GlobalLocker locker, final PluginDispatcher<OperationResult> paymentPluginDispatcher, final RetryablePaymentStateContext paymentStateContext, final PaymentProcessor paymentProcessor, final OSGIServiceRegistration<PaymentRoutingPluginApi> paymentControlPluginRegistry) {
super(locker, paymentPluginDispatcher, paymentStateContext, paymentProcessor, paymentControlPluginRegistry);
}
@Override
protected Payment doCallSpecificOperationCallback() throws PaymentApiException {
return paymentProcessor.createVoid(retryablePaymentStateContext.isApiPayment(),
- retryablePaymentStateContext.getAttemptId(),
- retryablePaymentStateContext.getAccount(),
- retryablePaymentStateContext.getPaymentId(),
- retryablePaymentStateContext.getPaymentTransactionExternalKey(),
- false,
- retryablePaymentStateContext.getProperties(),
- retryablePaymentStateContext.getCallContext(),
- retryablePaymentStateContext.getInternalCallContext());
+ retryablePaymentStateContext.getAttemptId(),
+ retryablePaymentStateContext.getAccount(),
+ retryablePaymentStateContext.getPaymentId(),
+ retryablePaymentStateContext.getPaymentTransactionExternalKey(),
+ false,
+ retryablePaymentStateContext.getProperties(),
+ retryablePaymentStateContext.getCallContext(),
+ retryablePaymentStateContext.getInternalCallContext());
}
}
diff --git a/payment/src/main/java/org/killbill/billing/payment/glue/DefaultPaymentService.java b/payment/src/main/java/org/killbill/billing/payment/glue/DefaultPaymentService.java
index 7dc8b60..5cf77f0 100644
--- a/payment/src/main/java/org/killbill/billing/payment/glue/DefaultPaymentService.java
+++ b/payment/src/main/java/org/killbill/billing/payment/glue/DefaultPaymentService.java
@@ -21,7 +21,7 @@ package org.killbill.billing.payment.glue;
import org.killbill.billing.payment.api.PaymentApi;
import org.killbill.billing.payment.api.PaymentService;
import org.killbill.billing.payment.bus.InvoiceHandler;
-import org.killbill.billing.payment.control.PaymentTagHandler;
+import org.killbill.billing.payment.invoice.PaymentTagHandler;
import org.killbill.billing.payment.core.janitor.Janitor;
import org.killbill.billing.payment.retry.DefaultRetryService;
import org.killbill.billing.platform.api.LifecycleHandlerType;
diff --git a/payment/src/main/java/org/killbill/billing/payment/glue/PaymentModule.java b/payment/src/main/java/org/killbill/billing/payment/glue/PaymentModule.java
index 23a7581..72741f9 100644
--- a/payment/src/main/java/org/killbill/billing/payment/glue/PaymentModule.java
+++ b/payment/src/main/java/org/killbill/billing/payment/glue/PaymentModule.java
@@ -35,15 +35,15 @@ import org.killbill.billing.payment.api.PaymentApi;
import org.killbill.billing.payment.api.PaymentGatewayApi;
import org.killbill.billing.payment.api.PaymentService;
import org.killbill.billing.payment.bus.InvoiceHandler;
-import org.killbill.billing.payment.control.PaymentTagHandler;
-import org.killbill.billing.payment.control.dao.InvoicePaymentControlDao;
+import org.killbill.billing.payment.invoice.PaymentTagHandler;
+import org.killbill.billing.payment.invoice.dao.InvoicePaymentRoutingDao;
import org.killbill.billing.payment.core.janitor.Janitor;
import org.killbill.billing.payment.core.PaymentGatewayProcessor;
import org.killbill.billing.payment.core.PaymentMethodProcessor;
import org.killbill.billing.payment.core.PaymentProcessor;
-import org.killbill.billing.payment.core.PluginControlledPaymentProcessor;
+import org.killbill.billing.payment.core.PluginRoutingPaymentProcessor;
import org.killbill.billing.payment.core.sm.PaymentStateMachineHelper;
-import org.killbill.billing.payment.core.sm.PluginControlledPaymentAutomatonRunner;
+import org.killbill.billing.payment.core.sm.PluginRoutingPaymentAutomatonRunner;
import org.killbill.billing.payment.core.sm.RetryStateMachineHelper;
import org.killbill.billing.payment.dao.DefaultPaymentDao;
import org.killbill.billing.payment.dao.PaymentDao;
@@ -53,7 +53,7 @@ import org.killbill.billing.payment.retry.DefaultRetryService;
import org.killbill.billing.payment.retry.DefaultRetryService.DefaultRetryServiceScheduler;
import org.killbill.billing.payment.retry.RetryService;
import org.killbill.billing.platform.api.KillbillConfigSource;
-import org.killbill.billing.retry.plugin.api.PaymentControlPluginApi;
+import org.killbill.billing.routing.plugin.api.PaymentRoutingPluginApi;
import org.killbill.billing.util.config.PaymentConfig;
import org.killbill.billing.util.glue.KillBillModule;
import org.killbill.commons.concurrent.WithProfilingThreadPoolExecutor;
@@ -83,7 +83,7 @@ public class PaymentModule extends KillBillModule {
protected void installPaymentDao() {
bind(PaymentDao.class).to(DefaultPaymentDao.class).asEagerSingleton();
// Payment Control Plugin Dao
- bind(InvoicePaymentControlDao.class).asEagerSingleton();
+ bind(InvoicePaymentRoutingDao.class).asEagerSingleton();
}
protected void installPaymentProviderPlugins(final PaymentConfig config) {
@@ -134,7 +134,7 @@ public class PaymentModule extends KillBillModule {
}
protected void installAutomatonRunner() {
- bind(PluginControlledPaymentAutomatonRunner.class).asEagerSingleton();
+ bind(PluginRoutingPaymentAutomatonRunner.class).asEagerSingleton();
}
protected void installProcessors(final PaymentConfig paymentConfig) {
@@ -153,7 +153,7 @@ public class PaymentModule extends KillBillModule {
});
bind(ExecutorService.class).annotatedWith(Names.named(PLUGIN_EXECUTOR_NAMED)).toInstance(pluginExecutorService);
bind(PaymentProcessor.class).asEagerSingleton();
- bind(PluginControlledPaymentProcessor.class).asEagerSingleton();
+ bind(PluginRoutingPaymentProcessor.class).asEagerSingleton();
bind(PaymentGatewayProcessor.class).asEagerSingleton();
bind(PaymentMethodProcessor.class).asEagerSingleton();
}
@@ -165,7 +165,7 @@ public class PaymentModule extends KillBillModule {
bind(PaymentConfig.class).toInstance(paymentConfig);
bind(new TypeLiteral<OSGIServiceRegistration<PaymentPluginApi>>() {}).toProvider(DefaultPaymentProviderPluginRegistryProvider.class).asEagerSingleton();
- bind(new TypeLiteral<OSGIServiceRegistration<PaymentControlPluginApi>>() {}).toProvider(DefaultPaymentControlProviderPluginRegistryProvider.class).asEagerSingleton();
+ bind(new TypeLiteral<OSGIServiceRegistration<PaymentRoutingPluginApi>>() {}).toProvider(DefaultPaymentRoutingProviderPluginRegistryProvider.class).asEagerSingleton();
bind(PaymentApi.class).to(DefaultPaymentApi.class).asEagerSingleton();
bind(PaymentGatewayApi.class).to(DefaultPaymentGatewayApi.class).asEagerSingleton();
diff --git a/payment/src/main/java/org/killbill/billing/payment/retry/DefaultFailureCallResult.java b/payment/src/main/java/org/killbill/billing/payment/retry/DefaultFailureCallResult.java
index 6fad9f9..b3121c6 100644
--- a/payment/src/main/java/org/killbill/billing/payment/retry/DefaultFailureCallResult.java
+++ b/payment/src/main/java/org/killbill/billing/payment/retry/DefaultFailureCallResult.java
@@ -17,9 +17,9 @@
package org.killbill.billing.payment.retry;
import org.joda.time.DateTime;
-import org.killbill.billing.retry.plugin.api.FailureCallResult;
+import org.killbill.billing.routing.plugin.api.OnFailurePaymentRoutingResult;
-public class DefaultFailureCallResult implements FailureCallResult {
+public class DefaultFailureCallResult implements OnFailurePaymentRoutingResult {
private final DateTime nextRetryDate;
diff --git a/payment/src/main/java/org/killbill/billing/payment/retry/DefaultRetryService.java b/payment/src/main/java/org/killbill/billing/payment/retry/DefaultRetryService.java
index b7e94a5..eaed99f 100644
--- a/payment/src/main/java/org/killbill/billing/payment/retry/DefaultRetryService.java
+++ b/payment/src/main/java/org/killbill/billing/payment/retry/DefaultRetryService.java
@@ -20,8 +20,7 @@ import java.util.List;
import java.util.UUID;
import org.killbill.billing.callcontext.InternalCallContext;
-import org.killbill.billing.payment.api.PluginProperty;
-import org.killbill.billing.payment.core.PluginControlledPaymentProcessor;
+import org.killbill.billing.payment.core.PluginRoutingPaymentProcessor;
import org.killbill.billing.util.callcontext.InternalCallContextFactory;
import org.killbill.notificationq.api.NotificationQueueService;
@@ -31,10 +30,10 @@ public class DefaultRetryService extends BaseRetryService implements RetryServic
public static final String QUEUE_NAME = "retry";
- private final PluginControlledPaymentProcessor processor;
+ private final PluginRoutingPaymentProcessor processor;
@Inject
- public DefaultRetryService(final NotificationQueueService notificationQueueService, final InternalCallContextFactory internalCallContextFactory, final PluginControlledPaymentProcessor processor) {
+ public DefaultRetryService(final NotificationQueueService notificationQueueService, final InternalCallContextFactory internalCallContextFactory, final PluginRoutingPaymentProcessor processor) {
super(notificationQueueService, internalCallContextFactory);
this.processor = processor;
}
diff --git a/payment/src/test/java/org/killbill/billing/payment/api/TestPaymentApi.java b/payment/src/test/java/org/killbill/billing/payment/api/TestPaymentApi.java
index 38eb6ad..e0fc119 100644
--- a/payment/src/test/java/org/killbill/billing/payment/api/TestPaymentApi.java
+++ b/payment/src/test/java/org/killbill/billing/payment/api/TestPaymentApi.java
@@ -33,10 +33,10 @@ import org.killbill.billing.invoice.api.InvoiceApiException;
import org.killbill.billing.invoice.api.InvoiceItem;
import org.killbill.billing.payment.MockRecurringInvoiceItem;
import org.killbill.billing.payment.PaymentTestSuiteWithEmbeddedDB;
-import org.killbill.billing.payment.control.InvoicePaymentControlPluginApi;
+import org.killbill.billing.payment.invoice.InvoicePaymentRoutingPluginApi;
import org.killbill.billing.payment.dao.PaymentAttemptModelDao;
import org.killbill.billing.payment.dao.PaymentSqlDao;
-import org.killbill.billing.retry.plugin.api.PaymentControlApiException;
+import org.killbill.billing.routing.plugin.api.PaymentRoutingApiException;
import org.killbill.bus.api.PersistentBus.EventBusException;
import org.testng.Assert;
import org.testng.annotations.BeforeClass;
@@ -58,7 +58,7 @@ public class TestPaymentApi extends PaymentTestSuiteWithEmbeddedDB {
@Override
public List<String> getPaymentControlPluginNames() {
- return ImmutableList.<String>of(InvoicePaymentControlPluginApi.PLUGIN_NAME);
+ return ImmutableList.<String>of(InvoicePaymentRoutingPluginApi.PLUGIN_NAME);
}
};
@@ -297,7 +297,7 @@ public class TestPaymentApi extends PaymentTestSuiteWithEmbeddedDB {
createPropertiesForInvoice(invoice), INVOICE_PAYMENT, callContext);
Assert.fail("Unexpected success");
} catch (PaymentApiException e) {
- assertTrue(e.getCause() instanceof PaymentControlApiException);
+ assertTrue(e.getCause() instanceof PaymentRoutingApiException);
}
}
@@ -378,7 +378,7 @@ public class TestPaymentApi extends PaymentTestSuiteWithEmbeddedDB {
paymentApi.createRefundWithPaymentControl(account, payment.getId(), BigDecimal.TEN, Currency.USD, transactionExternalKey2,
refundProperties, INVOICE_PAYMENT, callContext);
} catch (PaymentApiException e) {
- assertTrue(e.getCause() instanceof PaymentControlApiException);
+ assertTrue(e.getCause() instanceof PaymentRoutingApiException);
}
}
@@ -413,7 +413,7 @@ public class TestPaymentApi extends PaymentTestSuiteWithEmbeddedDB {
final List<PluginProperty> refundProperties = new ArrayList<PluginProperty>();
final HashMap<UUID, BigDecimal> uuidBigDecimalHashMap = new HashMap<UUID, BigDecimal>();
uuidBigDecimalHashMap.put(invoiceItem.getId(), null);
- final PluginProperty refundIdsProp = new PluginProperty(InvoicePaymentControlPluginApi.PROP_IPCD_REFUND_IDS_WITH_AMOUNT_KEY, uuidBigDecimalHashMap, false);
+ final PluginProperty refundIdsProp = new PluginProperty(InvoicePaymentRoutingPluginApi.PROP_IPCD_REFUND_IDS_WITH_AMOUNT_KEY, uuidBigDecimalHashMap, false);
refundProperties.add(refundIdsProp);
final Payment payment2 = paymentApi.createRefundWithPaymentControl(account, payment.getId(), null, Currency.USD, transactionExternalKey2,
@@ -590,7 +590,7 @@ public class TestPaymentApi extends PaymentTestSuiteWithEmbeddedDB {
private List<PluginProperty> createPropertiesForInvoice(final Invoice invoice) {
final List<PluginProperty> result = new ArrayList<PluginProperty>();
- result.add(new PluginProperty(InvoicePaymentControlPluginApi.PROP_IPCD_INVOICE_ID, invoice.getId().toString(), false));
+ result.add(new PluginProperty(InvoicePaymentRoutingPluginApi.PROP_IPCD_INVOICE_ID, invoice.getId().toString(), false));
return result;
}
}
diff --git a/payment/src/test/java/org/killbill/billing/payment/api/TestPaymentApiNoDB.java b/payment/src/test/java/org/killbill/billing/payment/api/TestPaymentApiNoDB.java
index fd55a2c..a56aa02 100644
--- a/payment/src/test/java/org/killbill/billing/payment/api/TestPaymentApiNoDB.java
+++ b/payment/src/test/java/org/killbill/billing/payment/api/TestPaymentApiNoDB.java
@@ -29,7 +29,7 @@ import org.killbill.billing.catalog.api.Currency;
import org.killbill.billing.invoice.api.Invoice;
import org.killbill.billing.payment.MockRecurringInvoiceItem;
import org.killbill.billing.payment.PaymentTestSuiteNoDB;
-import org.killbill.billing.payment.control.InvoicePaymentControlPluginApi;
+import org.killbill.billing.payment.invoice.InvoicePaymentRoutingPluginApi;
import org.killbill.billing.payment.provider.DefaultNoOpPaymentMethodPlugin;
import org.killbill.billing.payment.provider.MockPaymentProviderPlugin;
import org.mockito.Mockito;
@@ -58,7 +58,7 @@ public class TestPaymentApiNoDB extends PaymentTestSuiteNoDB {
}
@Override
public List<String> getPaymentControlPluginNames() {
- return ImmutableList.<String>of(InvoicePaymentControlPluginApi.PLUGIN_NAME);
+ return ImmutableList.<String>of(InvoicePaymentRoutingPluginApi.PLUGIN_NAME);
}
};
@@ -133,7 +133,7 @@ public class TestPaymentApiNoDB extends PaymentTestSuiteNoDB {
try {
final List<PluginProperty> properties = new ArrayList<PluginProperty>();
- final PluginProperty prop1 = new PluginProperty(InvoicePaymentControlPluginApi.PROP_IPCD_INVOICE_ID, invoice.getId().toString(), false);
+ final PluginProperty prop1 = new PluginProperty(InvoicePaymentRoutingPluginApi.PROP_IPCD_INVOICE_ID, invoice.getId().toString(), false);
properties.add(prop1);
final Payment paymentInfo = paymentApi.createPurchaseWithPaymentControl(account, account.getPaymentMethodId(), null, requestedAmount, account.getCurrency(),
diff --git a/payment/src/test/java/org/killbill/billing/payment/core/sm/MockRetryablePaymentAutomatonRunner.java b/payment/src/test/java/org/killbill/billing/payment/core/sm/MockRetryablePaymentAutomatonRunner.java
index 918c9b1..749123c 100644
--- a/payment/src/test/java/org/killbill/billing/payment/core/sm/MockRetryablePaymentAutomatonRunner.java
+++ b/payment/src/test/java/org/killbill/billing/payment/core/sm/MockRetryablePaymentAutomatonRunner.java
@@ -41,7 +41,7 @@ import org.killbill.billing.payment.dispatcher.PluginDispatcher;
import org.killbill.billing.payment.glue.PaymentModule;
import org.killbill.billing.payment.plugin.api.PaymentPluginApi;
import org.killbill.billing.payment.retry.BaseRetryService.RetryServiceScheduler;
-import org.killbill.billing.retry.plugin.api.PaymentControlPluginApi;
+import org.killbill.billing.routing.plugin.api.PaymentRoutingPluginApi;
import org.killbill.billing.tag.TagInternalApi;
import org.killbill.billing.util.callcontext.CallContext;
import org.killbill.billing.util.config.PaymentConfig;
@@ -49,18 +49,16 @@ import org.killbill.bus.api.PersistentBus;
import org.killbill.clock.Clock;
import org.killbill.commons.locker.GlobalLocker;
-import com.google.common.collect.ImmutableList;
-
import static org.killbill.billing.payment.glue.PaymentModule.PLUGIN_EXECUTOR_NAMED;
import static org.killbill.billing.payment.glue.PaymentModule.RETRYABLE_NAMED;
-public class MockRetryablePaymentAutomatonRunner extends PluginControlledPaymentAutomatonRunner {
+public class MockRetryablePaymentAutomatonRunner extends PluginRoutingPaymentAutomatonRunner {
private OperationCallback operationCallback;
private RetryablePaymentStateContext context;
@Inject
- public MockRetryablePaymentAutomatonRunner(@Named(PaymentModule.STATE_MACHINE_PAYMENT) final StateMachineConfig stateMachineConfig, @Named(PaymentModule.STATE_MACHINE_RETRY) final StateMachineConfig retryStateMachine, final PaymentDao paymentDao, final GlobalLocker locker, final OSGIServiceRegistration<PaymentPluginApi> pluginRegistry, final OSGIServiceRegistration<PaymentControlPluginApi> retryPluginRegistry, final Clock clock, final TagInternalApi tagApi, final PaymentProcessor paymentProcessor,
+ public MockRetryablePaymentAutomatonRunner(@Named(PaymentModule.STATE_MACHINE_PAYMENT) final StateMachineConfig stateMachineConfig, @Named(PaymentModule.STATE_MACHINE_RETRY) final StateMachineConfig retryStateMachine, final PaymentDao paymentDao, final GlobalLocker locker, final OSGIServiceRegistration<PaymentPluginApi> pluginRegistry, final OSGIServiceRegistration<PaymentRoutingPluginApi> retryPluginRegistry, final Clock clock, final TagInternalApi tagApi, final PaymentProcessor paymentProcessor,
@Named(RETRYABLE_NAMED) final RetryServiceScheduler retryServiceScheduler, final PaymentConfig paymentConfig, @com.google.inject.name.Named(PLUGIN_EXECUTOR_NAMED) final ExecutorService executor,
final PaymentStateMachineHelper paymentSMHelper, final RetryStateMachineHelper retrySMHelper, final PersistentBus eventBus) {
super(stateMachineConfig, paymentDao, locker, pluginRegistry, retryPluginRegistry, clock, paymentProcessor, retryServiceScheduler, paymentConfig, executor, paymentSMHelper, retrySMHelper, eventBus);
@@ -103,7 +101,7 @@ public class MockRetryablePaymentAutomatonRunner extends PluginControlledPayment
return paymentPluginDispatcher;
}
- public OSGIServiceRegistration<PaymentControlPluginApi> getRetryPluginRegistry() {
+ public OSGIServiceRegistration<PaymentRoutingPluginApi> getRetryPluginRegistry() {
return paymentControlPluginRegistry;
}
}
diff --git a/payment/src/test/java/org/killbill/billing/payment/core/sm/MockRetryAuthorizeOperationCallback.java b/payment/src/test/java/org/killbill/billing/payment/core/sm/MockRetryAuthorizeOperationCallback.java
index efd2963..949f245 100644
--- a/payment/src/test/java/org/killbill/billing/payment/core/sm/MockRetryAuthorizeOperationCallback.java
+++ b/payment/src/test/java/org/killbill/billing/payment/core/sm/MockRetryAuthorizeOperationCallback.java
@@ -31,7 +31,7 @@ import org.killbill.billing.payment.dao.PaymentDao;
import org.killbill.billing.payment.dao.PaymentModelDao;
import org.killbill.billing.payment.dao.PaymentTransactionModelDao;
import org.killbill.billing.payment.dispatcher.PluginDispatcher;
-import org.killbill.billing.retry.plugin.api.PaymentControlPluginApi;
+import org.killbill.billing.routing.plugin.api.PaymentRoutingPluginApi;
import org.killbill.clock.Clock;
import org.killbill.commons.locker.GlobalLocker;
@@ -43,7 +43,7 @@ public class MockRetryAuthorizeOperationCallback extends RetryAuthorizeOperation
private Exception exception;
private OperationResult result;
- public MockRetryAuthorizeOperationCallback(final GlobalLocker locker, final PluginDispatcher<OperationResult> paymentPluginDispatcher, final RetryablePaymentStateContext paymentStateContext, final PaymentProcessor paymentProcessor, final OSGIServiceRegistration<PaymentControlPluginApi> retryPluginRegistry, final PaymentDao paymentDao, final Clock clock) {
+ public MockRetryAuthorizeOperationCallback(final GlobalLocker locker, final PluginDispatcher<OperationResult> paymentPluginDispatcher, final RetryablePaymentStateContext paymentStateContext, final PaymentProcessor paymentProcessor, final OSGIServiceRegistration<PaymentRoutingPluginApi> retryPluginRegistry, final PaymentDao paymentDao, final Clock clock) {
super(locker, paymentPluginDispatcher, paymentStateContext, paymentProcessor, retryPluginRegistry);
this.paymentDao = paymentDao;
this.clock = clock;
diff --git a/payment/src/test/java/org/killbill/billing/payment/core/sm/TestRetryablePayment.java b/payment/src/test/java/org/killbill/billing/payment/core/sm/TestRetryablePayment.java
index 71cb99e..110bb1b 100644
--- a/payment/src/test/java/org/killbill/billing/payment/core/sm/TestRetryablePayment.java
+++ b/payment/src/test/java/org/killbill/billing/payment/core/sm/TestRetryablePayment.java
@@ -39,7 +39,7 @@ import org.killbill.billing.payment.api.PluginProperty;
import org.killbill.billing.payment.api.TransactionStatus;
import org.killbill.billing.payment.api.TransactionType;
import org.killbill.billing.payment.core.PaymentProcessor;
-import org.killbill.billing.payment.core.PluginControlledPaymentProcessor;
+import org.killbill.billing.payment.core.PluginRoutingPaymentProcessor;
import org.killbill.billing.payment.dao.MockPaymentDao;
import org.killbill.billing.payment.dao.PaymentAttemptModelDao;
import org.killbill.billing.payment.dao.PaymentDao;
@@ -48,9 +48,9 @@ import org.killbill.billing.payment.dao.PaymentTransactionModelDao;
import org.killbill.billing.payment.dao.PluginPropertySerializer;
import org.killbill.billing.payment.glue.PaymentModule;
import org.killbill.billing.payment.plugin.api.PaymentPluginApi;
-import org.killbill.billing.payment.provider.MockPaymentControlProviderPlugin;
+import org.killbill.billing.payment.provider.MockPaymentRoutingProviderPlugin;
import org.killbill.billing.payment.retry.BaseRetryService.RetryServiceScheduler;
-import org.killbill.billing.retry.plugin.api.PaymentControlPluginApi;
+import org.killbill.billing.routing.plugin.api.PaymentRoutingPluginApi;
import org.killbill.billing.tag.TagInternalApi;
import org.killbill.billing.util.dao.NonEntityDao;
import org.killbill.billing.util.globallocker.LockerType;
@@ -90,7 +90,7 @@ public class TestRetryablePayment extends PaymentTestSuiteNoDB {
@Inject
private OSGIServiceRegistration<PaymentPluginApi> pluginRegistry;
@Inject
- private OSGIServiceRegistration<PaymentControlPluginApi> retryPluginRegistry;
+ private OSGIServiceRegistration<PaymentRoutingPluginApi> retryPluginRegistry;
@Inject
private TagInternalApi tagApi;
@Inject
@@ -115,13 +115,13 @@ public class TestRetryablePayment extends PaymentTestSuiteNoDB {
private final BigDecimal amount = BigDecimal.ONE;
private final Currency currency = Currency.EUR;
private final ImmutableList<PluginProperty> emptyProperties = ImmutableList.of();
- private final MockPaymentControlProviderPlugin mockRetryProviderPlugin = new MockPaymentControlProviderPlugin();
+ private final MockPaymentRoutingProviderPlugin mockRetryProviderPlugin = new MockPaymentRoutingProviderPlugin();
- private byte [] EMPTY_PROPERTIES;
+ private byte[] EMPTY_PROPERTIES;
private MockRetryablePaymentAutomatonRunner runner;
private RetryablePaymentStateContext paymentStateContext;
private MockRetryAuthorizeOperationCallback mockRetryAuthorizeOperationCallback;
- private PluginControlledPaymentProcessor processor;
+ private PluginRoutingPaymentProcessor processor;
@BeforeClass(groups = "fast")
public void beforeClass() throws Exception {
@@ -137,7 +137,7 @@ public class TestRetryablePayment extends PaymentTestSuiteNoDB {
@Override
public String getRegistrationName() {
- return MockPaymentControlProviderPlugin.PLUGIN_NAME;
+ return MockPaymentRoutingProviderPlugin.PLUGIN_NAME;
}
}, mockRetryProviderPlugin);
EMPTY_PROPERTIES = PluginPropertySerializer.serialize(ImmutableList.<PluginProperty>of());
@@ -167,19 +167,19 @@ public class TestRetryablePayment extends PaymentTestSuiteNoDB {
eventBus);
paymentStateContext =
- new RetryablePaymentStateContext(ImmutableList.<String>of(MockPaymentControlProviderPlugin.PLUGIN_NAME),
- true,
- null,
- paymentExternalKey,
- paymentTransactionExternalKey,
- TransactionType.AUTHORIZE,
- account,
- paymentMethodId,
- amount,
- currency,
- emptyProperties,
- internalCallContext,
- callContext);
+ new RetryablePaymentStateContext(ImmutableList.<String>of(MockPaymentRoutingProviderPlugin.PLUGIN_NAME),
+ true,
+ null,
+ paymentExternalKey,
+ paymentTransactionExternalKey,
+ TransactionType.AUTHORIZE,
+ account,
+ paymentMethodId,
+ amount,
+ currency,
+ emptyProperties,
+ internalCallContext,
+ callContext);
mockRetryAuthorizeOperationCallback =
new MockRetryAuthorizeOperationCallback(locker,
@@ -190,18 +190,18 @@ public class TestRetryablePayment extends PaymentTestSuiteNoDB {
paymentDao,
clock);
- processor = new PluginControlledPaymentProcessor(pluginRegistry,
- accountInternalApi,
- null,
- tagApi,
- paymentDao,
- nonEntityDao,
- locker,
- executor,
- runner,
- retrySMHelper,
- clock,
- cacheControllerDispatcher);
+ processor = new PluginRoutingPaymentProcessor(pluginRegistry,
+ accountInternalApi,
+ null,
+ tagApi,
+ paymentDao,
+ nonEntityDao,
+ locker,
+ executor,
+ runner,
+ retrySMHelper,
+ clock,
+ cacheControllerDispatcher);
}
@@ -623,16 +623,16 @@ public class TestRetryablePayment extends PaymentTestSuiteNoDB {
final UUID transactionId = UUID.randomUUID();
final UUID paymentId = UUID.randomUUID();
final PaymentAttemptModelDao attempt = new PaymentAttemptModelDao(account.getId(), paymentMethodId, utcNow, utcNow,
- paymentExternalKey, transactionId, paymentTransactionExternalKey,
- TransactionType.AUTHORIZE, state.getName(), amount, currency, null, EMPTY_PROPERTIES);
+ paymentExternalKey, transactionId, paymentTransactionExternalKey,
+ TransactionType.AUTHORIZE, state.getName(), amount, currency, null, EMPTY_PROPERTIES);
paymentDao.insertPaymentAttemptWithProperties(attempt,
internalCallContext
);
paymentDao.insertPaymentWithFirstTransaction(new PaymentModelDao(paymentId, utcNow, utcNow, account.getId(), paymentMethodId, -1, paymentExternalKey),
- new PaymentTransactionModelDao(transactionId, attempt.getId(), paymentTransactionExternalKey, utcNow, utcNow, paymentId, TransactionType.AUTHORIZE, utcNow, TransactionStatus.PAYMENT_FAILURE, amount, currency, "bla", "foo"),
- internalCallContext);
+ new PaymentTransactionModelDao(transactionId, attempt.getId(), paymentTransactionExternalKey, utcNow, utcNow, paymentId, TransactionType.AUTHORIZE, utcNow, TransactionStatus.PAYMENT_FAILURE, amount, currency, "bla", "foo"),
+ internalCallContext);
- processor.retryPaymentTransaction(attempt.getId(), ImmutableList.<String>of(MockPaymentControlProviderPlugin.PLUGIN_NAME), internalCallContext);
+ processor.retryPaymentTransaction(attempt.getId(), ImmutableList.<String>of(MockPaymentRoutingProviderPlugin.PLUGIN_NAME), internalCallContext);
final List<PaymentAttemptModelDao> pas = paymentDao.getPaymentAttemptByTransactionExternalKey(paymentTransactionExternalKey, internalCallContext);
assertEquals(pas.size(), 2);
@@ -665,18 +665,18 @@ public class TestRetryablePayment extends PaymentTestSuiteNoDB {
final UUID transactionId = UUID.randomUUID();
final UUID paymentId = UUID.randomUUID();
final PaymentAttemptModelDao attempt = new PaymentAttemptModelDao(account.getId(), paymentMethodId, utcNow, utcNow,
- paymentExternalKey, transactionId, paymentTransactionExternalKey,
- TransactionType.AUTHORIZE, state.getName(), amount, currency, null, EMPTY_PROPERTIES);
+ paymentExternalKey, transactionId, paymentTransactionExternalKey,
+ TransactionType.AUTHORIZE, state.getName(), amount, currency, null, EMPTY_PROPERTIES);
paymentDao.insertPaymentAttemptWithProperties(attempt,
internalCallContext
);
paymentDao.insertPaymentWithFirstTransaction(new PaymentModelDao(paymentId, utcNow, utcNow, account.getId(), paymentMethodId, -1, paymentExternalKey),
- new PaymentTransactionModelDao(transactionId, attempt.getId(), paymentTransactionExternalKey, utcNow, utcNow, paymentId, TransactionType.AUTHORIZE, utcNow,
- TransactionStatus.PAYMENT_FAILURE, amount, currency, "bla", "foo"),
- internalCallContext
- );
+ new PaymentTransactionModelDao(transactionId, attempt.getId(), paymentTransactionExternalKey, utcNow, utcNow, paymentId, TransactionType.AUTHORIZE, utcNow,
+ TransactionStatus.PAYMENT_FAILURE, amount, currency, "bla", "foo"),
+ internalCallContext
+ );
- processor.retryPaymentTransaction(attempt.getId(), ImmutableList.<String>of(MockPaymentControlProviderPlugin.PLUGIN_NAME), internalCallContext);
+ processor.retryPaymentTransaction(attempt.getId(), ImmutableList.<String>of(MockPaymentRoutingProviderPlugin.PLUGIN_NAME), internalCallContext);
final List<PaymentAttemptModelDao> pas = paymentDao.getPaymentAttemptByTransactionExternalKey(paymentTransactionExternalKey, internalCallContext);
assertEquals(pas.size(), 2);
@@ -713,18 +713,18 @@ public class TestRetryablePayment extends PaymentTestSuiteNoDB {
final UUID transactionId = UUID.randomUUID();
final UUID paymentId = UUID.randomUUID();
final PaymentAttemptModelDao attempt = new PaymentAttemptModelDao(account.getId(), paymentMethodId, utcNow, utcNow,
- paymentExternalKey, transactionId, paymentTransactionExternalKey,
- TransactionType.AUTHORIZE, state.getName(), amount, currency, null, EMPTY_PROPERTIES);
+ paymentExternalKey, transactionId, paymentTransactionExternalKey,
+ TransactionType.AUTHORIZE, state.getName(), amount, currency, null, EMPTY_PROPERTIES);
paymentDao.insertPaymentAttemptWithProperties(attempt,
internalCallContext
);
paymentDao.insertPaymentWithFirstTransaction(new PaymentModelDao(paymentId, utcNow, utcNow, account.getId(), paymentMethodId, -1, paymentExternalKey),
- new PaymentTransactionModelDao(transactionId, attempt.getId(), paymentTransactionExternalKey, utcNow, utcNow, paymentId, TransactionType.AUTHORIZE, utcNow,
- TransactionStatus.PAYMENT_FAILURE, amount, currency, "bla", "foo"),
- internalCallContext
- );
+ new PaymentTransactionModelDao(transactionId, attempt.getId(), paymentTransactionExternalKey, utcNow, utcNow, paymentId, TransactionType.AUTHORIZE, utcNow,
+ TransactionStatus.PAYMENT_FAILURE, amount, currency, "bla", "foo"),
+ internalCallContext
+ );
- processor.retryPaymentTransaction(attempt.getId(), ImmutableList.<String>of(MockPaymentControlProviderPlugin.PLUGIN_NAME), internalCallContext);
+ processor.retryPaymentTransaction(attempt.getId(), ImmutableList.<String>of(MockPaymentRoutingProviderPlugin.PLUGIN_NAME), internalCallContext);
final List<PaymentAttemptModelDao> pas = paymentDao.getPaymentAttemptByTransactionExternalKey(paymentTransactionExternalKey, internalCallContext);
assertEquals(pas.size(), 2);
diff --git a/payment/src/test/java/org/killbill/billing/payment/glue/TestPaymentModuleNoDB.java b/payment/src/test/java/org/killbill/billing/payment/glue/TestPaymentModuleNoDB.java
index 0920123..d33e26c 100644
--- a/payment/src/test/java/org/killbill/billing/payment/glue/TestPaymentModuleNoDB.java
+++ b/payment/src/test/java/org/killbill/billing/payment/glue/TestPaymentModuleNoDB.java
@@ -21,7 +21,7 @@ package org.killbill.billing.payment.glue;
import org.killbill.billing.GuicyKillbillTestNoDBModule;
import org.killbill.billing.mock.glue.MockNonEntityDaoModule;
import org.killbill.billing.payment.core.sm.MockRetryablePaymentAutomatonRunner;
-import org.killbill.billing.payment.core.sm.PluginControlledPaymentAutomatonRunner;
+import org.killbill.billing.payment.core.sm.PluginRoutingPaymentAutomatonRunner;
import org.killbill.billing.payment.dao.MockPaymentDao;
import org.killbill.billing.payment.dao.PaymentDao;
import org.killbill.billing.platform.api.KillbillConfigSource;
@@ -46,6 +46,6 @@ public class TestPaymentModuleNoDB extends TestPaymentModule {
}
protected void installAutomatonRunner() {
- bind(PluginControlledPaymentAutomatonRunner.class).to(MockRetryablePaymentAutomatonRunner.class).asEagerSingleton();
+ bind(PluginRoutingPaymentAutomatonRunner.class).to(MockRetryablePaymentAutomatonRunner.class).asEagerSingleton();
}
}
diff --git a/payment/src/test/java/org/killbill/billing/payment/PaymentTestSuiteNoDB.java b/payment/src/test/java/org/killbill/billing/payment/PaymentTestSuiteNoDB.java
index 69fa238..5cf500a 100644
--- a/payment/src/test/java/org/killbill/billing/payment/PaymentTestSuiteNoDB.java
+++ b/payment/src/test/java/org/killbill/billing/payment/PaymentTestSuiteNoDB.java
@@ -25,16 +25,15 @@ import org.killbill.billing.osgi.api.OSGIServiceRegistration;
import org.killbill.billing.payment.api.PaymentApi;
import org.killbill.billing.payment.core.PaymentProcessor;
import org.killbill.billing.payment.core.PaymentMethodProcessor;
-import org.killbill.billing.payment.core.PluginControlledPaymentProcessor;
+import org.killbill.billing.payment.core.PluginRoutingPaymentProcessor;
import org.killbill.billing.payment.core.sm.PaymentStateMachineHelper;
-import org.killbill.billing.payment.core.sm.PluginControlledPaymentAutomatonRunner;
+import org.killbill.billing.payment.core.sm.PluginRoutingPaymentAutomatonRunner;
import org.killbill.billing.payment.dao.PaymentDao;
import org.killbill.billing.payment.glue.TestPaymentModuleNoDB;
import org.killbill.billing.payment.plugin.api.PaymentPluginApi;
import org.killbill.billing.payment.provider.MockPaymentProviderPlugin;
import org.killbill.billing.payment.retry.DefaultRetryService;
import org.killbill.billing.platform.api.KillbillConfigSource;
-import org.killbill.billing.util.cache.CacheController;
import org.killbill.billing.util.cache.CacheControllerDispatcher;
import org.killbill.billing.util.config.PaymentConfig;
import org.killbill.bus.api.PersistentBus;
@@ -73,9 +72,9 @@ public abstract class PaymentTestSuiteNoDB extends GuicyKillbillTestSuiteNoDB {
@Inject
protected PaymentProcessor paymentProcessor;
@Inject
- protected PluginControlledPaymentProcessor pluginControlledPaymentProcessor;
+ protected PluginRoutingPaymentProcessor pluginRoutingPaymentProcessor;
@Inject
- protected PluginControlledPaymentAutomatonRunner retryablePaymentAutomatonRunner;
+ protected PluginRoutingPaymentAutomatonRunner retryablePaymentAutomatonRunner;
@Inject
protected DefaultRetryService retryService;
@Inject
diff --git a/payment/src/test/java/org/killbill/billing/payment/TestJanitor.java b/payment/src/test/java/org/killbill/billing/payment/TestJanitor.java
index 485e449..425fada 100644
--- a/payment/src/test/java/org/killbill/billing/payment/TestJanitor.java
+++ b/payment/src/test/java/org/killbill/billing/payment/TestJanitor.java
@@ -36,7 +36,7 @@ import org.killbill.billing.payment.api.PaymentOptions;
import org.killbill.billing.payment.api.PluginProperty;
import org.killbill.billing.payment.api.TransactionStatus;
import org.killbill.billing.payment.api.TransactionType;
-import org.killbill.billing.payment.control.InvoicePaymentControlPluginApi;
+import org.killbill.billing.payment.invoice.InvoicePaymentRoutingPluginApi;
import org.killbill.billing.payment.core.janitor.Janitor;
import org.killbill.billing.payment.dao.PaymentAttemptModelDao;
import org.killbill.billing.payment.provider.MockPaymentProviderPlugin;
@@ -64,7 +64,7 @@ public class TestJanitor extends PaymentTestSuiteWithEmbeddedDB {
@Override
public List<String> getPaymentControlPluginNames() {
- return ImmutableList.of(InvoicePaymentControlPluginApi.PLUGIN_NAME);
+ return ImmutableList.of(InvoicePaymentRoutingPluginApi.PLUGIN_NAME);
}
};
@@ -185,7 +185,7 @@ public class TestJanitor extends PaymentTestSuiteWithEmbeddedDB {
final List<PluginProperty> refundProperties = new ArrayList<PluginProperty>();
final HashMap<UUID, BigDecimal> uuidBigDecimalHashMap = new HashMap<UUID, BigDecimal>();
uuidBigDecimalHashMap.put(invoiceItem.getId(), new BigDecimal("1.0"));
- final PluginProperty refundIdsProp = new PluginProperty(InvoicePaymentControlPluginApi.PROP_IPCD_REFUND_IDS_WITH_AMOUNT_KEY, uuidBigDecimalHashMap, false);
+ final PluginProperty refundIdsProp = new PluginProperty(InvoicePaymentRoutingPluginApi.PROP_IPCD_REFUND_IDS_WITH_AMOUNT_KEY, uuidBigDecimalHashMap, false);
refundProperties.add(refundIdsProp);
final Payment payment2 = paymentApi.createRefundWithPaymentControl(account, payment.getId(), null, Currency.USD, transactionExternalKey2,
@@ -218,7 +218,7 @@ public class TestJanitor extends PaymentTestSuiteWithEmbeddedDB {
private List<PluginProperty> createPropertiesForInvoice(final Invoice invoice) {
final List<PluginProperty> result = new ArrayList<PluginProperty>();
- result.add(new PluginProperty(InvoicePaymentControlPluginApi.PROP_IPCD_INVOICE_ID, invoice.getId().toString(), false));
+ result.add(new PluginProperty(InvoicePaymentRoutingPluginApi.PROP_IPCD_INVOICE_ID, invoice.getId().toString(), false));
return result;
}
}
diff --git a/payment/src/test/java/org/killbill/billing/payment/TestRetryService.java b/payment/src/test/java/org/killbill/billing/payment/TestRetryService.java
index 54744ef..9d19b6e 100644
--- a/payment/src/test/java/org/killbill/billing/payment/TestRetryService.java
+++ b/payment/src/test/java/org/killbill/billing/payment/TestRetryService.java
@@ -32,7 +32,7 @@ import org.killbill.billing.invoice.api.Invoice;
import org.killbill.billing.payment.api.Payment;
import org.killbill.billing.payment.api.PaymentApiException;
import org.killbill.billing.payment.api.PluginProperty;
-import org.killbill.billing.payment.control.InvoicePaymentControlPluginApi;
+import org.killbill.billing.payment.invoice.InvoicePaymentRoutingPluginApi;
import org.killbill.billing.payment.dao.MockPaymentDao;
import org.killbill.billing.payment.dao.PaymentTransactionModelDao;
import org.killbill.billing.payment.dao.PaymentAttemptModelDao;
@@ -143,8 +143,8 @@ public class TestRetryService extends PaymentTestSuiteNoDB {
final String paymentExternalKey = UUID.randomUUID().toString();
final String transactionExternalKey = UUID.randomUUID().toString();
try {
- pluginControlledPaymentProcessor.createPurchase(false, account, account.getPaymentMethodId(), null, amount, Currency.USD, paymentExternalKey, transactionExternalKey,
- createPropertiesForInvoice(invoice), ImmutableList.<String>of(InvoicePaymentControlPluginApi.PLUGIN_NAME), callContext, internalCallContext);
+ pluginRoutingPaymentProcessor.createPurchase(false, account, account.getPaymentMethodId(), null, amount, Currency.USD, paymentExternalKey, transactionExternalKey,
+ createPropertiesForInvoice(invoice), ImmutableList.<String>of(InvoicePaymentRoutingPluginApi.PLUGIN_NAME), callContext, internalCallContext);
} catch (final PaymentApiException e) {
failed = true;
}
@@ -248,7 +248,7 @@ public class TestRetryService extends PaymentTestSuiteNoDB {
private List<PluginProperty> createPropertiesForInvoice(final Invoice invoice) {
final List<PluginProperty> result = new ArrayList<PluginProperty>();
- result.add(new PluginProperty(InvoicePaymentControlPluginApi.PROP_IPCD_INVOICE_ID, invoice.getId().toString(), false));
+ result.add(new PluginProperty(InvoicePaymentRoutingPluginApi.PROP_IPCD_INVOICE_ID, invoice.getId().toString(), false));
return result;
}
pom.xml 2(+1 -1)
diff --git a/pom.xml b/pom.xml
index d87b820..29dc507 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>killbill-oss-parent</artifactId>
<groupId>org.kill-bill.billing</groupId>
- <version>0.8.7</version>
+ <version>0.9.1</version>
</parent>
<artifactId>killbill</artifactId>
<version>0.11.14-SNAPSHOT</version>
diff --git a/util/src/main/java/org/killbill/billing/util/config/PaymentConfig.java b/util/src/main/java/org/killbill/billing/util/config/PaymentConfig.java
index 91f75c0..0b5826d 100644
--- a/util/src/main/java/org/killbill/billing/util/config/PaymentConfig.java
+++ b/util/src/main/java/org/killbill/billing/util/config/PaymentConfig.java
@@ -80,7 +80,7 @@ public interface PaymentConfig extends KillbillConfig {
@Description("Rate at which janitor tasks are scheduled")
public TimeSpan getJanitorRunningRate();
- @Config("org.killbill.payment.control.plugin")
+ @Config("org.killbill.payment.invoice.plugin")
@Default("__INVOICE_PAYMENT_CONTROL_PLUGIN__")
@Description("Whether the payment subsystem is off")
public List<String> getPaymentControlPluginNames();
diff --git a/util/src/main/java/org/killbill/billing/util/tag/dao/DefaultTagDefinitionDao.java b/util/src/main/java/org/killbill/billing/util/tag/dao/DefaultTagDefinitionDao.java
index 3e75223..3ef3143 100644
--- a/util/src/main/java/org/killbill/billing/util/tag/dao/DefaultTagDefinitionDao.java
+++ b/util/src/main/java/org/killbill/billing/util/tag/dao/DefaultTagDefinitionDao.java
@@ -78,7 +78,7 @@ public class DefaultTagDefinitionDao extends EntityDaoBase<TagDefinitionModelDao
final List<TagDefinitionModelDao> definitionList = new LinkedList<TagDefinitionModelDao>();
Iterators.addAll(definitionList, all);
- // Add control tag definitions
+ // Add invoice tag definitions
for (final ControlTagType controlTag : ControlTagType.values()) {
definitionList.add(new TagDefinitionModelDao(controlTag));
}
@@ -148,7 +148,7 @@ public class DefaultTagDefinitionDao extends EntityDaoBase<TagDefinitionModelDao
@Override
public TagDefinitionModelDao create(final String definitionName, final String description,
final InternalCallContext context) throws TagDefinitionApiException {
- // Make sure a control tag with this name don't already exist
+ // Make sure a invoice tag with this name don't already exist
if (TagModelDaoHelper.isControlTag(definitionName)) {
throw new TagDefinitionApiException(ErrorCode.TAG_DEFINITION_CONFLICTS_WITH_CONTROL_TAG, definitionName);
}
diff --git a/util/src/test/java/org/killbill/billing/util/tag/dao/TestDefaultTagDao.java b/util/src/test/java/org/killbill/billing/util/tag/dao/TestDefaultTagDao.java
index 196ec17..fd16051 100644
--- a/util/src/test/java/org/killbill/billing/util/tag/dao/TestDefaultTagDao.java
+++ b/util/src/test/java/org/killbill/billing/util/tag/dao/TestDefaultTagDao.java
@@ -63,7 +63,7 @@ public class TestDefaultTagDao extends UtilTestSuiteWithEmbeddedDB {
result = tagDefinitionDao.getByIds(uuids, internalCallContext);
assertEquals(result.size(), 3);
- // Add control tag and retry
+ // Add invoice tag and retry
uuids.add(ControlTagType.AUTO_PAY_OFF.getId());
result = tagDefinitionDao.getByIds(uuids, internalCallContext);
assertEquals(result.size(), 4);
@@ -85,7 +85,7 @@ public class TestDefaultTagDao extends UtilTestSuiteWithEmbeddedDB {
// Control Tag
try {
tagDefinitionDao.create(ControlTagType.AUTO_INVOICING_OFF.name(), ControlTagType.AUTO_INVOICING_OFF.name(), internalCallContext);
- Assert.fail("Should not be able to create a control tag");
+ Assert.fail("Should not be able to create a invoice tag");
} catch (TagDefinitionApiException ignore) {
}
final TagDefinitionModelDao resdef_AUTO_INVOICING_OFF = tagDefinitionDao.getById(ControlTagType.AUTO_INVOICING_OFF.getId(), internalCallContext);
@@ -107,7 +107,7 @@ public class TestDefaultTagDao extends UtilTestSuiteWithEmbeddedDB {
// Control Tag
try {
tagDefinitionDao.create(ControlTagType.AUTO_PAY_OFF.name(), ControlTagType.AUTO_INVOICING_OFF.name(), internalCallContext);
- Assert.fail("Should not be able to create a control tag");
+ Assert.fail("Should not be able to create a invoice tag");
} catch (TagDefinitionApiException ignore) {
}
final TagDefinitionModelDao resdef_AUTO_PAY_OFF = tagDefinitionDao.getByName(ControlTagType.AUTO_PAY_OFF.name(), internalCallContext);