killbill-memoizeit
Changes
beatrix/src/test/java/org/killbill/billing/beatrix/integration/overdue/TestOverdueIntegration.java 6(+3 -3)
beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestIntegrationInvoiceWithRepairLogic.java 10(+5 -5)
invoice/src/test/java/org/killbill/billing/invoice/generator/TestDefaultInvoiceGenerator.java 2(+1 -1)
payment/src/main/java/org/killbill/billing/payment/control/InvoicePaymentControlPluginApi.java 12(+6 -6)
payment/src/main/java/org/killbill/billing/payment/core/PluginControlledPaymentProcessor.java 54(+27 -27)
payment/src/main/java/org/killbill/billing/payment/core/sm/PaymentAutomatonDAOHelper.java 82(+41 -41)
payment/src/main/java/org/killbill/billing/payment/core/sm/PaymentEnteringStateCallback.java 18(+8 -10)
payment/src/main/java/org/killbill/billing/payment/core/sm/PaymentLeavingStateCallback.java 12(+6 -6)
payment/src/main/java/org/killbill/billing/payment/core/sm/PluginControlledPaymentAutomatonRunner.java 91(+45 -46)
payment/src/main/java/org/killbill/billing/payment/core/sm/RetryablePaymentStateContext.java 33(+16 -17)
payment/src/main/java/org/killbill/billing/payment/core/sm/RetryAuthorizeOperationCallback.java 34(+17 -17)
payment/src/main/java/org/killbill/billing/payment/core/sm/RetryCaptureOperationCallback.java 30(+15 -15)
payment/src/main/java/org/killbill/billing/payment/core/sm/RetryChargebackOperationCallback.java 28(+14 -14)
payment/src/main/java/org/killbill/billing/payment/core/sm/RetryCompletionOperationCallback.java 32(+16 -16)
payment/src/main/java/org/killbill/billing/payment/core/sm/RetryCreditOperationCallback.java 34(+17 -17)
payment/src/main/java/org/killbill/billing/payment/core/sm/RetryEnteringStateCallback.java 20(+10 -10)
payment/src/main/java/org/killbill/billing/payment/core/sm/RetryLeavingStateCallback.java 28(+14 -14)
payment/src/main/java/org/killbill/billing/payment/core/sm/RetryPurchaseOperationCallback.java 34(+17 -17)
payment/src/main/java/org/killbill/billing/payment/core/sm/RetryRefundOperationCallback.java 30(+15 -15)
payment/src/main/java/org/killbill/billing/payment/core/sm/RetryVoidOperationCallback.java 26(+13 -13)
payment/src/test/java/org/killbill/billing/payment/core/sm/MockRetryablePaymentAutomatonRunner.java 28(+14 -14)
payment/src/test/java/org/killbill/billing/payment/core/sm/MockRetryAuthorizeOperationCallback.java 42(+21 -21)
payment/src/test/java/org/killbill/billing/payment/core/sm/TestPaymentAutomatonDAOHelper.java 72(+36 -36)
payment/src/test/java/org/killbill/billing/payment/core/sm/TestPaymentEnteringStateCallback.java 50(+25 -25)
Details
diff --git a/api/src/main/java/org/killbill/billing/payment/api/PaymentInternalApi.java b/api/src/main/java/org/killbill/billing/payment/api/PaymentInternalApi.java
index 00d8178..96ec804 100644
--- a/api/src/main/java/org/killbill/billing/payment/api/PaymentInternalApi.java
+++ b/api/src/main/java/org/killbill/billing/payment/api/PaymentInternalApi.java
@@ -30,16 +30,16 @@ import org.killbill.billing.callcontext.InternalTenantContext;
public interface PaymentInternalApi {
- public DirectPayment createPayment(final Account account, final UUID invoiceId,
+ public Payment createPayment(final Account account, final UUID invoiceId,
@Nullable final BigDecimal amount, final Iterable<PluginProperty> properties, final InternalCallContext internalContext) throws PaymentApiException;
- public DirectPayment getPayment(UUID paymentId, Iterable<PluginProperty> properties, InternalTenantContext context)
+ public Payment getPayment(UUID paymentId, Iterable<PluginProperty> properties, InternalTenantContext context)
throws PaymentApiException;
public PaymentMethod getPaymentMethodById(UUID paymentMethodId, boolean includedInactive, Iterable<PluginProperty> properties, InternalTenantContext context)
throws PaymentApiException;
- public List<DirectPayment> getAccountPayments(UUID accountId, InternalTenantContext context)
+ public List<Payment> getAccountPayments(UUID accountId, InternalTenantContext context)
throws PaymentApiException;
public List<PaymentMethod> getPaymentMethods(Account account, Iterable<PluginProperty> properties, InternalTenantContext context)
diff --git a/api/src/main/java/org/killbill/billing/payment/api/PaymentService.java b/api/src/main/java/org/killbill/billing/payment/api/PaymentService.java
index c5bb3ec..e6ce805 100644
--- a/api/src/main/java/org/killbill/billing/payment/api/PaymentService.java
+++ b/api/src/main/java/org/killbill/billing/payment/api/PaymentService.java
@@ -25,5 +25,5 @@ public interface PaymentService extends KillbillService {
@Override
String getName();
- DirectPaymentApi getPaymentApi();
+ PaymentApi getPaymentApi();
}
diff --git a/beatrix/src/test/java/org/killbill/billing/beatrix/integration/overdue/TestOverdueIntegration.java b/beatrix/src/test/java/org/killbill/billing/beatrix/integration/overdue/TestOverdueIntegration.java
index cf3a7ad..29202ee 100644
--- a/beatrix/src/test/java/org/killbill/billing/beatrix/integration/overdue/TestOverdueIntegration.java
+++ b/beatrix/src/test/java/org/killbill/billing/beatrix/integration/overdue/TestOverdueIntegration.java
@@ -46,7 +46,7 @@ import org.killbill.billing.invoice.api.InvoiceItemType;
import org.killbill.billing.invoice.api.InvoicePayment;
import org.killbill.billing.invoice.model.ExternalChargeInvoiceItem;
import org.killbill.billing.junction.DefaultBlockingState;
-import org.killbill.billing.payment.api.DirectPayment;
+import org.killbill.billing.payment.api.Payment;
import org.killbill.billing.payment.api.PluginProperty;
import org.testng.annotations.Test;
@@ -748,7 +748,7 @@ public class TestOverdueIntegration extends TestOverdueBase {
checkODState(DefaultBlockingState.CLEAR_STATE_NAME);
// Now, refund the second (first non-zero dollar) invoice
- final DirectPayment payment = paymentApi.getPayment(invoiceUserApi.getInvoicesByAccount(account.getId(), callContext).get(1).getPayments().get(0).getPaymentId(), false, PLUGIN_PROPERTIES, callContext);
+ final Payment payment = paymentApi.getPayment(invoiceUserApi.getInvoicesByAccount(account.getId(), callContext).get(1).getPayments().get(0).getPaymentId(), false, PLUGIN_PROPERTIES, callContext);
refundPaymentAndCheckForCompletion(account, payment, NextEvent.BLOCK, NextEvent.INVOICE_ADJUSTMENT);
// We should now be in OD1
checkODState("OD1");
@@ -792,7 +792,7 @@ public class TestOverdueIntegration extends TestOverdueBase {
// Now, create a chargeback for the second (first non-zero dollar) invoice
final InvoicePayment invoicePayment = invoicePaymentApi.getInvoicePayments(invoiceUserApi.getInvoicesByAccount(account.getId(), callContext).get(1).getPayments().get(0).getPaymentId(), callContext).get(0);
- final DirectPayment payment = paymentApi.getPayment(invoicePayment.getPaymentId(), false, ImmutableList.<PluginProperty>of(), callContext);
+ final Payment payment = paymentApi.getPayment(invoicePayment.getPaymentId(), false, ImmutableList.<PluginProperty>of(), callContext);
createChargeBackAndCheckForCompletion(account, payment, NextEvent.BLOCK, NextEvent.INVOICE_ADJUSTMENT);
// We should now be in OD1
checkODState("OD1");
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 ceb3cb0..0e0029e 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
@@ -71,8 +71,8 @@ import org.killbill.billing.mock.MockAccountBuilder;
import org.killbill.billing.osgi.config.OSGIConfig;
import org.killbill.billing.overdue.OverdueUserApi;
import org.killbill.billing.overdue.wrapper.OverdueWrapperFactory;
-import org.killbill.billing.payment.api.DirectPayment;
-import org.killbill.billing.payment.api.DirectPaymentApi;
+import org.killbill.billing.payment.api.Payment;
+import org.killbill.billing.payment.api.PaymentApi;
import org.killbill.billing.payment.api.PaymentApiException;
import org.killbill.billing.payment.api.PaymentMethodPlugin;
import org.killbill.billing.payment.api.PaymentOptions;
@@ -180,7 +180,7 @@ public class TestIntegrationBase extends BeatrixTestSuiteWithEmbeddedDB {
protected BlockingInternalApi blockingApi;
@Inject
- protected DirectPaymentApi paymentApi;
+ protected PaymentApi paymentApi;
@Inject
protected EntitlementApi entitlementApi;
@@ -403,10 +403,10 @@ public class TestIntegrationBase extends BeatrixTestSuiteWithEmbeddedDB {
}, events);
}
- protected DirectPayment createPaymentAndCheckForCompletion(final Account account, final Invoice invoice, final BigDecimal amount, final Currency currency, final NextEvent... events) {
- return doCallAndCheckForCompletion(new Function<Void, DirectPayment>() {
+ protected Payment createPaymentAndCheckForCompletion(final Account account, final Invoice invoice, final BigDecimal amount, final Currency currency, final NextEvent... events) {
+ return doCallAndCheckForCompletion(new Function<Void, Payment>() {
@Override
- public DirectPayment apply(@Nullable final Void input) {
+ public Payment apply(@Nullable final Void input) {
try {
final List<PluginProperty> properties = new ArrayList<PluginProperty>();
@@ -422,10 +422,10 @@ public class TestIntegrationBase extends BeatrixTestSuiteWithEmbeddedDB {
}, events);
}
- protected DirectPayment createPaymentAndCheckForCompletion(final Account account, final Invoice invoice, final NextEvent... events) {
- return doCallAndCheckForCompletion(new Function<Void, DirectPayment>() {
+ protected Payment createPaymentAndCheckForCompletion(final Account account, final Invoice invoice, final NextEvent... events) {
+ return doCallAndCheckForCompletion(new Function<Void, Payment>() {
@Override
- public DirectPayment apply(@Nullable final Void input) {
+ 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);
@@ -441,10 +441,10 @@ public class TestIntegrationBase extends BeatrixTestSuiteWithEmbeddedDB {
}, events);
}
- protected DirectPayment createExternalPaymentAndCheckForCompletion(final Account account, final Invoice invoice, final NextEvent... events) {
- return doCallAndCheckForCompletion(new Function<Void, DirectPayment>() {
+ protected Payment createExternalPaymentAndCheckForCompletion(final Account account, final Invoice invoice, final NextEvent... events) {
+ return doCallAndCheckForCompletion(new Function<Void, Payment>() {
@Override
- public DirectPayment apply(@Nullable final Void input) {
+ public Payment apply(@Nullable final Void input) {
try {
final List<PluginProperty> properties = new ArrayList<PluginProperty>();
@@ -461,10 +461,10 @@ public class TestIntegrationBase extends BeatrixTestSuiteWithEmbeddedDB {
}, events);
}
- protected DirectPayment refundPaymentAndCheckForCompletion(final Account account, final DirectPayment payment, final NextEvent... events) {
- return doCallAndCheckForCompletion(new Function<Void, DirectPayment>() {
+ protected Payment refundPaymentAndCheckForCompletion(final Account account, final Payment payment, final NextEvent... events) {
+ return doCallAndCheckForCompletion(new Function<Void, Payment>() {
@Override
- public DirectPayment apply(@Nullable final Void input) {
+ public Payment apply(@Nullable final Void input) {
try {
return paymentApi.createRefundWithPaymentControl(account, payment.getId(), payment.getPurchasedAmount(), payment.getCurrency(), UUID.randomUUID().toString(),
PLUGIN_PROPERTIES, PAYMENT_OPTIONS, callContext);
@@ -476,10 +476,10 @@ public class TestIntegrationBase extends BeatrixTestSuiteWithEmbeddedDB {
}, events);
}
- protected DirectPayment refundPaymentWithAdjustmentAndCheckForCompletion(final Account account, final DirectPayment payment, final NextEvent... events) {
- return doCallAndCheckForCompletion(new Function<Void, DirectPayment>() {
+ protected Payment refundPaymentWithAdjustmentAndCheckForCompletion(final Account account, final Payment payment, final NextEvent... events) {
+ return doCallAndCheckForCompletion(new Function<Void, Payment>() {
@Override
- public DirectPayment apply(@Nullable final Void input) {
+ 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);
@@ -495,10 +495,10 @@ public class TestIntegrationBase extends BeatrixTestSuiteWithEmbeddedDB {
}, events);
}
- protected DirectPayment refundPaymentWithInvoiceItemAdjAndCheckForCompletion(final Account account, final DirectPayment payment, final Map<UUID, BigDecimal> iias, final NextEvent... events) {
- return doCallAndCheckForCompletion(new Function<Void, DirectPayment>() {
+ protected Payment refundPaymentWithInvoiceItemAdjAndCheckForCompletion(final Account account, final Payment payment, final Map<UUID, BigDecimal> iias, final NextEvent... events) {
+ return doCallAndCheckForCompletion(new Function<Void, Payment>() {
@Override
- public DirectPayment apply(@Nullable final Void input) {
+ 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);
@@ -517,7 +517,7 @@ public class TestIntegrationBase extends BeatrixTestSuiteWithEmbeddedDB {
}, events);
}
- protected void createChargeBackAndCheckForCompletion(final Account account, final DirectPayment payment, final NextEvent... events) {
+ protected void createChargeBackAndCheckForCompletion(final Account account, final Payment payment, final NextEvent... events) {
doCallAndCheckForCompletion(new Function<Void, Void>() {
@Override
public Void apply(@Nullable final Void input) {
diff --git a/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestIntegrationInvoiceWithRepairLogic.java b/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestIntegrationInvoiceWithRepairLogic.java
index 580fd2b..d721b15 100644
--- a/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestIntegrationInvoiceWithRepairLogic.java
+++ b/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestIntegrationInvoiceWithRepairLogic.java
@@ -39,7 +39,7 @@ import org.killbill.billing.entitlement.api.DefaultEntitlement;
import org.killbill.billing.entitlement.api.Entitlement.EntitlementActionPolicy;
import org.killbill.billing.invoice.api.Invoice;
import org.killbill.billing.invoice.api.InvoiceItemType;
-import org.killbill.billing.payment.api.DirectPayment;
+import org.killbill.billing.payment.api.Payment;
import org.killbill.billing.payment.api.PluginProperty;
import org.killbill.billing.payment.api.TransactionStatus;
import org.testng.annotations.AfterMethod;
@@ -540,9 +540,9 @@ public class TestIntegrationInvoiceWithRepairLogic extends TestIntegrationBase {
// ITEM ADJUSTMENT PRIOR TO DOING THE REPAIR
//
final Invoice invoice1 = invoices.get(1);
- final List<DirectPayment> payments = paymentApi.getAccountPayments(account.getId(), false, ImmutableList.<PluginProperty>of(), callContext);
+ final List<Payment> payments = paymentApi.getAccountPayments(account.getId(), false, ImmutableList.<PluginProperty>of(), callContext);
final ExpectedPaymentCheck expectedPaymentCheck = new ExpectedPaymentCheck(clock.getUTCNow().toLocalDate(), new BigDecimal("2399.95"), TransactionStatus.SUCCESS, invoice1.getId(), Currency.USD);
- final DirectPayment payment1 = payments.get(0);
+ final Payment payment1 = payments.get(0);
final Map<UUID, BigDecimal> iias = new HashMap<UUID, BigDecimal>();
iias.put(invoice1.getInvoiceItems().get(0).getId(), new BigDecimal("197.26"));
@@ -608,9 +608,9 @@ public class TestIntegrationInvoiceWithRepairLogic extends TestIntegrationBase {
// ITEM ADJUSTMENT PRIOR TO DOING THE REPAIR
//
final Invoice invoice1 = invoices.get(1);
- final List<DirectPayment> payments = paymentApi.getAccountPayments(account.getId(), false, ImmutableList.<PluginProperty>of(), callContext);
+ final List<Payment> payments = paymentApi.getAccountPayments(account.getId(), false, ImmutableList.<PluginProperty>of(), callContext);
final ExpectedPaymentCheck expectedPaymentCheck = new ExpectedPaymentCheck(clock.getUTCNow().toLocalDate(), new BigDecimal("2399.95"), TransactionStatus.SUCCESS, invoice1.getId(), Currency.USD);
- final DirectPayment payment1 = payments.get(0);
+ final Payment payment1 = payments.get(0);
final Map<UUID, BigDecimal> iias = new HashMap<UUID, BigDecimal>();
iias.put(invoice1.getInvoiceItems().get(0).getId(), new BigDecimal("100.00"));
diff --git a/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestPayment.java b/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestPayment.java
index 89ccf34..dc3cd13 100644
--- a/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestPayment.java
+++ b/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestPayment.java
@@ -28,7 +28,7 @@ import org.killbill.billing.catalog.api.Currency;
import org.killbill.billing.invoice.api.Invoice;
import org.killbill.billing.invoice.api.InvoiceItem;
import org.killbill.billing.invoice.model.ExternalChargeInvoiceItem;
-import org.killbill.billing.payment.api.DirectPayment;
+import org.killbill.billing.payment.api.Payment;
import org.testng.annotations.Test;
import com.google.common.collect.ImmutableList;
@@ -54,7 +54,7 @@ public class TestPayment extends TestIntegrationBase {
assertListenerStatus();
final Invoice invoice = invoiceUserApi.getInvoice(item1.getInvoiceId(), callContext);
- final DirectPayment payment1 = createPaymentAndCheckForCompletion(account, invoice, new BigDecimal("4.00"), account.getCurrency(), NextEvent.PAYMENT);
+ final Payment payment1 = createPaymentAndCheckForCompletion(account, invoice, new BigDecimal("4.00"), account.getCurrency(), NextEvent.PAYMENT);
Invoice invoice1 = invoiceUserApi.getInvoice(item1.getInvoiceId(), callContext);
assertTrue(invoice1.getBalance().compareTo(new BigDecimal("6.00")) == 0);
@@ -64,7 +64,7 @@ public class TestPayment extends TestIntegrationBase {
BigDecimal accountBalance = invoiceUserApi.getAccountBalance(account.getId(), callContext);
assertTrue(accountBalance.compareTo(new BigDecimal("6.00")) == 0);
- final DirectPayment payment2 = createPaymentAndCheckForCompletion(account, invoice, new BigDecimal("6.00"), account.getCurrency(), NextEvent.PAYMENT);
+ final Payment payment2 = createPaymentAndCheckForCompletion(account, invoice, new BigDecimal("6.00"), account.getCurrency(), NextEvent.PAYMENT);
invoice1 = invoiceUserApi.getInvoice(item1.getInvoiceId(), callContext);
assertTrue(invoice1.getBalance().compareTo(BigDecimal.ZERO) == 0);
diff --git a/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestPaymentRefund.java b/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestPaymentRefund.java
index 54755ff..8bae9e0 100644
--- a/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestPaymentRefund.java
+++ b/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestPaymentRefund.java
@@ -41,7 +41,7 @@ import org.killbill.billing.entitlement.api.DefaultEntitlement;
import org.killbill.billing.invoice.api.Invoice;
import org.killbill.billing.invoice.api.InvoiceItem;
import org.killbill.billing.invoice.api.InvoiceItemType;
-import org.killbill.billing.payment.api.DirectPayment;
+import org.killbill.billing.payment.api.Payment;
import org.killbill.billing.payment.api.TransactionStatus;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
@@ -57,7 +57,7 @@ public class TestPaymentRefund extends TestIntegrationBase {
// Setup for all tests below
private Account account;
private Invoice invoice;
- private DirectPayment payment;
+ private Payment payment;
private Set<UUID> invoiceItems;
private DateTime initialCreationDate;
private int invoiceItemCount;
diff --git a/beatrix/src/test/java/org/killbill/billing/beatrix/util/AuditChecker.java b/beatrix/src/test/java/org/killbill/billing/beatrix/util/AuditChecker.java
index 1b15161..aa0398a 100644
--- a/beatrix/src/test/java/org/killbill/billing/beatrix/util/AuditChecker.java
+++ b/beatrix/src/test/java/org/killbill/billing/beatrix/util/AuditChecker.java
@@ -33,8 +33,8 @@ import org.killbill.billing.invoice.api.Invoice;
import org.killbill.billing.invoice.api.InvoiceItem;
import org.killbill.billing.invoice.dao.InvoiceItemSqlDao;
import org.killbill.billing.invoice.dao.InvoiceSqlDao;
-import org.killbill.billing.payment.api.DirectPayment;
-import org.killbill.billing.payment.api.DirectPaymentTransaction;
+import org.killbill.billing.payment.api.Payment;
+import org.killbill.billing.payment.api.PaymentTransaction;
import org.killbill.billing.payment.dao.PaymentSqlDao;
import org.killbill.billing.payment.dao.TransactionSqlDao;
import org.killbill.billing.subscription.engine.dao.BundleSqlDao;
@@ -166,13 +166,13 @@ public class AuditChecker {
* ******************************************** PAYMENT *******************************************************
*/
- public void checkPaymentCreated(final DirectPayment payment, final CallContext context) {
+ public void checkPaymentCreated(final Payment payment, final CallContext context) {
final List<AuditLog> paymentLogs = getAuditLogForPayment(payment, context);
Assert.assertEquals(paymentLogs.size(), 2);
checkAuditLog(ChangeType.INSERT, context, paymentLogs.get(0), payment.getId(), PaymentSqlDao.class, true, false);
checkAuditLog(ChangeType.UPDATE, context, paymentLogs.get(1), payment.getId(), PaymentSqlDao.class, true, false);
- for (DirectPaymentTransaction cur : payment.getTransactions()) {
+ for (PaymentTransaction cur : payment.getTransactions()) {
final List<AuditLog> auditLogs = getAuditLogForPaymentTransaction(payment, cur, context);
Assert.assertEquals(auditLogs.size(), 2);
checkAuditLog(ChangeType.INSERT, context, auditLogs.get(0), cur.getId(), TransactionSqlDao.class, true, false);
@@ -218,11 +218,11 @@ public class AuditChecker {
return auditUserApi.getAccountAuditLogs(invoiceItem.getAccountId(), AuditLevel.FULL, context).getAuditLogsForInvoiceItem(invoiceItem.getId());
}
- private List<AuditLog> getAuditLogForPayment(final DirectPayment payment, final TenantContext context) {
+ private List<AuditLog> getAuditLogForPayment(final Payment payment, final TenantContext context) {
return auditUserApi.getAccountAuditLogs(payment.getAccountId(), AuditLevel.FULL, context).getAuditLogsForPayment(payment.getId());
}
- private List<AuditLog> getAuditLogForPaymentTransaction(final DirectPayment payment, final DirectPaymentTransaction paymentTransaction, final TenantContext context) {
+ private List<AuditLog> getAuditLogForPaymentTransaction(final Payment payment, final PaymentTransaction paymentTransaction, final TenantContext context) {
return auditUserApi.getAccountAuditLogs(payment.getAccountId(), AuditLevel.FULL, context).getAuditLogsForPaymentTransaction(paymentTransaction.getId());
}
diff --git a/beatrix/src/test/java/org/killbill/billing/beatrix/util/PaymentChecker.java b/beatrix/src/test/java/org/killbill/billing/beatrix/util/PaymentChecker.java
index 541e0f6..69cfe82 100644
--- a/beatrix/src/test/java/org/killbill/billing/beatrix/util/PaymentChecker.java
+++ b/beatrix/src/test/java/org/killbill/billing/beatrix/util/PaymentChecker.java
@@ -24,9 +24,9 @@ import java.util.UUID;
import org.joda.time.LocalDate;
import org.killbill.billing.catalog.api.Currency;
-import org.killbill.billing.payment.api.DirectPayment;
-import org.killbill.billing.payment.api.DirectPaymentApi;
-import org.killbill.billing.payment.api.DirectPaymentTransaction;
+import org.killbill.billing.payment.api.Payment;
+import org.killbill.billing.payment.api.PaymentApi;
+import org.killbill.billing.payment.api.PaymentTransaction;
import org.killbill.billing.payment.api.PaymentApiException;
import org.killbill.billing.payment.api.PluginProperty;
import org.killbill.billing.payment.api.TransactionStatus;
@@ -45,20 +45,20 @@ public class PaymentChecker {
private static final Logger log = LoggerFactory.getLogger(PaymentChecker.class);
- private final DirectPaymentApi paymentApi;
+ private final PaymentApi paymentApi;
private final AuditChecker auditChecker;
@Inject
- public PaymentChecker(final DirectPaymentApi paymentApi, final AuditChecker auditChecker) {
+ public PaymentChecker(final PaymentApi paymentApi, final AuditChecker auditChecker) {
this.paymentApi = paymentApi;
this.auditChecker = auditChecker;
}
- public DirectPayment checkPayment(final UUID accountId, final int paymentOrderingNumber, final CallContext context, ExpectedPaymentCheck expected) throws PaymentApiException {
- final List<DirectPayment> payments = paymentApi.getAccountPayments(accountId, false, ImmutableList.<PluginProperty>of(), context);
+ public Payment checkPayment(final UUID accountId, final int paymentOrderingNumber, final CallContext context, ExpectedPaymentCheck expected) throws PaymentApiException {
+ final List<Payment> payments = paymentApi.getAccountPayments(accountId, false, ImmutableList.<PluginProperty>of(), context);
Assert.assertEquals(payments.size(), paymentOrderingNumber);
- final DirectPayment payment = payments.get(paymentOrderingNumber - 1);
- final DirectPaymentTransaction transaction = getPurchaseTransaction(payment);
+ final Payment payment = payments.get(paymentOrderingNumber - 1);
+ final PaymentTransaction transaction = getPurchaseTransaction(payment);
if (transaction.getTransactionStatus() == TransactionStatus.UNKNOWN) {
checkPaymentNoAuditForRuntimeException(accountId, payment, expected);
} else {
@@ -67,27 +67,27 @@ public class PaymentChecker {
return payment;
}
- private DirectPaymentTransaction getPurchaseTransaction(final DirectPayment payment) {
- return Iterables.tryFind(payment.getTransactions(), new Predicate<DirectPaymentTransaction>() {
+ private PaymentTransaction getPurchaseTransaction(final Payment payment) {
+ return Iterables.tryFind(payment.getTransactions(), new Predicate<PaymentTransaction>() {
@Override
- public boolean apply(final DirectPaymentTransaction input) {
+ public boolean apply(final PaymentTransaction input) {
return input.getTransactionType() == TransactionType.PURCHASE;
}
}).get();
}
- private void checkPayment(final UUID accountId, final DirectPayment payment, final CallContext context, final ExpectedPaymentCheck expected) {
+ private void checkPayment(final UUID accountId, final Payment payment, final CallContext context, final ExpectedPaymentCheck expected) {
Assert.assertEquals(payment.getAccountId(), accountId);
- final DirectPaymentTransaction transaction = getPurchaseTransaction(payment);
+ final PaymentTransaction transaction = getPurchaseTransaction(payment);
Assert.assertTrue(transaction.getAmount().compareTo(expected.getAmount()) == 0);
Assert.assertEquals(transaction.getTransactionStatus(), expected.getStatus());
Assert.assertEquals(payment.getCurrency(), expected.getCurrency());
auditChecker.checkPaymentCreated(payment, context);
}
- private void checkPaymentNoAuditForRuntimeException(final UUID accountId, final DirectPayment payment, final ExpectedPaymentCheck expected) {
+ private void checkPaymentNoAuditForRuntimeException(final UUID accountId, final Payment payment, final ExpectedPaymentCheck expected) {
Assert.assertEquals(payment.getAccountId(), accountId);
- final DirectPaymentTransaction transaction = getPurchaseTransaction(payment);
+ final PaymentTransaction transaction = getPurchaseTransaction(payment);
Assert.assertTrue(transaction.getAmount().compareTo(expected.getAmount()) == 0);
Assert.assertEquals(transaction.getTransactionStatus(), expected.getStatus());
Assert.assertEquals(payment.getCurrency(), expected.getCurrency());
diff --git a/beatrix/src/test/java/org/killbill/billing/beatrix/util/RefundChecker.java b/beatrix/src/test/java/org/killbill/billing/beatrix/util/RefundChecker.java
index 2097a57..6eb8afd 100644
--- a/beatrix/src/test/java/org/killbill/billing/beatrix/util/RefundChecker.java
+++ b/beatrix/src/test/java/org/killbill/billing/beatrix/util/RefundChecker.java
@@ -31,9 +31,9 @@ import org.killbill.billing.invoice.api.InvoicePayment;
import org.killbill.billing.invoice.api.InvoicePaymentApi;
import org.killbill.billing.invoice.api.InvoicePaymentType;
import org.killbill.billing.invoice.api.InvoiceUserApi;
-import org.killbill.billing.payment.api.DirectPayment;
-import org.killbill.billing.payment.api.DirectPaymentApi;
-import org.killbill.billing.payment.api.DirectPaymentTransaction;
+import org.killbill.billing.payment.api.Payment;
+import org.killbill.billing.payment.api.PaymentApi;
+import org.killbill.billing.payment.api.PaymentTransaction;
import org.killbill.billing.payment.api.PaymentApiException;
import org.killbill.billing.payment.api.PluginProperty;
import org.killbill.billing.payment.api.TransactionType;
@@ -52,25 +52,25 @@ public class RefundChecker {
private static final Logger log = LoggerFactory.getLogger(RefundChecker.class);
- private final DirectPaymentApi paymentApi;
+ private final PaymentApi paymentApi;
private final InvoicePaymentApi invoicePaymentApi;
private final AuditChecker auditChecker;
private final InvoiceUserApi invoiceUserApi;
@Inject
- public RefundChecker(final DirectPaymentApi paymentApi, final InvoicePaymentApi invoicePaymentApi, final InvoiceUserApi invoiceApi, final AuditChecker auditChecker) {
+ public RefundChecker(final PaymentApi paymentApi, final InvoicePaymentApi invoicePaymentApi, final InvoiceUserApi invoiceApi, final AuditChecker auditChecker) {
this.paymentApi = paymentApi;
this.invoicePaymentApi = invoicePaymentApi;
this.auditChecker = auditChecker;
this.invoiceUserApi = invoiceApi;
}
- public DirectPaymentTransaction checkRefund(final UUID paymentId, final CallContext context, ExpectedRefundCheck expected) throws PaymentApiException {
+ public PaymentTransaction checkRefund(final UUID paymentId, final CallContext context, ExpectedRefundCheck expected) throws PaymentApiException {
- final DirectPayment payment = paymentApi.getPayment(paymentId, false, ImmutableList.<PluginProperty>of(), context);
- final DirectPaymentTransaction refund = Iterables.tryFind(payment.getTransactions(), new Predicate<DirectPaymentTransaction>() {
+ final Payment payment = paymentApi.getPayment(paymentId, false, ImmutableList.<PluginProperty>of(), context);
+ final PaymentTransaction refund = Iterables.tryFind(payment.getTransactions(), new Predicate<PaymentTransaction>() {
@Override
- public boolean apply(final DirectPaymentTransaction input) {
+ public boolean apply(final PaymentTransaction input) {
return input.getTransactionType() == TransactionType.REFUND;
}
}).orNull();
@@ -80,7 +80,7 @@ public class RefundChecker {
final InvoicePayment refundInvoicePayment = getInvoicePaymentEntry(paymentId, InvoicePaymentType.REFUND, context);
final InvoicePayment invoicePayment = getInvoicePaymentEntry(paymentId, InvoicePaymentType.ATTEMPT, context);
- Assert.assertEquals(refund.getDirectPaymentId(), expected.getPaymentId());
+ Assert.assertEquals(refund.getPaymentId(), expected.getPaymentId());
Assert.assertEquals(refund.getCurrency(), expected.getCurrency());
Assert.assertEquals(refund.getAmount().compareTo(expected.getRefundAmount()), 0);
@@ -94,10 +94,10 @@ public class RefundChecker {
return refund;
}
- private DirectPaymentTransaction getRefundTransaction(final DirectPayment payment) {
- return Iterables.tryFind(payment.getTransactions(), new Predicate<DirectPaymentTransaction>() {
+ private PaymentTransaction getRefundTransaction(final Payment payment) {
+ return Iterables.tryFind(payment.getTransactions(), new Predicate<PaymentTransaction>() {
@Override
- public boolean apply(final DirectPaymentTransaction input) {
+ public boolean apply(final PaymentTransaction input) {
return input.getTransactionType() == TransactionType.REFUND;
}
}).get();
diff --git a/invoice/src/test/java/org/killbill/billing/invoice/generator/TestDefaultInvoiceGenerator.java b/invoice/src/test/java/org/killbill/billing/invoice/generator/TestDefaultInvoiceGenerator.java
index 9008613..435b3d8 100644
--- a/invoice/src/test/java/org/killbill/billing/invoice/generator/TestDefaultInvoiceGenerator.java
+++ b/invoice/src/test/java/org/killbill/billing/invoice/generator/TestDefaultInvoiceGenerator.java
@@ -1097,4 +1097,4 @@ public class TestDefaultInvoiceGenerator extends InvoiceTestSuiteNoDB {
}
log.info("-------------------- END DETAIL ----------------------");
}
-}
\ No newline at end of file
+}
diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/AccountTimelineJson.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/AccountTimelineJson.java
index ad869dc..7537ada 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/AccountTimelineJson.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/AccountTimelineJson.java
@@ -32,7 +32,7 @@ import org.killbill.billing.invoice.api.InvoiceItem;
import org.killbill.billing.invoice.api.InvoiceItemType;
import org.killbill.billing.invoice.api.InvoicePayment;
import org.killbill.billing.jaxrs.resources.JaxRsResourceBase;
-import org.killbill.billing.payment.api.DirectPayment;
+import org.killbill.billing.payment.api.Payment;
import org.killbill.billing.util.audit.AccountAuditLogs;
import org.killbill.billing.util.audit.AuditLog;
@@ -59,7 +59,7 @@ public class AccountTimelineJson {
public AccountTimelineJson(final Account account,
final List<Invoice> invoices,
- final List<DirectPayment> payments,
+ final List<Payment> payments,
final List<InvoicePayment> invoicePayments,
final List<SubscriptionBundle> bundles,
final AccountAuditLogs accountAuditLogs) {
@@ -91,7 +91,7 @@ public class AccountTimelineJson {
}
this.payments = new LinkedList<InvoicePaymentJson>();
- for (final DirectPayment payment : payments) {
+ for (final Payment payment : payments) {
final UUID invoiceId = JaxRsResourceBase.getInvoiceId(invoicePayments, payment);
this.payments.add(new InvoicePaymentJson(payment, invoiceId, accountAuditLogs));
}
diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/InvoicePaymentJson.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/InvoicePaymentJson.java
index 0a60da5..5f035f4 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/InvoicePaymentJson.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/InvoicePaymentJson.java
@@ -24,13 +24,13 @@ import java.util.UUID;
import javax.annotation.Nullable;
-import org.killbill.billing.payment.api.DirectPayment;
+import org.killbill.billing.payment.api.Payment;
import org.killbill.billing.util.audit.AccountAuditLogs;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
-public class InvoicePaymentJson extends DirectPaymentJson {
+public class InvoicePaymentJson extends PaymentJson {
private final String targetInvoiceId;
@@ -48,15 +48,15 @@ public class InvoicePaymentJson extends DirectPaymentJson {
@JsonProperty("creditedAmount") final BigDecimal creditedAmount,
@JsonProperty("currency") final String currency,
@JsonProperty("paymentMethodId") final String paymentMethodId,
- @JsonProperty("transactions") final List<? extends DirectTransactionJson> transactions,
+ @JsonProperty("transactions") final List<? extends PaymentTransactionJson> transactions,
@JsonProperty("auditLogs") @Nullable final List<AuditLogJson> auditLogs) {
super(accountId, paymentId, paymentNumber, paymentExternalKey, authAmount, capturedAmount, purchasedAmount, refundedAmount, creditedAmount, currency, paymentMethodId, transactions, auditLogs);
this.targetInvoiceId = targetInvoiceId;
}
- public InvoicePaymentJson(final DirectPayment dp, @Nullable final UUID invoiceId, @Nullable final AccountAuditLogs accountAuditLogs) {
+ public InvoicePaymentJson(final Payment dp, @Nullable final UUID invoiceId, @Nullable final AccountAuditLogs accountAuditLogs) {
super(dp, accountAuditLogs);
- // STEPH we should build InvoicePaymentTransactionJson instead of DirectTransactionJson here.
+ // STEPH we should build InvoicePaymentTransactionJson instead of PaymentTransactionJson here.
this.targetInvoiceId = invoiceId != null ? invoiceId.toString() : null;
}
diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/InvoicePaymentTransactionJson.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/InvoicePaymentTransactionJson.java
index 98b0124..487825b 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/InvoicePaymentTransactionJson.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/InvoicePaymentTransactionJson.java
@@ -27,7 +27,7 @@ import org.joda.time.DateTime;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
-public class InvoicePaymentTransactionJson extends DirectTransactionJson {
+public class InvoicePaymentTransactionJson extends PaymentTransactionJson {
private final Boolean isAdjusted;
private final List<InvoiceItemJson> adjustments;
@@ -35,7 +35,7 @@ public class InvoicePaymentTransactionJson extends DirectTransactionJson {
@JsonCreator
public InvoicePaymentTransactionJson(@JsonProperty("transactionId") final String transactionId,
@JsonProperty("transactionExternalKey") final String transactionExternalKey,
- @JsonProperty("paymentId") final String directPaymentId,
+ @JsonProperty("paymentId") final String paymentId,
@JsonProperty("paymentExternalKey") final String paymentExternalKey,
@JsonProperty("transactionType") final String transactionType,
@JsonProperty("amount") final BigDecimal amount,
@@ -50,7 +50,7 @@ public class InvoicePaymentTransactionJson extends DirectTransactionJson {
@JsonProperty("isAdjusted") final Boolean isAdjusted,
@JsonProperty("adjustments") final List<InvoiceItemJson> adjustments,
@JsonProperty("auditLogs") @Nullable final List<AuditLogJson> auditLogs) {
- super(transactionId, transactionExternalKey, directPaymentId, paymentExternalKey, transactionType, amount, currency, effectiveDate, status,
+ super(transactionId, transactionExternalKey, paymentId, paymentExternalKey, transactionType, amount, currency, effectiveDate, status,
gatewayErrorCode, gatewayErrorMsg, firstPaymentReferenceId, secondPaymentReferenceId, properties, auditLogs);
this.isAdjusted = isAdjusted;
this.adjustments = adjustments;
diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/AccountResource.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/AccountResource.java
index bb0b051..3e14bbb 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/AccountResource.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/AccountResource.java
@@ -65,8 +65,8 @@ import org.killbill.billing.jaxrs.json.AccountJson;
import org.killbill.billing.jaxrs.json.AccountTimelineJson;
import org.killbill.billing.jaxrs.json.BundleJson;
import org.killbill.billing.jaxrs.json.CustomFieldJson;
-import org.killbill.billing.jaxrs.json.DirectPaymentJson;
-import org.killbill.billing.jaxrs.json.DirectTransactionJson;
+import org.killbill.billing.jaxrs.json.PaymentJson;
+import org.killbill.billing.jaxrs.json.PaymentTransactionJson;
import org.killbill.billing.jaxrs.json.InvoiceEmailJson;
import org.killbill.billing.jaxrs.json.InvoiceJson;
import org.killbill.billing.jaxrs.json.InvoicePaymentJson;
@@ -78,9 +78,8 @@ import org.killbill.billing.overdue.OverdueApiException;
import org.killbill.billing.overdue.OverdueState;
import org.killbill.billing.overdue.OverdueUserApi;
import org.killbill.billing.overdue.config.api.OverdueException;
-import org.killbill.billing.payment.api.DirectPayment;
-import org.killbill.billing.payment.api.DirectPaymentApi;
-import org.killbill.billing.payment.api.DirectPaymentTransaction;
+import org.killbill.billing.payment.api.Payment;
+import org.killbill.billing.payment.api.PaymentApi;
import org.killbill.billing.payment.api.PaymentApiException;
import org.killbill.billing.payment.api.PaymentMethod;
import org.killbill.billing.payment.api.PluginProperty;
@@ -101,12 +100,10 @@ import org.killbill.clock.Clock;
import com.google.common.base.Function;
import com.google.common.base.Predicate;
-import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.Collections2;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Iterables;
-import com.google.common.collect.Multimap;
import com.google.inject.Inject;
import com.google.inject.Singleton;
@@ -128,7 +125,7 @@ public class AccountResource extends JaxRsResourceBase {
final AccountUserApi accountApi,
final InvoiceUserApi invoiceApi,
final InvoicePaymentApi invoicePaymentApi,
- final DirectPaymentApi paymentApi,
+ final PaymentApi paymentApi,
final TagUserApi tagUserApi,
final AuditUserApi auditUserApi,
final CustomFieldUserApi customFieldUserApi,
@@ -327,7 +324,7 @@ public class AccountResource extends JaxRsResourceBase {
final List<Invoice> invoices = invoiceApi.getInvoicesByAccount(account.getId(), tenantContext);
// Get the payments
- final List<DirectPayment> payments = paymentApi.getAccountPayments(accountId, false, ImmutableList.<PluginProperty>of(), tenantContext);
+ final List<Payment> payments = paymentApi.getAccountPayments(accountId, false, ImmutableList.<PluginProperty>of(), tenantContext);
// Get the bundles
final List<SubscriptionBundle> bundles = subscriptionApi.getSubscriptionBundlesForAccountId(account.getId(), tenantContext);
@@ -446,11 +443,11 @@ public class AccountResource extends JaxRsResourceBase {
final UUID accountId = UUID.fromString(accountIdStr);
final TenantContext tenantContext = context.createContext(request);
final Account account = accountUserApi.getAccountById(accountId, tenantContext);
- final List<DirectPayment> payments = paymentApi.getAccountPayments(account.getId(), withPluginInfo, ImmutableList.<PluginProperty>of(), tenantContext);
+ final List<Payment> payments = paymentApi.getAccountPayments(account.getId(), withPluginInfo, ImmutableList.<PluginProperty>of(), tenantContext);
final List<InvoicePayment> invoicePayments = invoicePaymentApi.getInvoicePaymentsByAccount(accountId, tenantContext);
final AccountAuditLogs accountAuditLogs = auditUserApi.getAccountAuditLogs(accountId, auditMode.getLevel(), tenantContext);
final List<InvoicePaymentJson> result = new ArrayList<InvoicePaymentJson>(payments.size());
- for (final DirectPayment payment : payments) {
+ for (final Payment payment : payments) {
final UUID invoiceId = getInvoiceId(invoicePayments, payment);
result.add(new InvoicePaymentJson(payment, invoiceId, accountAuditLogs));
}
@@ -603,12 +600,12 @@ public class AccountResource extends JaxRsResourceBase {
@javax.ws.rs.core.Context final HttpServletRequest request) throws PaymentApiException {
final UUID accountId = UUID.fromString(accountIdStr);
final TenantContext tenantContext = context.createContext(request);
- final List<DirectPayment> payments = paymentApi.getAccountPayments(accountId, withPluginInfo, ImmutableList.<PluginProperty>of(), tenantContext);
+ final List<Payment> payments = paymentApi.getAccountPayments(accountId, withPluginInfo, ImmutableList.<PluginProperty>of(), tenantContext);
final AccountAuditLogs accountAuditLogs = auditUserApi.getAccountAuditLogs(accountId, auditMode.getLevel(), tenantContext);
- final List<DirectPaymentJson> result = ImmutableList.copyOf(Iterables.transform(payments, new Function<DirectPayment, DirectPaymentJson>() {
+ final List<PaymentJson> result = ImmutableList.copyOf(Iterables.transform(payments, new Function<Payment, PaymentJson>() {
@Override
- public DirectPaymentJson apply(final DirectPayment directPayment) {
- return new DirectPaymentJson(directPayment, accountAuditLogs);
+ public PaymentJson apply(final Payment payment) {
+ return new PaymentJson(payment, accountAuditLogs);
}
}));
return Response.status(Response.Status.OK).entity(result).build();
@@ -618,7 +615,7 @@ public class AccountResource extends JaxRsResourceBase {
@Path("/{accountId:" + UUID_PATTERN + "}/" + PAYMENTS)
@Consumes(APPLICATION_JSON)
@Produces(APPLICATION_JSON)
- public Response processDirectPayment(final DirectTransactionJson json,
+ public Response processPayment(final PaymentTransactionJson json,
@PathParam("accountId") final String accountIdStr,
@QueryParam("paymentMethodId") final String paymentMethodIdStr,
@QueryParam(QUERY_PLUGIN_PROPERTY) final List<String> pluginPropertiesString,
@@ -633,30 +630,30 @@ public class AccountResource extends JaxRsResourceBase {
final Account account = accountUserApi.getAccountById(accountId, callContext);
final UUID paymentMethodId = paymentMethodIdStr == null ? account.getPaymentMethodId() : UUID.fromString(paymentMethodIdStr);
final Currency currency = json.getCurrency() == null ? account.getCurrency() : Currency.valueOf(json.getCurrency());
- final UUID directPaymentId = json.getPaymentId() == null ? null : UUID.fromString(json.getPaymentId());
+ final UUID paymentId = json.getPaymentId() == null ? null : UUID.fromString(json.getPaymentId());
final TransactionType transactionType = TransactionType.valueOf(json.getTransactionType());
- final DirectPayment result;
+ final Payment result;
switch (transactionType) {
case AUTHORIZE:
- result = paymentApi.createAuthorization(account, paymentMethodId, directPaymentId, json.getAmount(), currency,
+ result = paymentApi.createAuthorization(account, paymentMethodId, paymentId, json.getAmount(), currency,
json.getPaymentExternalKey(), json.getTransactionExternalKey(),
pluginProperties, callContext);
break;
case PURCHASE:
- result = paymentApi.createPurchase(account, paymentMethodId, directPaymentId, json.getAmount(), currency,
+ result = paymentApi.createPurchase(account, paymentMethodId, paymentId, json.getAmount(), currency,
json.getPaymentExternalKey(), json.getTransactionExternalKey(),
pluginProperties, callContext);
break;
case CREDIT:
- result = paymentApi.createCredit(account, paymentMethodId, directPaymentId, json.getAmount(), currency,
+ result = paymentApi.createCredit(account, paymentMethodId, paymentId, json.getAmount(), currency,
json.getPaymentExternalKey(), json.getTransactionExternalKey(),
pluginProperties, callContext);
break;
default:
return Response.status(Status.PRECONDITION_FAILED).entity("TransactionType " + transactionType + " is not allowed for an account").build();
}
- return uriBuilder.buildResponse(DirectPaymentResource.class, "getDirectPayment", result.getId(), uriInfo.getBaseUri().toString());
+ return uriBuilder.buildResponse(PaymentResource.class, "getPayment", result.getId(), uriInfo.getBaseUri().toString());
}
/*
diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/BundleResource.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/BundleResource.java
index 9683bd1..0b67c0b 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/BundleResource.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/BundleResource.java
@@ -45,7 +45,7 @@ import org.killbill.billing.ObjectType;
import org.killbill.billing.account.api.AccountApiException;
import org.killbill.billing.account.api.AccountUserApi;
import org.killbill.billing.catalog.api.BillingActionPolicy;
-import org.killbill.billing.payment.api.DirectPaymentApi;
+import org.killbill.billing.payment.api.PaymentApi;
import org.killbill.clock.Clock;
import org.killbill.billing.entitlement.api.EntitlementApi;
import org.killbill.billing.entitlement.api.EntitlementApiException;
@@ -89,7 +89,7 @@ public class BundleResource extends JaxRsResourceBase {
final AccountUserApi accountUserApi,
final SubscriptionApi subscriptionApi,
final EntitlementApi entitlementApi,
- final DirectPaymentApi paymentApi,
+ final PaymentApi paymentApi,
final Clock clock,
final Context context) {
super(uriBuilder, tagUserApi, customFieldUserApi, auditUserApi, accountUserApi, paymentApi, clock, context);
diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/CatalogResource.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/CatalogResource.java
index ab6bb58..a2db429 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/CatalogResource.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/CatalogResource.java
@@ -32,7 +32,7 @@ import org.killbill.billing.catalog.api.CatalogApiException;
import org.killbill.billing.catalog.api.CatalogService;
import org.killbill.billing.catalog.api.Listing;
import org.killbill.billing.catalog.api.StaticCatalog;
-import org.killbill.billing.payment.api.DirectPaymentApi;
+import org.killbill.billing.payment.api.PaymentApi;
import org.killbill.clock.Clock;
import org.killbill.billing.jaxrs.json.CatalogJsonSimple;
import org.killbill.billing.jaxrs.json.PlanDetailJson;
@@ -62,7 +62,7 @@ public class CatalogResource extends JaxRsResourceBase {
final CustomFieldUserApi customFieldUserApi,
final AuditUserApi auditUserApi,
final AccountUserApi accountUserApi,
- final DirectPaymentApi paymentApi,
+ final PaymentApi paymentApi,
final Clock clock,
final Context context) {
super(uriBuilder, tagUserApi, customFieldUserApi, auditUserApi, accountUserApi, paymentApi, clock, context);
diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/CreditResource.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/CreditResource.java
index c2a81db..3af4ca5 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/CreditResource.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/CreditResource.java
@@ -35,7 +35,7 @@ import org.killbill.billing.ObjectType;
import org.killbill.billing.account.api.Account;
import org.killbill.billing.account.api.AccountApiException;
import org.killbill.billing.account.api.AccountUserApi;
-import org.killbill.billing.payment.api.DirectPaymentApi;
+import org.killbill.billing.payment.api.PaymentApi;
import org.killbill.clock.Clock;
import org.killbill.billing.invoice.api.Invoice;
import org.killbill.billing.invoice.api.InvoiceApiException;
@@ -69,7 +69,7 @@ public class CreditResource extends JaxRsResourceBase {
final TagUserApi tagUserApi,
final CustomFieldUserApi customFieldUserApi,
final AuditUserApi auditUserApi,
- final DirectPaymentApi paymentApi,
+ final PaymentApi paymentApi,
final Clock clock,
final Context context) {
super(uriBuilder, tagUserApi, customFieldUserApi, auditUserApi, accountUserApi, paymentApi, clock, context);
diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/CustomFieldResource.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/CustomFieldResource.java
index a2d75b0..a6772fe 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/CustomFieldResource.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/CustomFieldResource.java
@@ -30,7 +30,7 @@ import javax.ws.rs.core.Response;
import org.killbill.billing.ObjectType;
import org.killbill.billing.account.api.AccountUserApi;
-import org.killbill.billing.payment.api.DirectPaymentApi;
+import org.killbill.billing.payment.api.PaymentApi;
import org.killbill.clock.Clock;
import org.killbill.billing.jaxrs.json.CustomFieldJson;
import org.killbill.billing.jaxrs.util.Context;
@@ -61,7 +61,7 @@ public class CustomFieldResource extends JaxRsResourceBase {
final CustomFieldUserApi customFieldUserApi,
final AuditUserApi auditUserApi,
final AccountUserApi accountUserApi,
- final DirectPaymentApi paymentApi,
+ final PaymentApi paymentApi,
final Clock clock,
final Context context) {
super(uriBuilder, tagUserApi, customFieldUserApi, auditUserApi, accountUserApi, paymentApi, clock, context);
diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/ExportResource.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/ExportResource.java
index 46982e6..c04ef4a 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/ExportResource.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/ExportResource.java
@@ -31,7 +31,7 @@ import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.StreamingOutput;
import org.killbill.billing.account.api.AccountUserApi;
-import org.killbill.billing.payment.api.DirectPaymentApi;
+import org.killbill.billing.payment.api.PaymentApi;
import org.killbill.clock.Clock;
import org.killbill.billing.jaxrs.util.Context;
import org.killbill.billing.jaxrs.util.JaxrsUriBuilder;
@@ -58,7 +58,7 @@ public class ExportResource extends JaxRsResourceBase {
final CustomFieldUserApi customFieldUserApi,
final AuditUserApi auditUserApi,
final AccountUserApi accountUserApi,
- final DirectPaymentApi paymentApi,
+ final PaymentApi paymentApi,
final Clock clock,
final Context context) {
super(uriBuilder, tagUserApi, customFieldUserApi, auditUserApi, accountUserApi, paymentApi, clock, context);
diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/InvoicePaymentResource.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/InvoicePaymentResource.java
index 95cfe9c..0c29da0 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/InvoicePaymentResource.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/InvoicePaymentResource.java
@@ -51,8 +51,8 @@ import org.killbill.billing.jaxrs.json.InvoicePaymentJson;
import org.killbill.billing.jaxrs.json.InvoicePaymentTransactionJson;
import org.killbill.billing.jaxrs.util.Context;
import org.killbill.billing.jaxrs.util.JaxrsUriBuilder;
-import org.killbill.billing.payment.api.DirectPayment;
-import org.killbill.billing.payment.api.DirectPaymentApi;
+import org.killbill.billing.payment.api.Payment;
+import org.killbill.billing.payment.api.PaymentApi;
import org.killbill.billing.payment.api.PaymentApiException;
import org.killbill.billing.payment.api.PluginProperty;
import org.killbill.billing.util.api.AuditUserApi;
@@ -82,7 +82,7 @@ public class InvoicePaymentResource extends JaxRsResourceBase {
@Inject
public InvoicePaymentResource(final AccountUserApi accountUserApi,
- final DirectPaymentApi paymentApi,
+ final PaymentApi paymentApi,
final JaxrsUriBuilder uriBuilder,
final TagUserApi tagUserApi,
final CustomFieldUserApi customFieldUserApi,
@@ -97,19 +97,19 @@ public class InvoicePaymentResource extends JaxRsResourceBase {
@GET
@Path("/{paymentId:" + UUID_PATTERN + "}/")
@Produces(APPLICATION_JSON)
- public Response getInvoicePayment(@PathParam("paymentId") final String directPaymentIdStr,
+ public Response getInvoicePayment(@PathParam("paymentId") final String paymentIdStr,
@QueryParam(QUERY_WITH_PLUGIN_INFO) @DefaultValue("false") final Boolean withPluginInfo,
@QueryParam(QUERY_PLUGIN_PROPERTY) final List<String> pluginPropertiesString,
@QueryParam(QUERY_AUDIT) @DefaultValue("NONE") final AuditMode auditMode,
@javax.ws.rs.core.Context final HttpServletRequest request) throws PaymentApiException {
final Iterable<PluginProperty> pluginProperties = extractPluginProperties(pluginPropertiesString);
- final UUID directPaymentIdId = UUID.fromString(directPaymentIdStr);
+ final UUID paymentIdId = UUID.fromString(paymentIdStr);
final TenantContext tenantContext = context.createContext(request);
- final DirectPayment directPayment = paymentApi.getPayment(directPaymentIdId, withPluginInfo, pluginProperties, tenantContext);
- final AccountAuditLogs accountAuditLogs = auditUserApi.getAccountAuditLogs(directPayment.getAccountId(), auditMode.getLevel(), tenantContext);
+ final Payment payment = paymentApi.getPayment(paymentIdId, withPluginInfo, pluginProperties, tenantContext);
+ final AccountAuditLogs accountAuditLogs = auditUserApi.getAccountAuditLogs(payment.getAccountId(), auditMode.getLevel(), tenantContext);
- final List<InvoicePayment> invoicePayments = invoicePaymentApi.getInvoicePayments(directPaymentIdId, tenantContext);
+ final List<InvoicePayment> invoicePayments = invoicePaymentApi.getInvoicePayments(paymentIdId, tenantContext);
final InvoicePayment invoicePayment = Iterables.tryFind(invoicePayments, new Predicate<InvoicePayment>() {
@Override
public boolean apply(final InvoicePayment input) {
@@ -118,7 +118,7 @@ public class InvoicePaymentResource extends JaxRsResourceBase {
}).orNull();
final UUID invoiceId = invoicePayment != null ? invoicePayment.getInvoiceId() : null;
- final InvoicePaymentJson result = new InvoicePaymentJson(directPayment, invoiceId, accountAuditLogs);
+ final InvoicePaymentJson result = new InvoicePaymentJson(payment, invoiceId, accountAuditLogs);
return Response.status(Response.Status.OK).entity(result).build();
}
@@ -137,7 +137,7 @@ public class InvoicePaymentResource extends JaxRsResourceBase {
final CallContext callContext = context.createContext(createdBy, reason, comment, request);
final UUID paymentUuid = UUID.fromString(paymentId);
- final DirectPayment payment = paymentApi.getPayment(paymentUuid, false, ImmutableList.<PluginProperty>of(), callContext);
+ final Payment payment = paymentApi.getPayment(paymentUuid, false, ImmutableList.<PluginProperty>of(), callContext);
final Account account = accountUserApi.getAccountById(payment.getAccountId(), callContext);
final Iterable<PluginProperty> pluginProperties;
@@ -159,7 +159,7 @@ public class InvoicePaymentResource extends JaxRsResourceBase {
pluginProperties = extractPluginProperties(pluginPropertiesString);
}
- final DirectPayment result = paymentApi.createRefundWithPaymentControl(account, payment.getId(), json.getAmount(), account.getCurrency(), transactionExternalKey,
+ final Payment result = paymentApi.createRefundWithPaymentControl(account, payment.getId(), json.getAmount(), account.getCurrency(), transactionExternalKey,
pluginProperties, createInvoicePaymentControlPluginApiPaymentOptions(false), callContext);
return uriBuilder.buildResponse(InvoicePaymentResource.class, "getInvoicePayment", result.getId(), uriInfo.getBaseUri().toString());
}
@@ -178,11 +178,11 @@ public class InvoicePaymentResource extends JaxRsResourceBase {
final CallContext callContext = context.createContext(createdBy, reason, comment, request);
final UUID paymentUuid = UUID.fromString(paymentId);
- final DirectPayment payment = paymentApi.getPayment(paymentUuid, false, ImmutableList.<PluginProperty>of(), callContext);
+ final Payment payment = paymentApi.getPayment(paymentUuid, false, ImmutableList.<PluginProperty>of(), callContext);
final Account account = accountUserApi.getAccountById(payment.getAccountId(), callContext);
final String transactionExternalKey = json.getTransactionExternalKey() != null ? json.getTransactionExternalKey() : UUID.randomUUID().toString();
- final DirectPayment result = paymentApi.createChargebackWithPaymentControl(account, payment.getId(), json.getAmount(), account.getCurrency(),
+ final Payment result = paymentApi.createChargebackWithPaymentControl(account, payment.getId(), json.getAmount(), account.getCurrency(),
transactionExternalKey, createInvoicePaymentControlPluginApiPaymentOptions(false), callContext);
return uriBuilder.buildResponse(uriInfo, InvoicePaymentResource.class, "getInvoicePayment", result.getId());
}
@@ -236,7 +236,7 @@ public class InvoicePaymentResource extends JaxRsResourceBase {
final Iterable<PluginProperty> pluginProperties = extractPluginProperties(pluginPropertiesString);
final UUID paymentId = UUID.fromString(paymentIdString);
final TenantContext tenantContext = context.createContext(request);
- final DirectPayment payment = paymentApi.getPayment(paymentId, false, pluginProperties, tenantContext);
+ final Payment payment = paymentApi.getPayment(paymentId, false, pluginProperties, tenantContext);
return super.getTags(payment.getAccountId(), paymentId, auditMode, includedDeleted, tenantContext);
}
diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/InvoiceResource.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/InvoiceResource.java
index 979a339..29ac896 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/InvoiceResource.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/InvoiceResource.java
@@ -65,8 +65,8 @@ import org.killbill.billing.jaxrs.json.InvoiceJson;
import org.killbill.billing.jaxrs.json.InvoicePaymentJson;
import org.killbill.billing.jaxrs.util.Context;
import org.killbill.billing.jaxrs.util.JaxrsUriBuilder;
-import org.killbill.billing.payment.api.DirectPayment;
-import org.killbill.billing.payment.api.DirectPaymentApi;
+import org.killbill.billing.payment.api.Payment;
+import org.killbill.billing.payment.api.PaymentApi;
import org.killbill.billing.payment.api.PaymentApiException;
import org.killbill.billing.payment.api.PluginProperty;
import org.killbill.billing.util.api.AuditUserApi;
@@ -105,7 +105,7 @@ public class InvoiceResource extends JaxRsResourceBase {
@Inject
public InvoiceResource(final AccountUserApi accountUserApi,
final InvoiceUserApi invoiceApi,
- final DirectPaymentApi paymentApi,
+ final PaymentApi paymentApi,
final InvoiceNotifier invoiceNotifier,
final Clock clock,
final JaxrsUriBuilder uriBuilder,
@@ -380,16 +380,16 @@ public class InvoiceResource extends JaxRsResourceBase {
final TenantContext tenantContext = context.createContext(request);
final Invoice invoice = invoiceApi.getInvoice(UUID.fromString(invoiceId), tenantContext);
- final List<DirectPayment> payments = new ArrayList<DirectPayment>();
+ final List<Payment> payments = new ArrayList<Payment>();
for (InvoicePayment cur : invoice.getPayments()) {
- final DirectPayment payment = paymentApi.getPayment(cur.getPaymentId(), withPluginInfo, ImmutableList.<PluginProperty>of(), tenantContext);
+ final Payment payment = paymentApi.getPayment(cur.getPaymentId(), withPluginInfo, ImmutableList.<PluginProperty>of(), tenantContext);
payments.add(payment);
}
final List<InvoicePaymentJson> result = new ArrayList<InvoicePaymentJson>(payments.size());
if (payments.isEmpty()) {
return Response.status(Status.OK).entity(result).build();
}
- for (final DirectPayment cur : payments) {
+ for (final Payment cur : payments) {
result.add(new InvoicePaymentJson(cur, invoice.getId(), null));
}
return Response.status(Status.OK).entity(result).build();
@@ -412,7 +412,7 @@ public class InvoiceResource extends JaxRsResourceBase {
final Account account = accountUserApi.getAccountById(UUID.fromString(payment.getAccountId()), callContext);
final UUID invoiceId = UUID.fromString(payment.getTargetInvoiceId());
- final DirectPayment result = createPurchaseForInvoice(account, invoiceId, payment.getPurchasedAmount(), externalPayment, callContext);
+ final Payment result = createPurchaseForInvoice(account, invoiceId, payment.getPurchasedAmount(), externalPayment, callContext);
// STEPH should that live in InvoicePayment instead?
return uriBuilder.buildResponse(uriInfo, InvoicePaymentResource.class, "getInvoicePayment", result.getId());
}
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 da2605d..13dd28e 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
@@ -57,9 +57,9 @@ import org.killbill.billing.jaxrs.json.JsonBase;
import org.killbill.billing.jaxrs.json.TagJson;
import org.killbill.billing.jaxrs.util.Context;
import org.killbill.billing.jaxrs.util.JaxrsUriBuilder;
-import org.killbill.billing.payment.api.DirectPayment;
-import org.killbill.billing.payment.api.DirectPaymentApi;
-import org.killbill.billing.payment.api.DirectPaymentTransaction;
+import org.killbill.billing.payment.api.Payment;
+import org.killbill.billing.payment.api.PaymentApi;
+import org.killbill.billing.payment.api.PaymentTransaction;
import org.killbill.billing.payment.api.PaymentApiException;
import org.killbill.billing.payment.api.PaymentOptions;
import org.killbill.billing.payment.api.PluginProperty;
@@ -104,7 +104,7 @@ public abstract class JaxRsResourceBase implements JaxrsResource {
protected final CustomFieldUserApi customFieldUserApi;
protected final AuditUserApi auditUserApi;
protected final AccountUserApi accountUserApi;
- protected final DirectPaymentApi paymentApi;
+ protected final PaymentApi paymentApi;
protected final Context context;
protected final Clock clock;
@@ -116,7 +116,7 @@ public abstract class JaxRsResourceBase implements JaxrsResource {
final CustomFieldUserApi customFieldUserApi,
final AuditUserApi auditUserApi,
final AccountUserApi accountUserApi,
- final DirectPaymentApi paymentApi,
+ final PaymentApi paymentApi,
final Clock clock,
final Context context) {
this.uriBuilder = uriBuilder;
@@ -349,7 +349,7 @@ public abstract class JaxRsResourceBase implements JaxrsResource {
return properties;
}
- protected DirectPayment createPurchaseForInvoice(final Account account, final UUID invoiceId, final BigDecimal amountToPay, final Boolean externalPayment, final CallContext callContext) throws PaymentApiException {
+ protected Payment createPurchaseForInvoice(final Account account, final UUID invoiceId, final BigDecimal amountToPay, final Boolean externalPayment, final CallContext callContext) throws PaymentApiException {
final List<PluginProperty> properties = new ArrayList<PluginProperty>();
final String paymentExternalKey = UUID.randomUUID().toString();
@@ -378,13 +378,13 @@ public abstract class JaxRsResourceBase implements JaxrsResource {
};
}
- public static Iterable<DirectPaymentTransaction> getDirectPaymentTransactions(final List<DirectPayment> payments, final TransactionType transactionType) {
- return Iterables.concat(Iterables.transform(payments, new Function<DirectPayment, Iterable<DirectPaymentTransaction>>() {
+ public static Iterable<PaymentTransaction> getPaymentTransactions(final List<Payment> payments, final TransactionType transactionType) {
+ return Iterables.concat(Iterables.transform(payments, new Function<Payment, Iterable<PaymentTransaction>>() {
@Override
- public Iterable<DirectPaymentTransaction> apply(final DirectPayment input) {
- return Iterables.filter(input.getTransactions(), new Predicate<DirectPaymentTransaction>() {
+ public Iterable<PaymentTransaction> apply(final Payment input) {
+ return Iterables.filter(input.getTransactions(), new Predicate<PaymentTransaction>() {
@Override
- public boolean apply(final DirectPaymentTransaction input) {
+ public boolean apply(final PaymentTransaction input) {
return input.getTransactionType() == transactionType;
}
});
@@ -392,7 +392,7 @@ public abstract class JaxRsResourceBase implements JaxrsResource {
}));
}
- public static UUID getInvoiceId(final List<InvoicePayment> invoicePayments, final DirectPayment payment) {
+ public static UUID getInvoiceId(final List<InvoicePayment> invoicePayments, final Payment payment) {
final InvoicePayment invoicePayment = Iterables.tryFind(invoicePayments, new Predicate<InvoicePayment>() {
@Override
public boolean apply(final InvoicePayment input) {
diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/PaymentGatewayResource.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/PaymentGatewayResource.java
index 12ab453..7ce7194 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/PaymentGatewayResource.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/PaymentGatewayResource.java
@@ -41,7 +41,7 @@ import org.killbill.billing.jaxrs.json.HostedPaymentPageFormDescriptorJson;
import org.killbill.billing.jaxrs.json.PluginPropertyJson;
import org.killbill.billing.jaxrs.util.Context;
import org.killbill.billing.jaxrs.util.JaxrsUriBuilder;
-import org.killbill.billing.payment.api.DirectPaymentApi;
+import org.killbill.billing.payment.api.PaymentApi;
import org.killbill.billing.payment.api.PaymentApiException;
import org.killbill.billing.payment.api.PaymentGatewayApi;
import org.killbill.billing.payment.api.PluginProperty;
@@ -73,7 +73,7 @@ public class PaymentGatewayResource extends JaxRsResourceBase {
final AuditUserApi auditUserApi,
final AccountUserApi accountUserApi,
final PaymentGatewayApi paymentGatewayApi,
- final DirectPaymentApi paymentApi,
+ final PaymentApi paymentApi,
final Clock clock,
final Context context) {
super(uriBuilder, tagUserApi, customFieldUserApi, auditUserApi, accountUserApi, paymentApi, clock, context);
diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/PaymentMethodResource.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/PaymentMethodResource.java
index e8d386a..e6be9a6 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/PaymentMethodResource.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/PaymentMethodResource.java
@@ -44,7 +44,7 @@ import org.killbill.billing.account.api.AccountUserApi;
import org.killbill.billing.jaxrs.json.PaymentMethodJson;
import org.killbill.billing.jaxrs.util.Context;
import org.killbill.billing.jaxrs.util.JaxrsUriBuilder;
-import org.killbill.billing.payment.api.DirectPaymentApi;
+import org.killbill.billing.payment.api.PaymentApi;
import org.killbill.billing.payment.api.PaymentApiException;
import org.killbill.billing.payment.api.PaymentMethod;
import org.killbill.billing.payment.api.PluginProperty;
@@ -75,7 +75,7 @@ public class PaymentMethodResource extends JaxRsResourceBase {
final TagUserApi tagUserApi,
final CustomFieldUserApi customFieldUserApi,
final AuditUserApi auditUserApi,
- final DirectPaymentApi paymentApi,
+ final PaymentApi paymentApi,
final Clock clock,
final Context context) {
super(uriBuilder, tagUserApi, customFieldUserApi, auditUserApi, accountUserApi, paymentApi, clock, context);
diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/PluginResource.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/PluginResource.java
index 169be7e..6b1b15a 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/PluginResource.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/PluginResource.java
@@ -45,7 +45,7 @@ import javax.ws.rs.Path;
import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.Response;
-import org.killbill.billing.payment.api.DirectPaymentApi;
+import org.killbill.billing.payment.api.PaymentApi;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -79,7 +79,7 @@ public class PluginResource extends JaxRsResourceBase {
final CustomFieldUserApi customFieldUserApi,
final AuditUserApi auditUserApi,
final AccountUserApi accountUserApi,
- final DirectPaymentApi paymentApi,
+ final PaymentApi paymentApi,
final Clock clock,
final Context context) {
super(uriBuilder, tagUserApi, customFieldUserApi, auditUserApi, accountUserApi, paymentApi, clock, context);
diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/SecurityResource.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/SecurityResource.java
index 520e3aa..f9a904c 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/SecurityResource.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/SecurityResource.java
@@ -31,7 +31,7 @@ import org.apache.shiro.SecurityUtils;
import org.apache.shiro.subject.Subject;
import org.killbill.billing.account.api.AccountUserApi;
-import org.killbill.billing.payment.api.DirectPaymentApi;
+import org.killbill.billing.payment.api.PaymentApi;
import org.killbill.clock.Clock;
import org.killbill.billing.jaxrs.json.SubjectJson;
import org.killbill.billing.jaxrs.util.Context;
@@ -62,7 +62,7 @@ public class SecurityResource extends JaxRsResourceBase {
final CustomFieldUserApi customFieldUserApi,
final AuditUserApi auditUserApi,
final AccountUserApi accountUserApi,
- final DirectPaymentApi paymentApi,
+ final PaymentApi paymentApi,
final Clock clock,
final Context context) {
super(uriBuilder, tagUserApi, customFieldUserApi, auditUserApi, accountUserApi, paymentApi, clock, context);
diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/SubscriptionResource.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/SubscriptionResource.java
index 372be81..47038ac 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/SubscriptionResource.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/SubscriptionResource.java
@@ -38,7 +38,7 @@ import javax.ws.rs.core.Response.Status;
import javax.ws.rs.core.UriInfo;
import org.joda.time.LocalDate;
-import org.killbill.billing.payment.api.DirectPaymentApi;
+import org.killbill.billing.payment.api.PaymentApi;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -101,7 +101,7 @@ public class SubscriptionResource extends JaxRsResourceBase {
final EntitlementApi entitlementApi,
final SubscriptionApi subscriptionApi,
final AccountUserApi accountUserApi,
- final DirectPaymentApi paymentApi,
+ final PaymentApi paymentApi,
final Clock clock,
final Context context) {
super(uriBuilder, tagUserApi, customFieldUserApi, auditUserApi, accountUserApi, paymentApi, clock, context);
diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/TagDefinitionResource.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/TagDefinitionResource.java
index b3956e8..2d8ae8e 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/TagDefinitionResource.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/TagDefinitionResource.java
@@ -38,7 +38,7 @@ import javax.ws.rs.core.UriInfo;
import org.killbill.billing.ObjectType;
import org.killbill.billing.account.api.AccountUserApi;
-import org.killbill.billing.payment.api.DirectPaymentApi;
+import org.killbill.billing.payment.api.PaymentApi;
import org.killbill.clock.Clock;
import org.killbill.billing.jaxrs.json.TagDefinitionJson;
import org.killbill.billing.jaxrs.util.Context;
@@ -67,7 +67,7 @@ public class TagDefinitionResource extends JaxRsResourceBase {
final CustomFieldUserApi customFieldUserApi,
final AuditUserApi auditUserApi,
final AccountUserApi accountUserApi,
- final DirectPaymentApi paymentApi,
+ final PaymentApi paymentApi,
final Clock clock,
final Context context) {
super(uriBuilder, tagUserApi, customFieldUserApi, auditUserApi, accountUserApi, paymentApi, clock, context);
diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/TagResource.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/TagResource.java
index b480c6d..656f8ba 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/TagResource.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/TagResource.java
@@ -33,7 +33,7 @@ import javax.ws.rs.core.Response;
import org.killbill.billing.ObjectType;
import org.killbill.billing.account.api.AccountUserApi;
-import org.killbill.billing.payment.api.DirectPaymentApi;
+import org.killbill.billing.payment.api.PaymentApi;
import org.killbill.clock.Clock;
import org.killbill.billing.jaxrs.json.TagJson;
import org.killbill.billing.jaxrs.util.Context;
@@ -65,7 +65,7 @@ public class TagResource extends JaxRsResourceBase {
final CustomFieldUserApi customFieldUserApi,
final AuditUserApi auditUserApi,
final AccountUserApi accountUserApi,
- final DirectPaymentApi paymentApi,
+ final PaymentApi paymentApi,
final Clock clock,
final Context context) {
super(uriBuilder, tagUserApi, customFieldUserApi, auditUserApi, accountUserApi, paymentApi, clock, context);
diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/TenantResource.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/TenantResource.java
index d7d0791..66474f0 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/TenantResource.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/TenantResource.java
@@ -37,7 +37,7 @@ import javax.ws.rs.core.UriInfo;
import org.killbill.billing.ObjectType;
import org.killbill.billing.account.api.AccountUserApi;
-import org.killbill.billing.payment.api.DirectPaymentApi;
+import org.killbill.billing.payment.api.PaymentApi;
import org.killbill.clock.Clock;
import org.killbill.billing.jaxrs.json.TenantJson;
import org.killbill.billing.jaxrs.json.TenantKeyJson;
@@ -72,7 +72,7 @@ public class TenantResource extends JaxRsResourceBase {
final CustomFieldUserApi customFieldUserApi,
final AuditUserApi auditUserApi,
final AccountUserApi accountUserApi,
- final DirectPaymentApi paymentApi,
+ final PaymentApi paymentApi,
final Clock clock,
final Context context) {
super(uriBuilder, tagUserApi, customFieldUserApi, auditUserApi, accountUserApi, paymentApi, clock, context);
diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/TestResource.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/TestResource.java
index 58f2214..250139a 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/TestResource.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/TestResource.java
@@ -38,7 +38,7 @@ import org.killbill.billing.ObjectType;
import org.killbill.billing.account.api.AccountUserApi;
import org.killbill.billing.jaxrs.util.Context;
import org.killbill.billing.jaxrs.util.JaxrsUriBuilder;
-import org.killbill.billing.payment.api.DirectPaymentApi;
+import org.killbill.billing.payment.api.PaymentApi;
import org.killbill.billing.util.api.AuditUserApi;
import org.killbill.billing.util.api.CustomFieldUserApi;
import org.killbill.billing.util.api.RecordIdApi;
@@ -79,7 +79,7 @@ public class TestResource extends JaxRsResourceBase {
@Inject
public TestResource(final JaxrsUriBuilder uriBuilder, final TagUserApi tagUserApi, final CustomFieldUserApi customFieldUserApi,
final AuditUserApi auditUserApi, final AccountUserApi accountUserApi, final RecordIdApi recordIdApi,
- final NotificationQueueService notificationQueueService, final DirectPaymentApi paymentApi,
+ final NotificationQueueService notificationQueueService, final PaymentApi paymentApi,
final Clock clock, final Context context) {
super(uriBuilder, tagUserApi, customFieldUserApi, auditUserApi, accountUserApi, paymentApi, clock, context);
this.notificationQueueService = notificationQueueService;
diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/UsageResource.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/UsageResource.java
index 746d481..1a00cd4 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/UsageResource.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/UsageResource.java
@@ -37,7 +37,7 @@ import org.killbill.billing.account.api.AccountUserApi;
import org.killbill.billing.jaxrs.json.UsageJson;
import org.killbill.billing.jaxrs.util.Context;
import org.killbill.billing.jaxrs.util.JaxrsUriBuilder;
-import org.killbill.billing.payment.api.DirectPaymentApi;
+import org.killbill.billing.payment.api.PaymentApi;
import org.killbill.billing.usage.api.RolledUpUsage;
import org.killbill.billing.usage.api.UsageUserApi;
import org.killbill.billing.util.api.AuditUserApi;
@@ -63,7 +63,7 @@ public class UsageResource extends JaxRsResourceBase {
final AuditUserApi auditUserApi,
final AccountUserApi accountUserApi,
final UsageUserApi usageUserApi,
- final DirectPaymentApi paymentApi,
+ final PaymentApi paymentApi,
final Clock clock,
final Context context) {
super(uriBuilder, tagUserApi, customFieldUserApi, auditUserApi, accountUserApi, paymentApi, clock, context);
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 50fb873..cc236ce 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
@@ -30,7 +30,7 @@ import org.killbill.billing.account.api.AccountApiException;
import org.killbill.billing.account.api.AccountInternalApi;
import org.killbill.billing.callcontext.InternalCallContext;
import org.killbill.billing.events.InvoiceCreationInternalEvent;
-import org.killbill.billing.payment.api.DirectPaymentApi;
+import org.killbill.billing.payment.api.PaymentApi;
import org.killbill.billing.payment.api.PaymentApiException;
import org.killbill.billing.payment.api.PaymentOptions;
import org.killbill.billing.payment.api.PluginProperty;
diff --git a/payment/src/main/java/org/killbill/billing/payment/control/InvoicePaymentControlPluginApi.java b/payment/src/main/java/org/killbill/billing/payment/control/InvoicePaymentControlPluginApi.java
index 746204c..8d1ee9b 100644
--- a/payment/src/main/java/org/killbill/billing/payment/control/InvoicePaymentControlPluginApi.java
+++ b/payment/src/main/java/org/killbill/billing/payment/control/InvoicePaymentControlPluginApi.java
@@ -258,16 +258,16 @@ public final class InvoicePaymentControlPluginApi implements PaymentControlPlugi
" aborted: requested refund amount is = " + paymentControlPluginContext.getAmount());
}
- final PaymentModelDao directPayment = paymentDao.getDirectPayment(paymentControlPluginContext.getPaymentId(), internalContext);
- if (directPayment == null) {
+ final PaymentModelDao payment = paymentDao.getPayment(paymentControlPluginContext.getPaymentId(), internalContext);
+ if (payment == null) {
throw new PaymentControlApiException();
}
// STEPH this check for invoice item but we also need to check that refundAmount is less or equal to paymentAmount - all refund.
- final BigDecimal amountToBeRefunded = computeRefundAmount(directPayment.getId(), paymentControlPluginContext.getAmount(), idWithAmount, internalContext);
+ final BigDecimal amountToBeRefunded = computeRefundAmount(payment.getId(), paymentControlPluginContext.getAmount(), idWithAmount, internalContext);
final boolean isAborted = amountToBeRefunded.compareTo(BigDecimal.ZERO) == 0;
if (paymentControlPluginContext.isApiPayment() && isAborted) {
- throw new PaymentControlApiException("Refund for payment " + directPayment.getId() +
+ throw new PaymentControlApiException("Refund for payment " + payment.getId() +
" aborted : invoice item sum amount is " + amountToBeRefunded +
", requested refund amount is = " + paymentControlPluginContext.getAmount());
} else {
@@ -412,11 +412,11 @@ public final class InvoicePaymentControlPluginApi implements PaymentControlPlugi
}
private List<PaymentTransactionModelDao> getPurchasedTransactions(final String paymentExternalKey, final InternalCallContext internalContext) {
- final PaymentModelDao payment = paymentDao.getDirectPaymentByExternalKey(paymentExternalKey, internalContext);
+ final PaymentModelDao payment = paymentDao.getPaymentByExternalKey(paymentExternalKey, internalContext);
if (payment == null) {
return Collections.emptyList();
}
- final List<PaymentTransactionModelDao> transactions = paymentDao.getDirectTransactionsForDirectPayment(payment.getId(), internalContext);
+ final List<PaymentTransactionModelDao> transactions = paymentDao.getTransactionsForPayment(payment.getId(), internalContext);
if (transactions == null || transactions.size() == 0) {
return Collections.emptyList();
}
diff --git a/payment/src/main/java/org/killbill/billing/payment/control/PaymentTagHandler.java b/payment/src/main/java/org/killbill/billing/payment/control/PaymentTagHandler.java
index 271380f..0564250 100644
--- a/payment/src/main/java/org/killbill/billing/payment/control/PaymentTagHandler.java
+++ b/payment/src/main/java/org/killbill/billing/payment/control/PaymentTagHandler.java
@@ -26,7 +26,7 @@ import org.killbill.billing.callcontext.InternalCallContext;
import org.killbill.billing.events.ControlTagDeletionInternalEvent;
import org.killbill.billing.osgi.api.OSGIServiceRegistration;
import org.killbill.billing.payment.api.PaymentApiException;
-import org.killbill.billing.payment.core.DirectPaymentProcessor;
+import org.killbill.billing.payment.core.PaymentProcessor;
import org.killbill.billing.retry.plugin.api.PaymentControlPluginApi;
import org.killbill.billing.util.callcontext.CallOrigin;
import org.killbill.billing.util.callcontext.InternalCallContextFactory;
@@ -45,7 +45,7 @@ public class PaymentTagHandler {
private final Clock clock;
private final AccountInternalApi accountApi;
- private final DirectPaymentProcessor paymentProcessor;
+ private final PaymentProcessor paymentProcessor;
private final InternalCallContextFactory internalCallContextFactory;
private final OSGIServiceRegistration<PaymentControlPluginApi> paymentControlPluginRegistry;
private final PaymentControlPluginApi invoicePaymentControlPlugin;
@@ -53,7 +53,7 @@ public class PaymentTagHandler {
@Inject
public PaymentTagHandler(final Clock clock,
final AccountInternalApi accountApi,
- final DirectPaymentProcessor paymentProcessor,
+ final PaymentProcessor paymentProcessor,
final OSGIServiceRegistration<PaymentControlPluginApi> paymentControlPluginRegistry,
final InternalCallContextFactory internalCallContextFactory) {
this.clock = clock;
diff --git a/payment/src/main/java/org/killbill/billing/payment/core/Janitor.java b/payment/src/main/java/org/killbill/billing/payment/core/Janitor.java
index 2d7cb57..aa9a97c 100644
--- a/payment/src/main/java/org/killbill/billing/payment/core/Janitor.java
+++ b/payment/src/main/java/org/killbill/billing/payment/core/Janitor.java
@@ -36,9 +36,9 @@ import org.killbill.billing.callcontext.InternalCallContext;
import org.killbill.billing.callcontext.InternalTenantContext;
import org.killbill.billing.payment.api.PaymentApiException;
import org.killbill.billing.payment.api.TransactionStatus;
-import org.killbill.billing.payment.core.sm.PluginControlledDirectPaymentAutomatonRunner;
+import org.killbill.billing.payment.core.sm.PluginControlledPaymentAutomatonRunner;
import org.killbill.billing.payment.core.sm.RetryStateMachineHelper;
-import org.killbill.billing.payment.core.sm.RetryableDirectPaymentStateContext;
+import org.killbill.billing.payment.core.sm.RetryablePaymentStateContext;
import org.killbill.billing.payment.dao.PaymentAttemptModelDao;
import org.killbill.billing.payment.dao.PaymentDao;
import org.killbill.billing.payment.dao.PaymentTransactionModelDao;
@@ -72,7 +72,7 @@ public class Janitor {
private final PaymentConfig paymentConfig;
private final InternalCallContextFactory internalCallContextFactory;
private final NonEntityDao nonEntityDao;
- private final PluginControlledDirectPaymentAutomatonRunner pluginControlledDirectPaymentAutomatonRunner;
+ private final PluginControlledPaymentAutomatonRunner pluginControlledPaymentAutomatonRunner;
private final RetryStateMachineHelper retrySMHelper;
private volatile boolean isStopped;
@@ -85,7 +85,7 @@ public class Janitor {
final Clock clock,
final NonEntityDao nonEntityDao,
final InternalCallContextFactory internalCallContextFactory,
- final PluginControlledDirectPaymentAutomatonRunner pluginControlledDirectPaymentAutomatonRunner,
+ final PluginControlledPaymentAutomatonRunner pluginControlledPaymentAutomatonRunner,
@Named(PaymentModule.JANITOR_EXECUTOR_NAMED) final ScheduledExecutorService janitorExecutor,
final RetryStateMachineHelper retrySMHelper) {
this.accountInternalApi = accountInternalApi;
@@ -95,7 +95,7 @@ public class Janitor {
this.janitorExecutor = janitorExecutor;
this.nonEntityDao = nonEntityDao;
this.internalCallContextFactory = internalCallContextFactory;
- this.pluginControlledDirectPaymentAutomatonRunner = pluginControlledDirectPaymentAutomatonRunner;
+ this.pluginControlledPaymentAutomatonRunner = pluginControlledPaymentAutomatonRunner;
this.retrySMHelper = retrySMHelper;
}
@@ -205,7 +205,7 @@ public class Janitor {
final CallContext callContext = new DefaultCallContext(tenantId, "AttemptCompletionJanitorTask", CallOrigin.INTERNAL, UserType.SYSTEM, UUID.randomUUID(), clock);
final InternalCallContext internalCallContext = internalCallContextFactory.createInternalCallContext(attempt.getAccountId(), callContext);
- final List<PaymentTransactionModelDao> transactions = paymentDao.getDirectPaymentTransactionsByExternalKey(attempt.getTransactionExternalKey(), tenantContext);
+ final List<PaymentTransactionModelDao> transactions = paymentDao.getPaymentTransactionsByExternalKey(attempt.getTransactionExternalKey(), tenantContext);
final PaymentTransactionModelDao transaction = Iterables.tryFind(transactions, new Predicate<PaymentTransactionModelDao>() {
@Override
public boolean apply(final PaymentTransactionModelDao input) {
@@ -226,7 +226,7 @@ public class Janitor {
final Account account = accountInternalApi.getAccountById(attempt.getAccountId(), tenantContext);
final boolean isApiPayment = true; // unclear
- final RetryableDirectPaymentStateContext paymentStateContext = new RetryableDirectPaymentStateContext(attempt.getPluginName(),
+ final RetryablePaymentStateContext paymentStateContext = new RetryablePaymentStateContext(attempt.getPluginName(),
isApiPayment,
transaction.getPaymentId(),
attempt.getPaymentExternalKey(),
@@ -241,12 +241,12 @@ public class Janitor {
callContext);
paymentStateContext.setAttemptId(attempt.getId()); // Normally set by leavingState Callback
- paymentStateContext.setDirectPaymentTransactionModelDao(transaction); // Normally set by raw state machine
+ paymentStateContext.setPaymentTransactionModelDao(transaction); // Normally set by raw state machine
//
// Will rerun the state machine with special callbacks to only make the onCompletion call
// to the PaymentControlPluginApi plugin and transition the state.
//
- pluginControlledDirectPaymentAutomatonRunner.completeRun(paymentStateContext);
+ pluginControlledPaymentAutomatonRunner.completeRun(paymentStateContext);
} catch (AccountApiException e) {
log.warn("Failed to complete payment attempt " + attempt.getId(), e);
diff --git a/payment/src/main/java/org/killbill/billing/payment/core/PluginControlledPaymentProcessor.java b/payment/src/main/java/org/killbill/billing/payment/core/PluginControlledPaymentProcessor.java
index 2ef76f6..1041584 100644
--- a/payment/src/main/java/org/killbill/billing/payment/core/PluginControlledPaymentProcessor.java
+++ b/payment/src/main/java/org/killbill/billing/payment/core/PluginControlledPaymentProcessor.java
@@ -33,11 +33,11 @@ import org.killbill.billing.callcontext.InternalCallContext;
import org.killbill.billing.catalog.api.Currency;
import org.killbill.billing.invoice.api.InvoiceInternalApi;
import org.killbill.billing.osgi.api.OSGIServiceRegistration;
-import org.killbill.billing.payment.api.DirectPayment;
+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.api.TransactionType;
-import org.killbill.billing.payment.core.sm.PluginControlledDirectPaymentAutomatonRunner;
+import org.killbill.billing.payment.core.sm.PluginControlledPaymentAutomatonRunner;
import org.killbill.billing.payment.core.sm.RetryStateMachineHelper;
import org.killbill.billing.payment.dao.PaymentAttemptModelDao;
import org.killbill.billing.payment.dao.PaymentDao;
@@ -59,7 +59,7 @@ import static org.killbill.billing.payment.glue.PaymentModule.PLUGIN_EXECUTOR_NA
public class PluginControlledPaymentProcessor extends ProcessorBase {
- private final PluginControlledDirectPaymentAutomatonRunner pluginControlledDirectPaymentAutomatonRunner;
+ private final PluginControlledPaymentAutomatonRunner pluginControlledPaymentAutomatonRunner;
private final RetryStateMachineHelper retrySMHelper;
@Inject
@@ -72,21 +72,21 @@ public class PluginControlledPaymentProcessor extends ProcessorBase {
final PersistentBus eventBus,
final GlobalLocker locker,
@Named(PLUGIN_EXECUTOR_NAMED) final ExecutorService executor,
- final PluginControlledDirectPaymentAutomatonRunner pluginControlledDirectPaymentAutomatonRunner,
+ final PluginControlledPaymentAutomatonRunner pluginControlledPaymentAutomatonRunner,
final RetryStateMachineHelper retrySMHelper,
final Clock clock) {
super(pluginRegistry, accountInternalApi, eventBus, paymentDao, nonEntityDao, tagUserApi, locker, executor, invoiceApi, clock);
this.retrySMHelper = retrySMHelper;
- this.pluginControlledDirectPaymentAutomatonRunner = pluginControlledDirectPaymentAutomatonRunner;
+ this.pluginControlledPaymentAutomatonRunner = pluginControlledPaymentAutomatonRunner;
}
- public DirectPayment createAuthorization(final boolean isApiPayment, final Account account, final UUID paymentMethodId, @Nullable final UUID directPaymentId, final BigDecimal amount, final Currency currency, final String paymentExternalKey, final String transactionExternalKey,
+ public Payment createAuthorization(final boolean isApiPayment, final Account account, final UUID paymentMethodId, @Nullable final UUID paymentId, final BigDecimal amount, final Currency currency, final String paymentExternalKey, final String transactionExternalKey,
final Iterable<PluginProperty> properties, final String paymentControlPluginName, final CallContext callContext, final InternalCallContext internalCallContext) throws PaymentApiException {
- return pluginControlledDirectPaymentAutomatonRunner.run(isApiPayment,
+ return pluginControlledPaymentAutomatonRunner.run(isApiPayment,
TransactionType.AUTHORIZE,
account,
paymentMethodId,
- directPaymentId,
+ paymentId,
paymentExternalKey,
transactionExternalKey,
amount,
@@ -96,15 +96,15 @@ public class PluginControlledPaymentProcessor extends ProcessorBase {
callContext, internalCallContext);
}
- public DirectPayment createCapture(final boolean isApiPayment, final Account account, final UUID directPaymentId, final BigDecimal amount, final Currency currency,
+ public Payment createCapture(final boolean isApiPayment, final Account account, final UUID paymentId, final BigDecimal amount, final Currency currency,
final String transactionExternalKey,
final Iterable<PluginProperty> properties, final String paymentControlPluginName,
final CallContext callContext, final InternalCallContext internalCallContext) throws PaymentApiException {
- return pluginControlledDirectPaymentAutomatonRunner.run(isApiPayment,
+ return pluginControlledPaymentAutomatonRunner.run(isApiPayment,
TransactionType.CAPTURE,
account,
null,
- directPaymentId,
+ paymentId,
null,
transactionExternalKey,
amount,
@@ -114,14 +114,14 @@ public class PluginControlledPaymentProcessor extends ProcessorBase {
callContext, internalCallContext);
}
- public DirectPayment createPurchase(final boolean isApiPayment, final Account account, final UUID paymentMethodId, final UUID directPaymentId, final BigDecimal amount, final Currency currency,
+ public Payment createPurchase(final boolean isApiPayment, final Account account, final UUID paymentMethodId, final UUID paymentId, final BigDecimal amount, final Currency currency,
final String paymentExternalKey, final String transactionExternalKey, final Iterable<PluginProperty> properties,
final String paymentControlPluginName, final CallContext callContext, final InternalCallContext internalCallContext) throws PaymentApiException {
- return pluginControlledDirectPaymentAutomatonRunner.run(isApiPayment,
+ return pluginControlledPaymentAutomatonRunner.run(isApiPayment,
TransactionType.PURCHASE,
account,
paymentMethodId,
- directPaymentId,
+ paymentId,
paymentExternalKey,
transactionExternalKey,
amount,
@@ -131,13 +131,13 @@ public class PluginControlledPaymentProcessor extends ProcessorBase {
callContext, internalCallContext);
}
- public DirectPayment createVoid(final boolean isApiPayment, final Account account, final UUID directPaymentId, final String transactionExternalKey,
+ public Payment createVoid(final boolean isApiPayment, final Account account, final UUID paymentId, final String transactionExternalKey,
final Iterable<PluginProperty> properties, final CallContext callContext, final InternalCallContext internalCallContext) throws PaymentApiException {
- return pluginControlledDirectPaymentAutomatonRunner.run(isApiPayment,
+ return pluginControlledPaymentAutomatonRunner.run(isApiPayment,
TransactionType.VOID,
account,
null,
- directPaymentId,
+ paymentId,
null,
transactionExternalKey,
null,
@@ -147,13 +147,13 @@ public class PluginControlledPaymentProcessor extends ProcessorBase {
callContext, internalCallContext);
}
- public DirectPayment createRefund(final boolean isApiPayment, final Account account, final UUID directPaymentId, final BigDecimal amount, final Currency currency, final String transactionExternalKey,
+ public Payment createRefund(final boolean isApiPayment, final Account account, final UUID paymentId, final BigDecimal amount, final Currency currency, final String transactionExternalKey,
final Iterable<PluginProperty> properties, final String paymentControlPluginName, final CallContext callContext, final InternalCallContext internalCallContext) throws PaymentApiException {
- return pluginControlledDirectPaymentAutomatonRunner.run(isApiPayment,
+ return pluginControlledPaymentAutomatonRunner.run(isApiPayment,
TransactionType.REFUND,
account,
null,
- directPaymentId,
+ paymentId,
null,
transactionExternalKey,
amount,
@@ -163,14 +163,14 @@ public class PluginControlledPaymentProcessor extends ProcessorBase {
callContext, internalCallContext);
}
- public DirectPayment createCredit(final boolean isApiPayment, final Account account, final UUID paymentMethodId, final UUID directPaymentId, final BigDecimal amount, final Currency currency, final String paymentExternalKey,
+ public Payment createCredit(final boolean isApiPayment, final Account account, final UUID paymentMethodId, final UUID paymentId, final BigDecimal amount, final Currency currency, final String paymentExternalKey,
final String transactionExternalKey, final Iterable<PluginProperty> properties, final String paymentControlPluginName, final CallContext callContext, final InternalCallContext internalCallContext) throws PaymentApiException {
- return pluginControlledDirectPaymentAutomatonRunner.run(isApiPayment,
+ return pluginControlledPaymentAutomatonRunner.run(isApiPayment,
TransactionType.CREDIT,
account,
paymentMethodId,
- directPaymentId,
+ paymentId,
paymentExternalKey,
transactionExternalKey,
amount,
@@ -180,9 +180,9 @@ public class PluginControlledPaymentProcessor extends ProcessorBase {
callContext, internalCallContext);
}
- public DirectPayment createChargeback(final Account account, final UUID paymentId, final String transactionExternalKey, final BigDecimal amount, final Currency currency,
+ public Payment createChargeback(final Account account, final UUID paymentId, final String transactionExternalKey, final BigDecimal amount, final Currency currency,
final String paymentControlPluginName, final CallContext callContext, final InternalCallContext internalCallContext) throws PaymentApiException {
- return pluginControlledDirectPaymentAutomatonRunner.run(true,
+ return pluginControlledPaymentAutomatonRunner.run(true,
TransactionType.CHARGEBACK,
account,
null,
@@ -200,7 +200,7 @@ public class PluginControlledPaymentProcessor extends ProcessorBase {
try {
final PaymentAttemptModelDao attempt = paymentDao.getPaymentAttempt(attemptId, internalCallContext);
- final PaymentModelDao payment = paymentDao.getDirectPaymentByExternalKey(attempt.getPaymentExternalKey(), internalCallContext);
+ final PaymentModelDao payment = paymentDao.getPaymentByExternalKey(attempt.getPaymentExternalKey(), internalCallContext);
final UUID paymentId = payment != null ? payment.getId() : null;
final Iterable<PluginProperty> pluginProperties = PluginPropertySerializer.deserialize(attempt.getPluginProperties());
@@ -209,7 +209,7 @@ public class PluginControlledPaymentProcessor extends ProcessorBase {
final CallContext callContext = internalCallContext.toCallContext(tenantId);
final State state = retrySMHelper.getState(attempt.getStateName());
- pluginControlledDirectPaymentAutomatonRunner.run(state,
+ pluginControlledPaymentAutomatonRunner.run(state,
false,
attempt.getTransactionType(),
account,
diff --git a/payment/src/main/java/org/killbill/billing/payment/core/ProcessorBase.java b/payment/src/main/java/org/killbill/billing/payment/core/ProcessorBase.java
index 09d6616..b396c2f 100644
--- a/payment/src/main/java/org/killbill/billing/payment/core/ProcessorBase.java
+++ b/payment/src/main/java/org/killbill/billing/payment/core/ProcessorBase.java
@@ -176,7 +176,7 @@ public abstract class ProcessorBase {
}
protected void validateUniqueTransactionExternalKey(final String transactionExternalKey, final InternalTenantContext tenantContext) throws PaymentApiException {
- final List<PaymentTransactionModelDao> transactions = paymentDao.getDirectPaymentTransactionsByExternalKey(transactionExternalKey, tenantContext);
+ final List<PaymentTransactionModelDao> transactions = paymentDao.getPaymentTransactionsByExternalKey(transactionExternalKey, tenantContext);
final PaymentTransactionModelDao transactionAlreadyExists = Iterables.tryFind(transactions, new Predicate<PaymentTransactionModelDao>() {
@Override
public boolean apply(final PaymentTransactionModelDao input) {
diff --git a/payment/src/main/java/org/killbill/billing/payment/core/sm/AuthorizeCompleted.java b/payment/src/main/java/org/killbill/billing/payment/core/sm/AuthorizeCompleted.java
index 94e67d9..642f1f4 100644
--- a/payment/src/main/java/org/killbill/billing/payment/core/sm/AuthorizeCompleted.java
+++ b/payment/src/main/java/org/killbill/billing/payment/core/sm/AuthorizeCompleted.java
@@ -19,9 +19,9 @@ package org.killbill.billing.payment.core.sm;
import org.killbill.billing.payment.api.PaymentApiException;
-public class AuthorizeCompleted extends DirectPaymentEnteringStateCallback {
+public class AuthorizeCompleted extends PaymentEnteringStateCallback {
- public AuthorizeCompleted(final DirectPaymentAutomatonDAOHelper daoHelper, final DirectPaymentStateContext directPaymentStateContext) throws PaymentApiException {
- super(daoHelper, directPaymentStateContext);
+ public AuthorizeCompleted(final PaymentAutomatonDAOHelper daoHelper, final PaymentStateContext paymentStateContext) throws PaymentApiException {
+ super(daoHelper, paymentStateContext);
}
}
diff --git a/payment/src/main/java/org/killbill/billing/payment/core/sm/AuthorizeInitiated.java b/payment/src/main/java/org/killbill/billing/payment/core/sm/AuthorizeInitiated.java
index 5bc7ce2..6f04fd4 100644
--- a/payment/src/main/java/org/killbill/billing/payment/core/sm/AuthorizeInitiated.java
+++ b/payment/src/main/java/org/killbill/billing/payment/core/sm/AuthorizeInitiated.java
@@ -19,9 +19,9 @@ package org.killbill.billing.payment.core.sm;
import org.killbill.billing.payment.api.PaymentApiException;
-public class AuthorizeInitiated extends DirectPaymentLeavingStateCallback {
+public class AuthorizeInitiated extends PaymentLeavingStateCallback {
- public AuthorizeInitiated(final DirectPaymentAutomatonDAOHelper daoHelper, final DirectPaymentStateContext directPaymentStateContext) throws PaymentApiException {
+ public AuthorizeInitiated(final PaymentAutomatonDAOHelper daoHelper, final PaymentStateContext paymentStateContext) throws PaymentApiException {
super(daoHelper);
}
}
diff --git a/payment/src/main/java/org/killbill/billing/payment/core/sm/AuthorizeOperation.java b/payment/src/main/java/org/killbill/billing/payment/core/sm/AuthorizeOperation.java
index c20a0fa..5c2b1f9 100644
--- a/payment/src/main/java/org/killbill/billing/payment/core/sm/AuthorizeOperation.java
+++ b/payment/src/main/java/org/killbill/billing/payment/core/sm/AuthorizeOperation.java
@@ -26,26 +26,26 @@ import org.killbill.commons.locker.GlobalLocker;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class AuthorizeOperation extends DirectPaymentOperation {
+public class AuthorizeOperation extends PaymentOperation {
private final Logger logger = LoggerFactory.getLogger(AuthorizeOperation.class);
- public AuthorizeOperation(final DirectPaymentAutomatonDAOHelper daoHelper,
+ public AuthorizeOperation(final PaymentAutomatonDAOHelper daoHelper,
final GlobalLocker locker, final PluginDispatcher<OperationResult> paymentPluginDispatcher,
- final DirectPaymentStateContext directPaymentStateContext) throws PaymentApiException {
- super(daoHelper, locker, paymentPluginDispatcher, directPaymentStateContext);
+ final PaymentStateContext paymentStateContext) throws PaymentApiException {
+ super(daoHelper, locker, paymentPluginDispatcher, paymentStateContext);
}
@Override
protected PaymentTransactionInfoPlugin doCallSpecificOperationCallback() throws PaymentPluginApiException {
- logger.debug("Starting AUTHORIZE for payment {} ({} {})", directPaymentStateContext.getDirectPaymentId(), directPaymentStateContext.getAmount(), directPaymentStateContext.getCurrency());
- return plugin.authorizePayment(directPaymentStateContext.getAccount().getId(),
- directPaymentStateContext.getDirectPaymentId(),
- directPaymentStateContext.getTransactionPaymentId(),
- directPaymentStateContext.getPaymentMethodId(),
- directPaymentStateContext.getAmount(),
- directPaymentStateContext.getCurrency(),
- directPaymentStateContext.getProperties(),
- directPaymentStateContext.getCallContext());
+ logger.debug("Starting AUTHORIZE for payment {} ({} {})", paymentStateContext.getPaymentId(), paymentStateContext.getAmount(), paymentStateContext.getCurrency());
+ return plugin.authorizePayment(paymentStateContext.getAccount().getId(),
+ paymentStateContext.getPaymentId(),
+ paymentStateContext.getTransactionPaymentId(),
+ paymentStateContext.getPaymentMethodId(),
+ paymentStateContext.getAmount(),
+ paymentStateContext.getCurrency(),
+ paymentStateContext.getProperties(),
+ paymentStateContext.getCallContext());
}
}
diff --git a/payment/src/main/java/org/killbill/billing/payment/core/sm/CaptureCompleted.java b/payment/src/main/java/org/killbill/billing/payment/core/sm/CaptureCompleted.java
index b6a06f0..a3f0775 100644
--- a/payment/src/main/java/org/killbill/billing/payment/core/sm/CaptureCompleted.java
+++ b/payment/src/main/java/org/killbill/billing/payment/core/sm/CaptureCompleted.java
@@ -19,9 +19,9 @@ package org.killbill.billing.payment.core.sm;
import org.killbill.billing.payment.api.PaymentApiException;
-public class CaptureCompleted extends DirectPaymentEnteringStateCallback {
+public class CaptureCompleted extends PaymentEnteringStateCallback {
- public CaptureCompleted(final DirectPaymentAutomatonDAOHelper daoHelper, final DirectPaymentStateContext directPaymentStateContext) throws PaymentApiException {
- super(daoHelper, directPaymentStateContext);
+ public CaptureCompleted(final PaymentAutomatonDAOHelper daoHelper, final PaymentStateContext paymentStateContext) throws PaymentApiException {
+ super(daoHelper, paymentStateContext);
}
}
diff --git a/payment/src/main/java/org/killbill/billing/payment/core/sm/CaptureInitiated.java b/payment/src/main/java/org/killbill/billing/payment/core/sm/CaptureInitiated.java
index 8b23053..78d5e4d 100644
--- a/payment/src/main/java/org/killbill/billing/payment/core/sm/CaptureInitiated.java
+++ b/payment/src/main/java/org/killbill/billing/payment/core/sm/CaptureInitiated.java
@@ -19,9 +19,9 @@ package org.killbill.billing.payment.core.sm;
import org.killbill.billing.payment.api.PaymentApiException;
-public class CaptureInitiated extends DirectPaymentLeavingStateCallback {
+public class CaptureInitiated extends PaymentLeavingStateCallback {
- public CaptureInitiated(final DirectPaymentAutomatonDAOHelper daoHelper, final DirectPaymentStateContext directPaymentStateContext) throws PaymentApiException {
+ public CaptureInitiated(final PaymentAutomatonDAOHelper daoHelper, final PaymentStateContext paymentStateContext) throws PaymentApiException {
super(daoHelper);
}
}
diff --git a/payment/src/main/java/org/killbill/billing/payment/core/sm/CaptureOperation.java b/payment/src/main/java/org/killbill/billing/payment/core/sm/CaptureOperation.java
index 444b1aa..feaa39e 100644
--- a/payment/src/main/java/org/killbill/billing/payment/core/sm/CaptureOperation.java
+++ b/payment/src/main/java/org/killbill/billing/payment/core/sm/CaptureOperation.java
@@ -26,26 +26,26 @@ import org.killbill.commons.locker.GlobalLocker;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class CaptureOperation extends DirectPaymentOperation {
+public class CaptureOperation extends PaymentOperation {
private final Logger logger = LoggerFactory.getLogger(CaptureOperation.class);
- public CaptureOperation(final DirectPaymentAutomatonDAOHelper daoHelper,
+ public CaptureOperation(final PaymentAutomatonDAOHelper daoHelper,
final GlobalLocker locker, final PluginDispatcher<OperationResult> paymentPluginDispatcher,
- final DirectPaymentStateContext directPaymentStateContext) throws PaymentApiException {
- super(daoHelper, locker, paymentPluginDispatcher, directPaymentStateContext);
+ final PaymentStateContext paymentStateContext) throws PaymentApiException {
+ super(daoHelper, locker, paymentPluginDispatcher, paymentStateContext);
}
@Override
protected PaymentTransactionInfoPlugin doCallSpecificOperationCallback() throws PaymentPluginApiException {
- logger.debug("Starting CAPTURE for payment {} ({} {})", directPaymentStateContext.getDirectPaymentId(), directPaymentStateContext.getAmount(), directPaymentStateContext.getCurrency());
- return plugin.capturePayment(directPaymentStateContext.getAccount().getId(),
- directPaymentStateContext.getDirectPaymentId(),
- directPaymentStateContext.getTransactionPaymentId(),
- directPaymentStateContext.getPaymentMethodId(),
- directPaymentStateContext.getAmount(),
- directPaymentStateContext.getCurrency(),
- directPaymentStateContext.getProperties(),
- directPaymentStateContext.getCallContext());
+ logger.debug("Starting CAPTURE for payment {} ({} {})", paymentStateContext.getPaymentId(), paymentStateContext.getAmount(), paymentStateContext.getCurrency());
+ return plugin.capturePayment(paymentStateContext.getAccount().getId(),
+ paymentStateContext.getPaymentId(),
+ paymentStateContext.getTransactionPaymentId(),
+ paymentStateContext.getPaymentMethodId(),
+ paymentStateContext.getAmount(),
+ paymentStateContext.getCurrency(),
+ paymentStateContext.getProperties(),
+ paymentStateContext.getCallContext());
}
}
diff --git a/payment/src/main/java/org/killbill/billing/payment/core/sm/ChargebackCompleted.java b/payment/src/main/java/org/killbill/billing/payment/core/sm/ChargebackCompleted.java
index 3ef5c93..0a20ca9 100644
--- a/payment/src/main/java/org/killbill/billing/payment/core/sm/ChargebackCompleted.java
+++ b/payment/src/main/java/org/killbill/billing/payment/core/sm/ChargebackCompleted.java
@@ -19,9 +19,9 @@ package org.killbill.billing.payment.core.sm;
import org.killbill.billing.payment.api.PaymentApiException;
-public class ChargebackCompleted extends DirectPaymentEnteringStateCallback {
+public class ChargebackCompleted extends PaymentEnteringStateCallback {
- public ChargebackCompleted(final DirectPaymentAutomatonDAOHelper daoHelper, final DirectPaymentStateContext directPaymentStateContext) throws PaymentApiException {
- super(daoHelper, directPaymentStateContext);
+ public ChargebackCompleted(final PaymentAutomatonDAOHelper daoHelper, final PaymentStateContext paymentStateContext) throws PaymentApiException {
+ super(daoHelper, paymentStateContext);
}
}
diff --git a/payment/src/main/java/org/killbill/billing/payment/core/sm/ChargebackInitiated.java b/payment/src/main/java/org/killbill/billing/payment/core/sm/ChargebackInitiated.java
index 9b2c36a..72e9a3f 100644
--- a/payment/src/main/java/org/killbill/billing/payment/core/sm/ChargebackInitiated.java
+++ b/payment/src/main/java/org/killbill/billing/payment/core/sm/ChargebackInitiated.java
@@ -19,9 +19,9 @@ package org.killbill.billing.payment.core.sm;
import org.killbill.billing.payment.api.PaymentApiException;
-public class ChargebackInitiated extends DirectPaymentLeavingStateCallback {
+public class ChargebackInitiated extends PaymentLeavingStateCallback {
- public ChargebackInitiated(final DirectPaymentAutomatonDAOHelper daoHelper, final DirectPaymentStateContext directPaymentStateContext) throws PaymentApiException {
+ public ChargebackInitiated(final PaymentAutomatonDAOHelper daoHelper, final PaymentStateContext paymentStateContext) throws PaymentApiException {
super(daoHelper);
}
}
diff --git a/payment/src/main/java/org/killbill/billing/payment/core/sm/ChargebackOperation.java b/payment/src/main/java/org/killbill/billing/payment/core/sm/ChargebackOperation.java
index 5955c18..6a272a6 100644
--- a/payment/src/main/java/org/killbill/billing/payment/core/sm/ChargebackOperation.java
+++ b/payment/src/main/java/org/killbill/billing/payment/core/sm/ChargebackOperation.java
@@ -37,22 +37,22 @@ import org.slf4j.LoggerFactory;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
-public class ChargebackOperation extends DirectPaymentOperation {
+public class ChargebackOperation extends PaymentOperation {
private final Logger logger = LoggerFactory.getLogger(ChargebackOperation.class);
- public ChargebackOperation(final DirectPaymentAutomatonDAOHelper daoHelper,
+ public ChargebackOperation(final PaymentAutomatonDAOHelper daoHelper,
final GlobalLocker locker, final PluginDispatcher<OperationResult> paymentPluginDispatcher,
- final DirectPaymentStateContext directPaymentStateContext) throws PaymentApiException {
- super(daoHelper, locker, paymentPluginDispatcher, directPaymentStateContext);
+ final PaymentStateContext paymentStateContext) throws PaymentApiException {
+ super(daoHelper, locker, paymentPluginDispatcher, paymentStateContext);
}
@Override
protected PaymentTransactionInfoPlugin doCallSpecificOperationCallback() throws PaymentPluginApiException {
- logger.debug("Starting CHARGEBACK for payment {} ({} {})", directPaymentStateContext.getDirectPaymentId(), directPaymentStateContext.getAmount(), directPaymentStateContext.getCurrency());
+ logger.debug("Starting CHARGEBACK for payment {} ({} {})", paymentStateContext.getPaymentId(), paymentStateContext.getAmount(), paymentStateContext.getCurrency());
final PaymentPluginStatus status;
- if (!directPaymentStateContext.getOnLeavingStateExistingTransactions().isEmpty()) {
+ if (!paymentStateContext.getOnLeavingStateExistingTransactions().isEmpty()) {
final Iterable<PaymentTransactionModelDao> purchaseTransactions = getOnLeavingStateExistingTransactionsForType(TransactionType.PURCHASE);
final Iterable<PaymentTransactionModelDao> captureTransactions = getOnLeavingStateExistingTransactionsForType(TransactionType.CAPTURE);
final Iterable<PaymentTransactionModelDao> refundTransactions = getOnLeavingStateExistingTransactionsForType(TransactionType.REFUND);
@@ -64,7 +64,7 @@ public class ChargebackOperation extends DirectPaymentOperation {
final BigDecimal chargebackAmount = getSumAmount(chargebackTransactions);
final BigDecimal chargebackAvailableAmount = purchasedAmount.add(capturedAmount).subtract(refundedAmount.add(chargebackAmount));
- if (directPaymentStateContext.getAmount().compareTo(chargebackAvailableAmount) > 0) {
+ if (paymentStateContext.getAmount().compareTo(chargebackAvailableAmount) > 0) {
status = PaymentPluginStatus.ERROR;
} else {
status = PaymentPluginStatus.PROCESSED;
@@ -72,11 +72,11 @@ public class ChargebackOperation extends DirectPaymentOperation {
} else {
status = PaymentPluginStatus.PROCESSED;
}
- return new DefaultNoOpPaymentInfoPlugin(directPaymentStateContext.getDirectPaymentId(),
- directPaymentStateContext.getTransactionPaymentId(),
+ return new DefaultNoOpPaymentInfoPlugin(paymentStateContext.getPaymentId(),
+ paymentStateContext.getTransactionPaymentId(),
TransactionType.CHARGEBACK,
- directPaymentStateContext.getAmount(),
- directPaymentStateContext.getCurrency(),
+ paymentStateContext.getAmount(),
+ paymentStateContext.getCurrency(),
null,
null,
status,
diff --git a/payment/src/main/java/org/killbill/billing/payment/core/sm/CreditCompleted.java b/payment/src/main/java/org/killbill/billing/payment/core/sm/CreditCompleted.java
index a277aa2..c56431f 100644
--- a/payment/src/main/java/org/killbill/billing/payment/core/sm/CreditCompleted.java
+++ b/payment/src/main/java/org/killbill/billing/payment/core/sm/CreditCompleted.java
@@ -19,9 +19,9 @@ package org.killbill.billing.payment.core.sm;
import org.killbill.billing.payment.api.PaymentApiException;
-public class CreditCompleted extends DirectPaymentEnteringStateCallback {
+public class CreditCompleted extends PaymentEnteringStateCallback {
- public CreditCompleted(final DirectPaymentAutomatonDAOHelper daoHelper, final DirectPaymentStateContext directPaymentStateContext) throws PaymentApiException {
- super(daoHelper, directPaymentStateContext);
+ public CreditCompleted(final PaymentAutomatonDAOHelper daoHelper, final PaymentStateContext paymentStateContext) throws PaymentApiException {
+ super(daoHelper, paymentStateContext);
}
}
diff --git a/payment/src/main/java/org/killbill/billing/payment/core/sm/CreditInitiated.java b/payment/src/main/java/org/killbill/billing/payment/core/sm/CreditInitiated.java
index 1ff57c2..32ad101 100644
--- a/payment/src/main/java/org/killbill/billing/payment/core/sm/CreditInitiated.java
+++ b/payment/src/main/java/org/killbill/billing/payment/core/sm/CreditInitiated.java
@@ -19,9 +19,9 @@ package org.killbill.billing.payment.core.sm;
import org.killbill.billing.payment.api.PaymentApiException;
-public class CreditInitiated extends DirectPaymentLeavingStateCallback {
+public class CreditInitiated extends PaymentLeavingStateCallback {
- public CreditInitiated(final DirectPaymentAutomatonDAOHelper daoHelper, final DirectPaymentStateContext directPaymentStateContext) throws PaymentApiException {
+ public CreditInitiated(final PaymentAutomatonDAOHelper daoHelper, final PaymentStateContext paymentStateContext) throws PaymentApiException {
super(daoHelper);
}
}
diff --git a/payment/src/main/java/org/killbill/billing/payment/core/sm/CreditOperation.java b/payment/src/main/java/org/killbill/billing/payment/core/sm/CreditOperation.java
index 5c2c0c2..1e3d550 100644
--- a/payment/src/main/java/org/killbill/billing/payment/core/sm/CreditOperation.java
+++ b/payment/src/main/java/org/killbill/billing/payment/core/sm/CreditOperation.java
@@ -26,26 +26,26 @@ import org.killbill.commons.locker.GlobalLocker;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class CreditOperation extends DirectPaymentOperation {
+public class CreditOperation extends PaymentOperation {
private final Logger logger = LoggerFactory.getLogger(CreditOperation.class);
- public CreditOperation(final DirectPaymentAutomatonDAOHelper daoHelper,
+ public CreditOperation(final PaymentAutomatonDAOHelper daoHelper,
final GlobalLocker locker, final PluginDispatcher<OperationResult> paymentPluginDispatcher,
- final DirectPaymentStateContext directPaymentStateContext) throws PaymentApiException {
- super(daoHelper, locker, paymentPluginDispatcher, directPaymentStateContext);
+ final PaymentStateContext paymentStateContext) throws PaymentApiException {
+ super(daoHelper, locker, paymentPluginDispatcher, paymentStateContext);
}
@Override
protected PaymentTransactionInfoPlugin doCallSpecificOperationCallback() throws PaymentPluginApiException {
- logger.debug("Starting CREDIT for payment {} ({} {})", directPaymentStateContext.getDirectPaymentId(), directPaymentStateContext.getAmount(), directPaymentStateContext.getCurrency());
- return plugin.creditPayment(directPaymentStateContext.getAccount().getId(),
- directPaymentStateContext.getDirectPaymentId(),
- directPaymentStateContext.getTransactionPaymentId(),
- directPaymentStateContext.getPaymentMethodId(),
- directPaymentStateContext.getAmount(),
- directPaymentStateContext.getCurrency(),
- directPaymentStateContext.getProperties(),
- directPaymentStateContext.getCallContext());
+ logger.debug("Starting CREDIT for payment {} ({} {})", paymentStateContext.getPaymentId(), paymentStateContext.getAmount(), paymentStateContext.getCurrency());
+ return plugin.creditPayment(paymentStateContext.getAccount().getId(),
+ paymentStateContext.getPaymentId(),
+ paymentStateContext.getTransactionPaymentId(),
+ paymentStateContext.getPaymentMethodId(),
+ paymentStateContext.getAmount(),
+ paymentStateContext.getCurrency(),
+ paymentStateContext.getProperties(),
+ paymentStateContext.getCallContext());
}
}
diff --git a/payment/src/main/java/org/killbill/billing/payment/core/sm/OperationCallbackBase.java b/payment/src/main/java/org/killbill/billing/payment/core/sm/OperationCallbackBase.java
index da58023..68cf540 100644
--- a/payment/src/main/java/org/killbill/billing/payment/core/sm/OperationCallbackBase.java
+++ b/payment/src/main/java/org/killbill/billing/payment/core/sm/OperationCallbackBase.java
@@ -38,14 +38,14 @@ public abstract class OperationCallbackBase {
private final GlobalLocker locker;
private final PluginDispatcher<OperationResult> paymentPluginDispatcher;
- protected final DirectPaymentStateContext directPaymentStateContext;
+ protected final PaymentStateContext paymentStateContext;
protected OperationCallbackBase(final GlobalLocker locker,
final PluginDispatcher<OperationResult> paymentPluginDispatcher,
- final DirectPaymentStateContext directPaymentStateContext) {
+ final PaymentStateContext paymentStateContext) {
this.locker = locker;
this.paymentPluginDispatcher = paymentPluginDispatcher;
- this.directPaymentStateContext = directPaymentStateContext;
+ this.paymentStateContext = paymentStateContext;
}
//
@@ -54,7 +54,7 @@ public abstract class OperationCallbackBase {
// callback to eventually throw a OperationException, that will be used to drive the state machine in the right direction.
//
protected <ExceptionType extends Exception> OperationResult dispatchWithAccountLockAndTimeout(final WithAccountLockCallback<OperationResult, ExceptionType> callback) throws OperationException {
- final Account account = directPaymentStateContext.getAccount();
+ final Account account = paymentStateContext.getAccount();
logger.debug("Dispatching plugin call for account {}", account.getExternalKey());
try {
@@ -65,12 +65,12 @@ public abstract class OperationCallbackBase {
logger.debug("Successful plugin call for account {} with result {}", account.getExternalKey(), operationResult);
return operationResult;
} catch (final ExecutionException e) {
- throw rewrapExecutionException(directPaymentStateContext, e);
+ throw rewrapExecutionException(paymentStateContext, e);
} catch (final TimeoutException e) {
- throw wrapTimeoutException(directPaymentStateContext, e);
+ throw wrapTimeoutException(paymentStateContext, e);
} catch (final InterruptedException e) {
Thread.currentThread().interrupt();
- throw wrapInterruptedException(directPaymentStateContext, e);
+ throw wrapInterruptedException(paymentStateContext, e);
}
}
@@ -86,10 +86,10 @@ public abstract class OperationCallbackBase {
//
// The methods below allow to convert the exceptions thrown back by the Executor into an appropriate OperationException
//
- protected abstract OperationException rewrapExecutionException(final DirectPaymentStateContext directPaymentStateContext, final ExecutionException e);
+ protected abstract OperationException rewrapExecutionException(final PaymentStateContext paymentStateContext, final ExecutionException e);
- protected abstract OperationException wrapTimeoutException(final DirectPaymentStateContext directPaymentStateContext, final TimeoutException e);
+ protected abstract OperationException wrapTimeoutException(final PaymentStateContext paymentStateContext, final TimeoutException e);
- protected abstract OperationException wrapInterruptedException(final DirectPaymentStateContext directPaymentStateContext, final InterruptedException e);
+ protected abstract OperationException wrapInterruptedException(final PaymentStateContext paymentStateContext, final InterruptedException e);
}
diff --git a/payment/src/main/java/org/killbill/billing/payment/core/sm/PaymentStateMachineHelper.java b/payment/src/main/java/org/killbill/billing/payment/core/sm/PaymentStateMachineHelper.java
index 665e1ca..009d70b 100644
--- a/payment/src/main/java/org/killbill/billing/payment/core/sm/PaymentStateMachineHelper.java
+++ b/payment/src/main/java/org/killbill/billing/payment/core/sm/PaymentStateMachineHelper.java
@@ -80,7 +80,7 @@ public class PaymentStateMachineHelper {
case CHARGEBACK:
return CHARGEBACK_INIT_STATE_NAME;
default:
- throw new IllegalStateException("Unsupported transaction type " + transactionType + " for null direct payment id");
+ throw new IllegalStateException("Unsupported transaction type " + transactionType + " for null payment id");
}
}
@@ -111,7 +111,7 @@ public class PaymentStateMachineHelper {
case CHARGEBACK:
return stateMachineConfig.getStateMachine(CHARGEBACK_STATE_MACHINE_NAME);
default:
- throw new IllegalStateException("Unsupported transaction type " + transactionType + " for null direct payment id");
+ throw new IllegalStateException("Unsupported transaction type " + transactionType + " for null payment id");
}
}
diff --git a/payment/src/main/java/org/killbill/billing/payment/core/sm/PurchaseCompleted.java b/payment/src/main/java/org/killbill/billing/payment/core/sm/PurchaseCompleted.java
index 5b212fa..3622fab 100644
--- a/payment/src/main/java/org/killbill/billing/payment/core/sm/PurchaseCompleted.java
+++ b/payment/src/main/java/org/killbill/billing/payment/core/sm/PurchaseCompleted.java
@@ -19,9 +19,9 @@ package org.killbill.billing.payment.core.sm;
import org.killbill.billing.payment.api.PaymentApiException;
-public class PurchaseCompleted extends DirectPaymentEnteringStateCallback {
+public class PurchaseCompleted extends PaymentEnteringStateCallback {
- public PurchaseCompleted(final DirectPaymentAutomatonDAOHelper daoHelper, final DirectPaymentStateContext directPaymentStateContext) throws PaymentApiException {
- super(daoHelper, directPaymentStateContext);
+ public PurchaseCompleted(final PaymentAutomatonDAOHelper daoHelper, final PaymentStateContext paymentStateContext) throws PaymentApiException {
+ super(daoHelper, paymentStateContext);
}
}
diff --git a/payment/src/main/java/org/killbill/billing/payment/core/sm/PurchaseInitiated.java b/payment/src/main/java/org/killbill/billing/payment/core/sm/PurchaseInitiated.java
index 41f9a22..edb69e5 100644
--- a/payment/src/main/java/org/killbill/billing/payment/core/sm/PurchaseInitiated.java
+++ b/payment/src/main/java/org/killbill/billing/payment/core/sm/PurchaseInitiated.java
@@ -19,9 +19,9 @@ package org.killbill.billing.payment.core.sm;
import org.killbill.billing.payment.api.PaymentApiException;
-public class PurchaseInitiated extends DirectPaymentLeavingStateCallback {
+public class PurchaseInitiated extends PaymentLeavingStateCallback {
- public PurchaseInitiated(final DirectPaymentAutomatonDAOHelper daoHelper, final DirectPaymentStateContext directPaymentStateContext) throws PaymentApiException {
+ public PurchaseInitiated(final PaymentAutomatonDAOHelper daoHelper, final PaymentStateContext paymentStateContext) throws PaymentApiException {
super(daoHelper);
}
}
diff --git a/payment/src/main/java/org/killbill/billing/payment/core/sm/PurchaseOperation.java b/payment/src/main/java/org/killbill/billing/payment/core/sm/PurchaseOperation.java
index 8f68686..2c835c9 100644
--- a/payment/src/main/java/org/killbill/billing/payment/core/sm/PurchaseOperation.java
+++ b/payment/src/main/java/org/killbill/billing/payment/core/sm/PurchaseOperation.java
@@ -26,26 +26,26 @@ import org.killbill.commons.locker.GlobalLocker;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class PurchaseOperation extends DirectPaymentOperation {
+public class PurchaseOperation extends PaymentOperation {
private final Logger logger = LoggerFactory.getLogger(PurchaseOperation.class);
- public PurchaseOperation(final DirectPaymentAutomatonDAOHelper daoHelper,
+ public PurchaseOperation(final PaymentAutomatonDAOHelper daoHelper,
final GlobalLocker locker, final PluginDispatcher<OperationResult> paymentPluginDispatcher,
- final DirectPaymentStateContext directPaymentStateContext) throws PaymentApiException {
- super(daoHelper, locker, paymentPluginDispatcher, directPaymentStateContext);
+ final PaymentStateContext paymentStateContext) throws PaymentApiException {
+ super(daoHelper, locker, paymentPluginDispatcher, paymentStateContext);
}
@Override
protected PaymentTransactionInfoPlugin doCallSpecificOperationCallback() throws PaymentPluginApiException {
- logger.debug("Starting PURCHASE for payment {} ({} {})", directPaymentStateContext.getDirectPaymentId(), directPaymentStateContext.getAmount(), directPaymentStateContext.getCurrency());
- return plugin.purchasePayment(directPaymentStateContext.getAccount().getId(),
- directPaymentStateContext.getDirectPaymentId(),
- directPaymentStateContext.getTransactionPaymentId(),
- directPaymentStateContext.getPaymentMethodId(),
- directPaymentStateContext.getAmount(),
- directPaymentStateContext.getCurrency(),
- directPaymentStateContext.getProperties(),
- directPaymentStateContext.getCallContext());
+ logger.debug("Starting PURCHASE for payment {} ({} {})", paymentStateContext.getPaymentId(), paymentStateContext.getAmount(), paymentStateContext.getCurrency());
+ return plugin.purchasePayment(paymentStateContext.getAccount().getId(),
+ paymentStateContext.getPaymentId(),
+ paymentStateContext.getTransactionPaymentId(),
+ paymentStateContext.getPaymentMethodId(),
+ paymentStateContext.getAmount(),
+ paymentStateContext.getCurrency(),
+ paymentStateContext.getProperties(),
+ paymentStateContext.getCallContext());
}
}
diff --git a/payment/src/main/java/org/killbill/billing/payment/core/sm/RefundCompleted.java b/payment/src/main/java/org/killbill/billing/payment/core/sm/RefundCompleted.java
index 80be676..96244e7 100644
--- a/payment/src/main/java/org/killbill/billing/payment/core/sm/RefundCompleted.java
+++ b/payment/src/main/java/org/killbill/billing/payment/core/sm/RefundCompleted.java
@@ -19,9 +19,9 @@ package org.killbill.billing.payment.core.sm;
import org.killbill.billing.payment.api.PaymentApiException;
-public class RefundCompleted extends DirectPaymentEnteringStateCallback {
+public class RefundCompleted extends PaymentEnteringStateCallback {
- public RefundCompleted(final DirectPaymentAutomatonDAOHelper daoHelper, final DirectPaymentStateContext directPaymentStateContext) throws PaymentApiException {
- super(daoHelper, directPaymentStateContext);
+ public RefundCompleted(final PaymentAutomatonDAOHelper daoHelper, final PaymentStateContext paymentStateContext) throws PaymentApiException {
+ super(daoHelper, paymentStateContext);
}
}
diff --git a/payment/src/main/java/org/killbill/billing/payment/core/sm/RefundInitiated.java b/payment/src/main/java/org/killbill/billing/payment/core/sm/RefundInitiated.java
index e7ec379..f9000ec 100644
--- a/payment/src/main/java/org/killbill/billing/payment/core/sm/RefundInitiated.java
+++ b/payment/src/main/java/org/killbill/billing/payment/core/sm/RefundInitiated.java
@@ -19,9 +19,9 @@ package org.killbill.billing.payment.core.sm;
import org.killbill.billing.payment.api.PaymentApiException;
-public class RefundInitiated extends DirectPaymentLeavingStateCallback {
+public class RefundInitiated extends PaymentLeavingStateCallback {
- public RefundInitiated(final DirectPaymentAutomatonDAOHelper daoHelper, final DirectPaymentStateContext directPaymentStateContext) throws PaymentApiException {
+ public RefundInitiated(final PaymentAutomatonDAOHelper daoHelper, final PaymentStateContext paymentStateContext) throws PaymentApiException {
super(daoHelper);
}
}
diff --git a/payment/src/main/java/org/killbill/billing/payment/core/sm/RefundOperation.java b/payment/src/main/java/org/killbill/billing/payment/core/sm/RefundOperation.java
index 1257847..d977299 100644
--- a/payment/src/main/java/org/killbill/billing/payment/core/sm/RefundOperation.java
+++ b/payment/src/main/java/org/killbill/billing/payment/core/sm/RefundOperation.java
@@ -26,26 +26,26 @@ import org.killbill.commons.locker.GlobalLocker;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class RefundOperation extends DirectPaymentOperation {
+public class RefundOperation extends PaymentOperation {
private final Logger logger = LoggerFactory.getLogger(RefundOperation.class);
- public RefundOperation(final DirectPaymentAutomatonDAOHelper daoHelper,
+ public RefundOperation(final PaymentAutomatonDAOHelper daoHelper,
final GlobalLocker locker, final PluginDispatcher<OperationResult> paymentPluginDispatcher,
- final DirectPaymentStateContext directPaymentStateContext) throws PaymentApiException {
- super(daoHelper, locker, paymentPluginDispatcher, directPaymentStateContext);
+ final PaymentStateContext paymentStateContext) throws PaymentApiException {
+ super(daoHelper, locker, paymentPluginDispatcher, paymentStateContext);
}
@Override
protected PaymentTransactionInfoPlugin doCallSpecificOperationCallback() throws PaymentPluginApiException {
- logger.debug("Starting REFUND for payment {} ({} {})", directPaymentStateContext.getDirectPaymentId(), directPaymentStateContext.getAmount(), directPaymentStateContext.getCurrency());
- return plugin.refundPayment(directPaymentStateContext.getAccount().getId(),
- directPaymentStateContext.getDirectPaymentId(),
- directPaymentStateContext.getTransactionPaymentId(),
- directPaymentStateContext.getPaymentMethodId(),
- directPaymentStateContext.getAmount(),
- directPaymentStateContext.getCurrency(),
- directPaymentStateContext.getProperties(),
- directPaymentStateContext.getCallContext());
+ logger.debug("Starting REFUND for payment {} ({} {})", paymentStateContext.getPaymentId(), paymentStateContext.getAmount(), paymentStateContext.getCurrency());
+ return plugin.refundPayment(paymentStateContext.getAccount().getId(),
+ paymentStateContext.getPaymentId(),
+ paymentStateContext.getTransactionPaymentId(),
+ paymentStateContext.getPaymentMethodId(),
+ paymentStateContext.getAmount(),
+ paymentStateContext.getCurrency(),
+ paymentStateContext.getProperties(),
+ paymentStateContext.getCallContext());
}
}
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 4605604..e92d14d 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
@@ -18,33 +18,33 @@ package org.killbill.billing.payment.core.sm;
import org.killbill.automaton.OperationResult;
import org.killbill.billing.osgi.api.OSGIServiceRegistration;
-import org.killbill.billing.payment.api.DirectPayment;
+import org.killbill.billing.payment.api.Payment;
import org.killbill.billing.payment.api.PaymentApiException;
-import org.killbill.billing.payment.core.DirectPaymentProcessor;
+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.commons.locker.GlobalLocker;
public class RetryAuthorizeOperationCallback extends RetryOperationCallback {
- public RetryAuthorizeOperationCallback(final GlobalLocker locker, final PluginDispatcher<OperationResult> paymentPluginDispatcher, final RetryableDirectPaymentStateContext directPaymentStateContext, final DirectPaymentProcessor directPaymentProcessor, final OSGIServiceRegistration<PaymentControlPluginApi> paymentControlPluginRegistry) {
- super(locker, paymentPluginDispatcher, directPaymentStateContext, directPaymentProcessor, paymentControlPluginRegistry);
+ public RetryAuthorizeOperationCallback(final GlobalLocker locker, final PluginDispatcher<OperationResult> paymentPluginDispatcher, final RetryablePaymentStateContext paymentStateContext, final PaymentProcessor paymentProcessor, final OSGIServiceRegistration<PaymentControlPluginApi> paymentControlPluginRegistry) {
+ super(locker, paymentPluginDispatcher, paymentStateContext, paymentProcessor, paymentControlPluginRegistry);
}
@Override
- protected DirectPayment doCallSpecificOperationCallback() throws PaymentApiException {
- return directPaymentProcessor.createAuthorization(retryableDirectPaymentStateContext.isApiPayment(),
- retryableDirectPaymentStateContext.getAttemptId(),
- retryableDirectPaymentStateContext.getAccount(),
- retryableDirectPaymentStateContext.getPaymentMethodId(),
- retryableDirectPaymentStateContext.getDirectPaymentId(),
- retryableDirectPaymentStateContext.getAmount(),
- retryableDirectPaymentStateContext.getCurrency(),
- retryableDirectPaymentStateContext.getDirectPaymentExternalKey(),
- retryableDirectPaymentStateContext.getDirectPaymentTransactionExternalKey(),
+ 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,
- retryableDirectPaymentStateContext.getProperties(),
- retryableDirectPaymentStateContext.getCallContext(),
- retryableDirectPaymentStateContext.getInternalCallContext());
+ 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 5090352..ad4d31b 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
@@ -18,31 +18,31 @@ package org.killbill.billing.payment.core.sm;
import org.killbill.automaton.OperationResult;
import org.killbill.billing.osgi.api.OSGIServiceRegistration;
-import org.killbill.billing.payment.api.DirectPayment;
+import org.killbill.billing.payment.api.Payment;
import org.killbill.billing.payment.api.PaymentApiException;
-import org.killbill.billing.payment.core.DirectPaymentProcessor;
+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.commons.locker.GlobalLocker;
public class RetryCaptureOperationCallback extends RetryOperationCallback {
- public RetryCaptureOperationCallback(final GlobalLocker locker, final PluginDispatcher<OperationResult> paymentPluginDispatcher, final RetryableDirectPaymentStateContext directPaymentStateContext, final DirectPaymentProcessor directPaymentProcessor, final OSGIServiceRegistration<PaymentControlPluginApi> paymentControlPluginRegistry) {
- super(locker, paymentPluginDispatcher, directPaymentStateContext, directPaymentProcessor, paymentControlPluginRegistry);
+ public RetryCaptureOperationCallback(final GlobalLocker locker, final PluginDispatcher<OperationResult> paymentPluginDispatcher, final RetryablePaymentStateContext paymentStateContext, final PaymentProcessor paymentProcessor, final OSGIServiceRegistration<PaymentControlPluginApi> paymentControlPluginRegistry) {
+ super(locker, paymentPluginDispatcher, paymentStateContext, paymentProcessor, paymentControlPluginRegistry);
}
@Override
- protected DirectPayment doCallSpecificOperationCallback() throws PaymentApiException {
- return directPaymentProcessor.createCapture(retryableDirectPaymentStateContext.isApiPayment(),
- retryableDirectPaymentStateContext.getAttemptId(),
- retryableDirectPaymentStateContext.getAccount(),
- retryableDirectPaymentStateContext.getPaymentMethodId(),
- retryableDirectPaymentStateContext.getAmount(),
- retryableDirectPaymentStateContext.getCurrency(),
- retryableDirectPaymentStateContext.getDirectPaymentTransactionExternalKey(),
+ protected Payment doCallSpecificOperationCallback() throws PaymentApiException {
+ return paymentProcessor.createCapture(retryablePaymentStateContext.isApiPayment(),
+ retryablePaymentStateContext.getAttemptId(),
+ retryablePaymentStateContext.getAccount(),
+ retryablePaymentStateContext.getPaymentMethodId(),
+ retryablePaymentStateContext.getAmount(),
+ retryablePaymentStateContext.getCurrency(),
+ retryablePaymentStateContext.getPaymentTransactionExternalKey(),
false,
- retryableDirectPaymentStateContext.getProperties(),
- retryableDirectPaymentStateContext.getCallContext(),
- retryableDirectPaymentStateContext.getInternalCallContext());
+ retryablePaymentStateContext.getProperties(),
+ retryablePaymentStateContext.getCallContext(),
+ retryablePaymentStateContext.getInternalCallContext());
}
}
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 2ea1a21..5992f9a 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
@@ -19,30 +19,30 @@ package org.killbill.billing.payment.core.sm;
import org.killbill.automaton.OperationResult;
import org.killbill.billing.osgi.api.OSGIServiceRegistration;
-import org.killbill.billing.payment.api.DirectPayment;
+import org.killbill.billing.payment.api.Payment;
import org.killbill.billing.payment.api.PaymentApiException;
-import org.killbill.billing.payment.core.DirectPaymentProcessor;
+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.commons.locker.GlobalLocker;
public class RetryChargebackOperationCallback extends RetryOperationCallback {
- public RetryChargebackOperationCallback(final GlobalLocker locker, final PluginDispatcher<OperationResult> paymentPluginDispatcher, final RetryableDirectPaymentStateContext directPaymentStateContext, final DirectPaymentProcessor directPaymentProcessor, final OSGIServiceRegistration<PaymentControlPluginApi> paymentControlPluginRegistry) {
- super(locker, paymentPluginDispatcher, directPaymentStateContext, directPaymentProcessor, paymentControlPluginRegistry);
+ public RetryChargebackOperationCallback(final GlobalLocker locker, final PluginDispatcher<OperationResult> paymentPluginDispatcher, final RetryablePaymentStateContext paymentStateContext, final PaymentProcessor paymentProcessor, final OSGIServiceRegistration<PaymentControlPluginApi> paymentControlPluginRegistry) {
+ super(locker, paymentPluginDispatcher, paymentStateContext, paymentProcessor, paymentControlPluginRegistry);
}
@Override
- protected DirectPayment doCallSpecificOperationCallback() throws PaymentApiException {
- return directPaymentProcessor.createChargeback(retryableDirectPaymentStateContext.isApiPayment(),
- retryableDirectPaymentStateContext.getAttemptId(),
- retryableDirectPaymentStateContext.getAccount(),
- retryableDirectPaymentStateContext.getDirectPaymentId(),
- retryableDirectPaymentStateContext.getDirectPaymentTransactionExternalKey(),
- retryableDirectPaymentStateContext.getAmount(),
- retryableDirectPaymentStateContext.getCurrency(),
+ protected Payment doCallSpecificOperationCallback() throws PaymentApiException {
+ return paymentProcessor.createChargeback(retryablePaymentStateContext.isApiPayment(),
+ retryablePaymentStateContext.getAttemptId(),
+ retryablePaymentStateContext.getAccount(),
+ retryablePaymentStateContext.getPaymentId(),
+ retryablePaymentStateContext.getPaymentTransactionExternalKey(),
+ retryablePaymentStateContext.getAmount(),
+ retryablePaymentStateContext.getCurrency(),
false,
- retryableDirectPaymentStateContext.getCallContext(),
- retryableDirectPaymentStateContext.getInternalCallContext());
+ 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 e336cc6..7d102d6 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
@@ -20,9 +20,9 @@ package org.killbill.billing.payment.core.sm;
import org.killbill.automaton.OperationException;
import org.killbill.automaton.OperationResult;
import org.killbill.billing.osgi.api.OSGIServiceRegistration;
-import org.killbill.billing.payment.api.DirectPayment;
+import org.killbill.billing.payment.api.Payment;
import org.killbill.billing.payment.api.PaymentApiException;
-import org.killbill.billing.payment.core.DirectPaymentProcessor;
+import org.killbill.billing.payment.core.PaymentProcessor;
import org.killbill.billing.payment.core.ProcessorBase.WithAccountLockCallback;
import org.killbill.billing.payment.dao.PaymentTransactionModelDao;
import org.killbill.billing.payment.dispatcher.PluginDispatcher;
@@ -32,8 +32,8 @@ import org.killbill.commons.locker.GlobalLocker;
public class RetryCompletionOperationCallback extends RetryOperationCallback {
- public RetryCompletionOperationCallback(final GlobalLocker locker, final PluginDispatcher<OperationResult> paymentPluginDispatcher, final RetryableDirectPaymentStateContext directPaymentStateContext, final DirectPaymentProcessor directPaymentProcessor, final OSGIServiceRegistration<PaymentControlPluginApi> retryPluginRegistry) {
- super(locker, paymentPluginDispatcher, directPaymentStateContext, directPaymentProcessor, retryPluginRegistry);
+ public RetryCompletionOperationCallback(final GlobalLocker locker, final PluginDispatcher<OperationResult> paymentPluginDispatcher, final RetryablePaymentStateContext paymentStateContext, final PaymentProcessor paymentProcessor, final OSGIServiceRegistration<PaymentControlPluginApi> retryPluginRegistry) {
+ super(locker, paymentPluginDispatcher, paymentStateContext, paymentProcessor, retryPluginRegistry);
}
@Override
@@ -42,31 +42,31 @@ public class RetryCompletionOperationCallback extends RetryOperationCallback {
return dispatchWithAccountLockAndTimeout(new WithAccountLockCallback<OperationResult, OperationException>() {
@Override
public OperationResult doOperation() throws OperationException {
- final PaymentTransactionModelDao transaction = directPaymentStateContext.getDirectPaymentTransactionModelDao();
- final PaymentControlContext updatedPaymentControlContext = new DefaultPaymentControlContext(directPaymentStateContext.getAccount(),
- directPaymentStateContext.getPaymentMethodId(),
- retryableDirectPaymentStateContext.getAttemptId(),
+ final PaymentTransactionModelDao transaction = paymentStateContext.getPaymentTransactionModelDao();
+ final PaymentControlContext updatedPaymentControlContext = new DefaultPaymentControlContext(paymentStateContext.getAccount(),
+ paymentStateContext.getPaymentMethodId(),
+ retryablePaymentStateContext.getAttemptId(),
transaction.getPaymentId(),
- directPaymentStateContext.getDirectPaymentExternalKey(),
+ paymentStateContext.getPaymentExternalKey(),
transaction.getId(),
- directPaymentStateContext.getDirectPaymentTransactionExternalKey(),
- directPaymentStateContext.getTransactionType(),
+ paymentStateContext.getPaymentTransactionExternalKey(),
+ paymentStateContext.getTransactionType(),
transaction.getAmount(),
transaction.getCurrency(),
transaction.getProcessedAmount(),
transaction.getProcessedCurrency(),
- directPaymentStateContext.getProperties(),
- retryableDirectPaymentStateContext.isApiPayment(),
- directPaymentStateContext.callContext);
+ paymentStateContext.getProperties(),
+ retryablePaymentStateContext.isApiPayment(),
+ paymentStateContext.callContext);
- onCompletion(retryableDirectPaymentStateContext.getPluginName(), updatedPaymentControlContext);
+ onCompletion(retryablePaymentStateContext.getPluginName(), updatedPaymentControlContext);
return OperationResult.SUCCESS;
}
});
}
@Override
- protected DirectPayment doCallSpecificOperationCallback() throws PaymentApiException {
+ protected Payment doCallSpecificOperationCallback() throws PaymentApiException {
return null;
}
}
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 f5e4084..90c8ae3 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
@@ -18,33 +18,33 @@ package org.killbill.billing.payment.core.sm;
import org.killbill.automaton.OperationResult;
import org.killbill.billing.osgi.api.OSGIServiceRegistration;
-import org.killbill.billing.payment.api.DirectPayment;
+import org.killbill.billing.payment.api.Payment;
import org.killbill.billing.payment.api.PaymentApiException;
-import org.killbill.billing.payment.core.DirectPaymentProcessor;
+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.commons.locker.GlobalLocker;
public class RetryCreditOperationCallback extends RetryOperationCallback {
- public RetryCreditOperationCallback(final GlobalLocker locker, final PluginDispatcher<OperationResult> paymentPluginDispatcher, final RetryableDirectPaymentStateContext directPaymentStateContext, final DirectPaymentProcessor directPaymentProcessor, final OSGIServiceRegistration<PaymentControlPluginApi> paymentControlPluginRegistry) {
- super(locker, paymentPluginDispatcher, directPaymentStateContext, directPaymentProcessor, paymentControlPluginRegistry);
+ public RetryCreditOperationCallback(final GlobalLocker locker, final PluginDispatcher<OperationResult> paymentPluginDispatcher, final RetryablePaymentStateContext paymentStateContext, final PaymentProcessor paymentProcessor, final OSGIServiceRegistration<PaymentControlPluginApi> paymentControlPluginRegistry) {
+ super(locker, paymentPluginDispatcher, paymentStateContext, paymentProcessor, paymentControlPluginRegistry);
}
@Override
- protected DirectPayment doCallSpecificOperationCallback() throws PaymentApiException {
- return directPaymentProcessor.createCredit(retryableDirectPaymentStateContext.isApiPayment(),
- retryableDirectPaymentStateContext.getAttemptId(),
- retryableDirectPaymentStateContext.getAccount(),
- retryableDirectPaymentStateContext.getPaymentMethodId(),
- retryableDirectPaymentStateContext.getDirectPaymentId(),
- retryableDirectPaymentStateContext.getAmount(),
- retryableDirectPaymentStateContext.getCurrency(),
- retryableDirectPaymentStateContext.getDirectPaymentExternalKey(),
- retryableDirectPaymentStateContext.getDirectPaymentTransactionExternalKey(),
+ 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,
- retryableDirectPaymentStateContext.getProperties(),
- retryableDirectPaymentStateContext.getCallContext(),
- retryableDirectPaymentStateContext.getInternalCallContext());
+ 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 c9a5c31..0b7889f 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,29 +29,29 @@ import org.killbill.billing.payment.retry.BaseRetryService.RetryServiceScheduler
public class RetryEnteringStateCallback implements EnteringStateCallback {
- private PluginControlledDirectPaymentAutomatonRunner retryableDirectPaymentAutomatonRunner;
- private final RetryableDirectPaymentStateContext directPaymentStateContext;
+ private PluginControlledPaymentAutomatonRunner retryablePaymentAutomatonRunner;
+ private final RetryablePaymentStateContext paymentStateContext;
private final RetryServiceScheduler retryServiceScheduler;
- public RetryEnteringStateCallback(final PluginControlledDirectPaymentAutomatonRunner retryableDirectPaymentAutomatonRunner, final RetryableDirectPaymentStateContext directPaymentStateContext,
+ public RetryEnteringStateCallback(final PluginControlledPaymentAutomatonRunner retryablePaymentAutomatonRunner, final RetryablePaymentStateContext paymentStateContext,
final RetryServiceScheduler retryServiceScheduler) {
- this.retryableDirectPaymentAutomatonRunner = retryableDirectPaymentAutomatonRunner;
- this.directPaymentStateContext = directPaymentStateContext;
+ this.retryablePaymentAutomatonRunner = retryablePaymentAutomatonRunner;
+ this.paymentStateContext = paymentStateContext;
this.retryServiceScheduler = retryServiceScheduler;
}
@Override
public void enteringState(final State state, final OperationCallback operationCallback, final OperationResult operationResult, final LeavingStateCallback leavingStateCallback) {
- final PaymentAttemptModelDao attempt = retryableDirectPaymentAutomatonRunner.paymentDao.getPaymentAttempt(directPaymentStateContext.getAttemptId(), directPaymentStateContext.internalCallContext);
- final UUID transactionId = directPaymentStateContext.getCurrentTransaction() != null ?
- directPaymentStateContext.getCurrentTransaction().getId() :
+ final PaymentAttemptModelDao attempt = retryablePaymentAutomatonRunner.paymentDao.getPaymentAttempt(paymentStateContext.getAttemptId(), paymentStateContext.internalCallContext);
+ final UUID transactionId = paymentStateContext.getCurrentTransaction() != null ?
+ paymentStateContext.getCurrentTransaction().getId() :
null;
- retryableDirectPaymentAutomatonRunner.paymentDao.updatePaymentAttempt(attempt.getId(), transactionId, state.getName(), directPaymentStateContext.internalCallContext);
+ retryablePaymentAutomatonRunner.paymentDao.updatePaymentAttempt(attempt.getId(), transactionId, state.getName(), paymentStateContext.internalCallContext);
if ("RETRIED".equals(state.getName())) {
retryServiceScheduler.scheduleRetry(ObjectType.PAYMENT_ATTEMPT, attempt.getId(), attempt.getId(),
- directPaymentStateContext.getPluginName(), directPaymentStateContext.getRetryDate());
+ paymentStateContext.getPluginName(), paymentStateContext.getRetryDate());
}
}
}
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 cb7e6c2..0369883 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,34 +31,34 @@ import com.google.common.base.Preconditions;
public class RetryLeavingStateCallback implements LeavingStateCallback {
- private PluginControlledDirectPaymentAutomatonRunner retryableDirectPaymentAutomatonRunner;
- private final RetryableDirectPaymentStateContext stateContext;
+ private PluginControlledPaymentAutomatonRunner retryablePaymentAutomatonRunner;
+ private final RetryablePaymentStateContext stateContext;
private final State initialState;
private final State retriedState;
private final TransactionType transactionType;
private final PaymentDao paymentDao;
- public RetryLeavingStateCallback(final PluginControlledDirectPaymentAutomatonRunner retryableDirectPaymentAutomatonRunner, final DirectPaymentStateContext stateContext, final PaymentDao paymentDao,
+ public RetryLeavingStateCallback(final PluginControlledPaymentAutomatonRunner retryablePaymentAutomatonRunner, final PaymentStateContext stateContext, final PaymentDao paymentDao,
final State initialState, final State retriedState, final TransactionType transactionType) {
- this.retryableDirectPaymentAutomatonRunner = retryableDirectPaymentAutomatonRunner;
+ this.retryablePaymentAutomatonRunner = retryablePaymentAutomatonRunner;
this.paymentDao = paymentDao;
this.initialState = initialState;
this.retriedState = retriedState;
- this.stateContext = (RetryableDirectPaymentStateContext) stateContext;
+ this.stateContext = (RetryablePaymentStateContext) stateContext;
this.transactionType = transactionType;
}
@Override
public void leavingState(final State state) throws OperationException {
- final DateTime utcNow = retryableDirectPaymentAutomatonRunner.clock.getUTCNow();
+ final DateTime utcNow = retryablePaymentAutomatonRunner.clock.getUTCNow();
- Preconditions.checkState(stateContext.getDirectPaymentExternalKey() != null || /* CAPTURE, PURCHASE, CREDIT calls will provide the paymentId */
- stateContext.getDirectPaymentId() != null);
- if (stateContext.getDirectPaymentExternalKey() == null) {
- final PaymentModelDao payment = paymentDao.getDirectPayment(stateContext.getDirectPaymentId(), stateContext.internalCallContext);
+ Preconditions.checkState(stateContext.getPaymentExternalKey() != null || /* CAPTURE, PURCHASE, CREDIT calls will provide the paymentId */
+ stateContext.getPaymentId() != null);
+ if (stateContext.getPaymentExternalKey() == null) {
+ final PaymentModelDao payment = paymentDao.getPayment(stateContext.getPaymentId(), stateContext.internalCallContext);
Preconditions.checkState(payment != null);
- stateContext.setDirectPaymentExternalKey(payment.getExternalKey());
+ stateContext.setPaymentExternalKey(payment.getExternalKey());
}
@@ -70,12 +70,12 @@ public class RetryLeavingStateCallback implements LeavingStateCallback {
final PaymentAttemptModelDao attempt = new PaymentAttemptModelDao(stateContext.getAccount().getId(), stateContext.getPaymentMethodId(),
- utcNow, utcNow, stateContext.getDirectPaymentExternalKey(), null,
- stateContext.directPaymentTransactionExternalKey, transactionType, initialState.getName(),
+ utcNow, utcNow, stateContext.getPaymentExternalKey(), null,
+ stateContext.paymentTransactionExternalKey, transactionType, initialState.getName(),
stateContext.getAmount(), stateContext.getCurrency(),
stateContext.getPluginName(), serializedProperties);
- retryableDirectPaymentAutomatonRunner.paymentDao.insertPaymentAttemptWithProperties(attempt, stateContext.internalCallContext);
+ retryablePaymentAutomatonRunner.paymentDao.insertPaymentAttemptWithProperties(attempt, stateContext.internalCallContext);
stateContext.setAttemptId(attempt.getId());
} catch (PluginPropertySerializerException e) {
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 7250e6e..d71cdc3 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
@@ -31,13 +31,13 @@ import org.killbill.billing.account.api.Account;
import org.killbill.billing.callcontext.DefaultCallContext;
import org.killbill.billing.catalog.api.Currency;
import org.killbill.billing.osgi.api.OSGIServiceRegistration;
-import org.killbill.billing.payment.api.DirectPayment;
-import org.killbill.billing.payment.api.DirectPaymentTransaction;
+import org.killbill.billing.payment.api.Payment;
+import org.killbill.billing.payment.api.PaymentTransaction;
import org.killbill.billing.payment.api.PaymentApiException;
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.DirectPaymentProcessor;
+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.retry.plugin.api.FailureCallResult;
@@ -55,22 +55,22 @@ public abstract class RetryOperationCallback extends OperationCallbackBase imple
private final OSGIServiceRegistration<PaymentControlPluginApi> paymentControlPluginRegistry;
- protected final DirectPaymentProcessor directPaymentProcessor;
- protected final RetryableDirectPaymentStateContext retryableDirectPaymentStateContext;
+ 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 RetryableDirectPaymentStateContext directPaymentStateContext, final DirectPaymentProcessor directPaymentProcessor, final OSGIServiceRegistration<PaymentControlPluginApi> retryPluginRegistry) {
- super(locker, paymentPluginDispatcher, directPaymentStateContext);
- this.directPaymentProcessor = directPaymentProcessor;
+ protected RetryOperationCallback(final GlobalLocker locker, final PluginDispatcher<OperationResult> paymentPluginDispatcher, final RetryablePaymentStateContext paymentStateContext, final PaymentProcessor paymentProcessor, final OSGIServiceRegistration<PaymentControlPluginApi> retryPluginRegistry) {
+ super(locker, paymentPluginDispatcher, paymentStateContext);
+ this.paymentProcessor = paymentProcessor;
this.paymentControlPluginRegistry = retryPluginRegistry;
- this.retryableDirectPaymentStateContext = directPaymentStateContext;
+ this.retryablePaymentStateContext = paymentStateContext;
}
@Override
- protected abstract DirectPayment doCallSpecificOperationCallback() throws PaymentApiException;
+ protected abstract Payment doCallSpecificOperationCallback() throws PaymentApiException;
@Override
public OperationResult doOperationCallback() throws OperationException {
@@ -80,22 +80,22 @@ public abstract class RetryOperationCallback extends OperationCallbackBase imple
@Override
public OperationResult doOperation() throws OperationException {
- final PaymentControlContext paymentControlContext = new DefaultPaymentControlContext(directPaymentStateContext.getAccount(),
- directPaymentStateContext.getPaymentMethodId(),
- retryableDirectPaymentStateContext.getAttemptId(),
- directPaymentStateContext.getDirectPaymentId(),
- directPaymentStateContext.getDirectPaymentExternalKey(),
- directPaymentStateContext.getDirectPaymentTransactionExternalKey(),
- directPaymentStateContext.getTransactionType(),
- directPaymentStateContext.getAmount(),
- directPaymentStateContext.getCurrency(),
- directPaymentStateContext.getProperties(),
- retryableDirectPaymentStateContext.isApiPayment(),
- directPaymentStateContext.callContext);
+ final PaymentControlContext paymentControlContext = new DefaultPaymentControlContext(paymentStateContext.getAccount(),
+ paymentStateContext.getPaymentMethodId(),
+ retryablePaymentStateContext.getAttemptId(),
+ paymentStateContext.getPaymentId(),
+ paymentStateContext.getPaymentExternalKey(),
+ paymentStateContext.getPaymentTransactionExternalKey(),
+ paymentStateContext.getTransactionType(),
+ paymentStateContext.getAmount(),
+ paymentStateContext.getCurrency(),
+ paymentStateContext.getProperties(),
+ retryablePaymentStateContext.isApiPayment(),
+ paymentStateContext.callContext);
final PriorPaymentControlResult pluginResult;
try {
- pluginResult = getPluginResult(retryableDirectPaymentStateContext.getPluginName(), paymentControlContext);
+ pluginResult = getPluginResult(retryablePaymentStateContext.getPluginName(), paymentControlContext);
if (pluginResult.isAborted()) {
// Transition to ABORTED
return OperationResult.EXCEPTION;
@@ -108,49 +108,49 @@ public abstract class RetryOperationCallback extends OperationCallbackBase imple
boolean success;
try {
// Adjust amount with value returned by plugin if necessary
- if (directPaymentStateContext.getAmount() == null ||
- (pluginResult.getAdjustedAmount() != null && pluginResult.getAdjustedAmount().compareTo(directPaymentStateContext.getAmount()) != 0)) {
- ((RetryableDirectPaymentStateContext) directPaymentStateContext).setAmount(pluginResult.getAdjustedAmount());
+ if (paymentStateContext.getAmount() == null ||
+ (pluginResult.getAdjustedAmount() != null && pluginResult.getAdjustedAmount().compareTo(paymentStateContext.getAmount()) != 0)) {
+ ((RetryablePaymentStateContext) paymentStateContext).setAmount(pluginResult.getAdjustedAmount());
}
- final DirectPayment result = doCallSpecificOperationCallback();
- ((RetryableDirectPaymentStateContext) directPaymentStateContext).setResult(result);
- final DirectPaymentTransaction transaction = ((RetryableDirectPaymentStateContext) directPaymentStateContext).getCurrentTransaction();
+ final Payment result = doCallSpecificOperationCallback();
+ ((RetryablePaymentStateContext) paymentStateContext).setResult(result);
+ final PaymentTransaction transaction = ((RetryablePaymentStateContext) paymentStateContext).getCurrentTransaction();
success = transaction.getTransactionStatus() == TransactionStatus.SUCCESS || transaction.getTransactionStatus() == TransactionStatus.PENDING;
if (success) {
- final PaymentControlContext updatedPaymentControlContext = new DefaultPaymentControlContext(directPaymentStateContext.account,
- directPaymentStateContext.paymentMethodId,
- retryableDirectPaymentStateContext.getAttemptId(),
+ final PaymentControlContext updatedPaymentControlContext = new DefaultPaymentControlContext(paymentStateContext.account,
+ paymentStateContext.paymentMethodId,
+ retryablePaymentStateContext.getAttemptId(),
result.getId(),
result.getExternalKey(),
transaction.getId(),
- directPaymentStateContext.getDirectPaymentTransactionExternalKey(),
- directPaymentStateContext.getTransactionType(),
+ paymentStateContext.getPaymentTransactionExternalKey(),
+ paymentStateContext.getTransactionType(),
transaction.getAmount(),
transaction.getCurrency(),
transaction.getProcessedAmount(),
transaction.getProcessedCurrency(),
- directPaymentStateContext.properties,
- retryableDirectPaymentStateContext.isApiPayment(),
- directPaymentStateContext.callContext);
+ paymentStateContext.properties,
+ retryablePaymentStateContext.isApiPayment(),
+ paymentStateContext.callContext);
- onCompletion(retryableDirectPaymentStateContext.getPluginName(), updatedPaymentControlContext);
+ onCompletion(retryablePaymentStateContext.getPluginName(), updatedPaymentControlContext);
return OperationResult.SUCCESS;
} else {
// Return an ABORTED/FAILURE state based on the retry result.
- //return getOperationResultAndSetContext(retryableDirectPaymentStateContext, paymentControlContext);
+ //return getOperationResultAndSetContext(retryablePaymentStateContext, paymentControlContext);
// STEPH Do we actually want the purchase call to fail with an exception ?
- throw new OperationException(null, getOperationResultAndSetContext(retryableDirectPaymentStateContext, paymentControlContext));
+ throw new OperationException(null, getOperationResultAndSetContext(retryablePaymentStateContext, paymentControlContext));
}
} catch (PaymentApiException e) {
// Wrap PaymentApiException, and throw a new OperationException with an ABORTED/FAILURE state based on the retry result.
- throw new OperationException(e, getOperationResultAndSetContext(retryableDirectPaymentStateContext, paymentControlContext));
+ throw new OperationException(e, getOperationResultAndSetContext(retryablePaymentStateContext, paymentControlContext));
} catch (RuntimeException e) {
// Attempts to set the retry date in context if needed.
- getOperationResultAndSetContext(retryableDirectPaymentStateContext, paymentControlContext);
+ getOperationResultAndSetContext(retryablePaymentStateContext, paymentControlContext);
throw e;
}
}
@@ -158,29 +158,29 @@ public abstract class RetryOperationCallback extends OperationCallbackBase imple
}
@Override
- protected OperationException rewrapExecutionException(final DirectPaymentStateContext directPaymentStateContext, final ExecutionException e) {
+ protected OperationException rewrapExecutionException(final PaymentStateContext paymentStateContext, final ExecutionException e) {
if (e.getCause() instanceof OperationException) {
return (OperationException) e.getCause();
} else if (e.getCause() instanceof LockFailedException) {
- final String format = String.format("Failed to lock account %s", directPaymentStateContext.getAccount().getExternalKey());
+ final String format = String.format("Failed to lock account %s", paymentStateContext.getAccount().getExternalKey());
logger.error(String.format(format), e);
- return new OperationException(e, getOperationResultOnException(directPaymentStateContext));
+ return new OperationException(e, getOperationResultOnException(paymentStateContext));
} else /* most probably RuntimeException */ {
- logger.warn("RetryOperationCallback failed for account {}", directPaymentStateContext.getAccount().getExternalKey(), e);
- return new OperationException(e, getOperationResultOnException(directPaymentStateContext));
+ logger.warn("RetryOperationCallback failed for account {}", paymentStateContext.getAccount().getExternalKey(), e);
+ return new OperationException(e, getOperationResultOnException(paymentStateContext));
}
}
@Override
- protected OperationException wrapTimeoutException(final DirectPaymentStateContext directPaymentStateContext, final TimeoutException e) {
- logger.error("RetryOperationCallback call TIMEOUT for account {}: {}", directPaymentStateContext.getAccount().getExternalKey(), e.getMessage());
- return new OperationException(e, getOperationResultOnException(directPaymentStateContext));
+ protected OperationException wrapTimeoutException(final PaymentStateContext paymentStateContext, final TimeoutException e) {
+ logger.error("RetryOperationCallback call TIMEOUT for account {}: {}", paymentStateContext.getAccount().getExternalKey(), e.getMessage());
+ return new OperationException(e, getOperationResultOnException(paymentStateContext));
}
@Override
- protected OperationException wrapInterruptedException(final DirectPaymentStateContext directPaymentStateContext, final InterruptedException e) {
- logger.error("RetryOperationCallback call was interrupted for account {}: {}", directPaymentStateContext.getAccount().getExternalKey(), e.getMessage());
- return new OperationException(e, getOperationResultOnException(directPaymentStateContext));
+ protected OperationException wrapInterruptedException(final PaymentStateContext paymentStateContext, final InterruptedException e) {
+ logger.error("RetryOperationCallback call was interrupted for account {}: {}", paymentStateContext.getAccount().getExternalKey(), e.getMessage());
+ return new OperationException(e, getOperationResultOnException(paymentStateContext));
}
protected void onCompletion(final String pluginName, final PaymentControlContext paymentControlContext) {
@@ -192,9 +192,9 @@ public abstract class RetryOperationCallback extends OperationCallbackBase imple
}
}
- private OperationResult getOperationResultOnException(final DirectPaymentStateContext directPaymentStateContext) {
- final RetryableDirectPaymentStateContext retryableDirectPaymentStateContext = (RetryableDirectPaymentStateContext) directPaymentStateContext;
- final OperationResult operationResult = retryableDirectPaymentStateContext.getRetryDate() != null ? OperationResult.FAILURE : OperationResult.EXCEPTION;
+ private OperationResult getOperationResultOnException(final PaymentStateContext paymentStateContext) {
+ final RetryablePaymentStateContext retryablePaymentStateContext = (RetryablePaymentStateContext) paymentStateContext;
+ final OperationResult operationResult = retryablePaymentStateContext.getRetryDate() != null ? OperationResult.FAILURE : OperationResult.EXCEPTION;
return operationResult;
}
@@ -205,10 +205,10 @@ public abstract class RetryOperationCallback extends OperationCallbackBase imple
return result;
}
- private OperationResult getOperationResultAndSetContext(final RetryableDirectPaymentStateContext retryableDirectPaymentStateContext, final PaymentControlContext paymentControlContext) {
- final DateTime retryDate = getNextRetryDate(retryableDirectPaymentStateContext.getPluginName(), paymentControlContext);
+ private OperationResult getOperationResultAndSetContext(final RetryablePaymentStateContext retryablePaymentStateContext, final PaymentControlContext paymentControlContext) {
+ final DateTime retryDate = getNextRetryDate(retryablePaymentStateContext.getPluginName(), paymentControlContext);
if (retryDate != null) {
- ((RetryableDirectPaymentStateContext) directPaymentStateContext).setRetryDate(retryDate);
+ ((RetryablePaymentStateContext) paymentStateContext).setRetryDate(retryDate);
return OperationResult.FAILURE;
} else {
return OperationResult.EXCEPTION;
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 f767aec..5154d4f 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
@@ -18,33 +18,33 @@ package org.killbill.billing.payment.core.sm;
import org.killbill.automaton.OperationResult;
import org.killbill.billing.osgi.api.OSGIServiceRegistration;
-import org.killbill.billing.payment.api.DirectPayment;
+import org.killbill.billing.payment.api.Payment;
import org.killbill.billing.payment.api.PaymentApiException;
-import org.killbill.billing.payment.core.DirectPaymentProcessor;
+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.commons.locker.GlobalLocker;
public class RetryPurchaseOperationCallback extends RetryOperationCallback {
- public RetryPurchaseOperationCallback(final GlobalLocker locker, final PluginDispatcher<OperationResult> paymentPluginDispatcher, final RetryableDirectPaymentStateContext directPaymentStateContext, final DirectPaymentProcessor directPaymentProcessor, final OSGIServiceRegistration<PaymentControlPluginApi> retryPluginRegistry) {
- super(locker, paymentPluginDispatcher, directPaymentStateContext, directPaymentProcessor, retryPluginRegistry);
+ public RetryPurchaseOperationCallback(final GlobalLocker locker, final PluginDispatcher<OperationResult> paymentPluginDispatcher, final RetryablePaymentStateContext paymentStateContext, final PaymentProcessor paymentProcessor, final OSGIServiceRegistration<PaymentControlPluginApi> retryPluginRegistry) {
+ super(locker, paymentPluginDispatcher, paymentStateContext, paymentProcessor, retryPluginRegistry);
}
@Override
- protected DirectPayment doCallSpecificOperationCallback() throws PaymentApiException {
- return directPaymentProcessor.createPurchase(retryableDirectPaymentStateContext.isApiPayment(),
- retryableDirectPaymentStateContext.getAttemptId(),
- retryableDirectPaymentStateContext.getAccount(),
- retryableDirectPaymentStateContext.getPaymentMethodId(),
- retryableDirectPaymentStateContext.getDirectPaymentId(),
- retryableDirectPaymentStateContext.getAmount(),
- retryableDirectPaymentStateContext.getCurrency(),
- retryableDirectPaymentStateContext.getDirectPaymentExternalKey(),
- retryableDirectPaymentStateContext.getDirectPaymentTransactionExternalKey(),
+ 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,
- retryableDirectPaymentStateContext.getProperties(),
- retryableDirectPaymentStateContext.getCallContext(),
- retryableDirectPaymentStateContext.getInternalCallContext());
+ 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 fd56cf9..f4cb3c0 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
@@ -18,31 +18,31 @@ package org.killbill.billing.payment.core.sm;
import org.killbill.automaton.OperationResult;
import org.killbill.billing.osgi.api.OSGIServiceRegistration;
-import org.killbill.billing.payment.api.DirectPayment;
+import org.killbill.billing.payment.api.Payment;
import org.killbill.billing.payment.api.PaymentApiException;
-import org.killbill.billing.payment.core.DirectPaymentProcessor;
+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.commons.locker.GlobalLocker;
public class RetryRefundOperationCallback extends RetryOperationCallback {
- public RetryRefundOperationCallback(final GlobalLocker locker, final PluginDispatcher<OperationResult> paymentPluginDispatcher, final RetryableDirectPaymentStateContext directPaymentStateContext, final DirectPaymentProcessor directPaymentProcessor, final OSGIServiceRegistration<PaymentControlPluginApi> paymentControlPluginRegistry) {
- super(locker, paymentPluginDispatcher, directPaymentStateContext, directPaymentProcessor, paymentControlPluginRegistry);
+ public RetryRefundOperationCallback(final GlobalLocker locker, final PluginDispatcher<OperationResult> paymentPluginDispatcher, final RetryablePaymentStateContext paymentStateContext, final PaymentProcessor paymentProcessor, final OSGIServiceRegistration<PaymentControlPluginApi> paymentControlPluginRegistry) {
+ super(locker, paymentPluginDispatcher, paymentStateContext, paymentProcessor, paymentControlPluginRegistry);
}
@Override
- protected DirectPayment doCallSpecificOperationCallback() throws PaymentApiException {
- return directPaymentProcessor.createRefund(retryableDirectPaymentStateContext.isApiPayment(),
- retryableDirectPaymentStateContext.getAttemptId(),
- retryableDirectPaymentStateContext.getAccount(),
- retryableDirectPaymentStateContext.getDirectPaymentId(),
- retryableDirectPaymentStateContext.getAmount(),
- retryableDirectPaymentStateContext.getCurrency(),
- retryableDirectPaymentStateContext.getDirectPaymentTransactionExternalKey(),
+ protected Payment doCallSpecificOperationCallback() throws PaymentApiException {
+ return paymentProcessor.createRefund(retryablePaymentStateContext.isApiPayment(),
+ retryablePaymentStateContext.getAttemptId(),
+ retryablePaymentStateContext.getAccount(),
+ retryablePaymentStateContext.getPaymentId(),
+ retryablePaymentStateContext.getAmount(),
+ retryablePaymentStateContext.getCurrency(),
+ retryablePaymentStateContext.getPaymentTransactionExternalKey(),
false,
- retryableDirectPaymentStateContext.getProperties(),
- retryableDirectPaymentStateContext.getCallContext(),
- retryableDirectPaymentStateContext.getInternalCallContext());
+ 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 a6e2681..090e2e0 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
@@ -18,29 +18,29 @@ package org.killbill.billing.payment.core.sm;
import org.killbill.automaton.OperationResult;
import org.killbill.billing.osgi.api.OSGIServiceRegistration;
-import org.killbill.billing.payment.api.DirectPayment;
+import org.killbill.billing.payment.api.Payment;
import org.killbill.billing.payment.api.PaymentApiException;
-import org.killbill.billing.payment.core.DirectPaymentProcessor;
+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.commons.locker.GlobalLocker;
public class RetryVoidOperationCallback extends RetryOperationCallback {
- public RetryVoidOperationCallback(final GlobalLocker locker, final PluginDispatcher<OperationResult> paymentPluginDispatcher, final RetryableDirectPaymentStateContext directPaymentStateContext, final DirectPaymentProcessor directPaymentProcessor, final OSGIServiceRegistration<PaymentControlPluginApi> paymentControlPluginRegistry) {
- super(locker, paymentPluginDispatcher, directPaymentStateContext, directPaymentProcessor, paymentControlPluginRegistry);
+ public RetryVoidOperationCallback(final GlobalLocker locker, final PluginDispatcher<OperationResult> paymentPluginDispatcher, final RetryablePaymentStateContext paymentStateContext, final PaymentProcessor paymentProcessor, final OSGIServiceRegistration<PaymentControlPluginApi> paymentControlPluginRegistry) {
+ super(locker, paymentPluginDispatcher, paymentStateContext, paymentProcessor, paymentControlPluginRegistry);
}
@Override
- protected DirectPayment doCallSpecificOperationCallback() throws PaymentApiException {
- return directPaymentProcessor.createVoid(retryableDirectPaymentStateContext.isApiPayment(),
- retryableDirectPaymentStateContext.getAttemptId(),
- retryableDirectPaymentStateContext.getAccount(),
- retryableDirectPaymentStateContext.getDirectPaymentId(),
- retryableDirectPaymentStateContext.getDirectPaymentTransactionExternalKey(),
+ protected Payment doCallSpecificOperationCallback() throws PaymentApiException {
+ return paymentProcessor.createVoid(retryablePaymentStateContext.isApiPayment(),
+ retryablePaymentStateContext.getAttemptId(),
+ retryablePaymentStateContext.getAccount(),
+ retryablePaymentStateContext.getPaymentId(),
+ retryablePaymentStateContext.getPaymentTransactionExternalKey(),
false,
- retryableDirectPaymentStateContext.getProperties(),
- retryableDirectPaymentStateContext.getCallContext(),
- retryableDirectPaymentStateContext.getInternalCallContext());
+ retryablePaymentStateContext.getProperties(),
+ retryablePaymentStateContext.getCallContext(),
+ retryablePaymentStateContext.getInternalCallContext());
}
}
diff --git a/payment/src/main/java/org/killbill/billing/payment/core/sm/VoidCompleted.java b/payment/src/main/java/org/killbill/billing/payment/core/sm/VoidCompleted.java
index 337a1a8..dbade9a 100644
--- a/payment/src/main/java/org/killbill/billing/payment/core/sm/VoidCompleted.java
+++ b/payment/src/main/java/org/killbill/billing/payment/core/sm/VoidCompleted.java
@@ -19,9 +19,9 @@ package org.killbill.billing.payment.core.sm;
import org.killbill.billing.payment.api.PaymentApiException;
-public class VoidCompleted extends DirectPaymentEnteringStateCallback {
+public class VoidCompleted extends PaymentEnteringStateCallback {
- public VoidCompleted(final DirectPaymentAutomatonDAOHelper daoHelper, final DirectPaymentStateContext directPaymentStateContext) throws PaymentApiException {
- super(daoHelper, directPaymentStateContext);
+ public VoidCompleted(final PaymentAutomatonDAOHelper daoHelper, final PaymentStateContext paymentStateContext) throws PaymentApiException {
+ super(daoHelper, paymentStateContext);
}
}
diff --git a/payment/src/main/java/org/killbill/billing/payment/core/sm/VoidInitiated.java b/payment/src/main/java/org/killbill/billing/payment/core/sm/VoidInitiated.java
index 647a9db..89e8b03 100644
--- a/payment/src/main/java/org/killbill/billing/payment/core/sm/VoidInitiated.java
+++ b/payment/src/main/java/org/killbill/billing/payment/core/sm/VoidInitiated.java
@@ -19,9 +19,9 @@ package org.killbill.billing.payment.core.sm;
import org.killbill.billing.payment.api.PaymentApiException;
-public class VoidInitiated extends DirectPaymentLeavingStateCallback {
+public class VoidInitiated extends PaymentLeavingStateCallback {
- public VoidInitiated(final DirectPaymentAutomatonDAOHelper daoHelper, final DirectPaymentStateContext directPaymentStateContext) throws PaymentApiException {
+ public VoidInitiated(final PaymentAutomatonDAOHelper daoHelper, final PaymentStateContext paymentStateContext) throws PaymentApiException {
super(daoHelper);
}
}
diff --git a/payment/src/main/java/org/killbill/billing/payment/core/sm/VoidOperation.java b/payment/src/main/java/org/killbill/billing/payment/core/sm/VoidOperation.java
index af6bd61..c4871f5 100644
--- a/payment/src/main/java/org/killbill/billing/payment/core/sm/VoidOperation.java
+++ b/payment/src/main/java/org/killbill/billing/payment/core/sm/VoidOperation.java
@@ -26,24 +26,24 @@ import org.killbill.commons.locker.GlobalLocker;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class VoidOperation extends DirectPaymentOperation {
+public class VoidOperation extends PaymentOperation {
private final Logger logger = LoggerFactory.getLogger(VoidOperation.class);
- public VoidOperation(final DirectPaymentAutomatonDAOHelper daoHelper,
+ public VoidOperation(final PaymentAutomatonDAOHelper daoHelper,
final GlobalLocker locker, final PluginDispatcher<OperationResult> paymentPluginDispatcher,
- final DirectPaymentStateContext directPaymentStateContext) throws PaymentApiException {
- super(daoHelper, locker, paymentPluginDispatcher, directPaymentStateContext);
+ final PaymentStateContext paymentStateContext) throws PaymentApiException {
+ super(daoHelper, locker, paymentPluginDispatcher, paymentStateContext);
}
@Override
protected PaymentTransactionInfoPlugin doCallSpecificOperationCallback() throws PaymentPluginApiException {
- logger.debug("Starting VOID for payment {} ({} {})", directPaymentStateContext.getDirectPaymentId(), directPaymentStateContext.getAmount(), directPaymentStateContext.getCurrency());
- return plugin.voidPayment(directPaymentStateContext.getAccount().getId(),
- directPaymentStateContext.getDirectPaymentId(),
- directPaymentStateContext.getTransactionPaymentId(),
- directPaymentStateContext.getPaymentMethodId(),
- directPaymentStateContext.getProperties(),
- directPaymentStateContext.getCallContext());
+ logger.debug("Starting VOID for payment {} ({} {})", paymentStateContext.getPaymentId(), paymentStateContext.getAmount(), paymentStateContext.getCurrency());
+ return plugin.voidPayment(paymentStateContext.getAccount().getId(),
+ paymentStateContext.getPaymentId(),
+ paymentStateContext.getTransactionPaymentId(),
+ paymentStateContext.getPaymentMethodId(),
+ paymentStateContext.getProperties(),
+ paymentStateContext.getCallContext());
}
}
diff --git a/payment/src/main/java/org/killbill/billing/payment/dao/DefaultPaymentDao.java b/payment/src/main/java/org/killbill/billing/payment/dao/DefaultPaymentDao.java
index 4092ce1..0a6be18 100644
--- a/payment/src/main/java/org/killbill/billing/payment/dao/DefaultPaymentDao.java
+++ b/payment/src/main/java/org/killbill/billing/payment/dao/DefaultPaymentDao.java
@@ -32,7 +32,7 @@ import org.killbill.billing.callcontext.InternalCallContext;
import org.killbill.billing.callcontext.InternalTenantContext;
import org.killbill.billing.catalog.api.Currency;
import org.killbill.billing.entity.EntityPersistenceException;
-import org.killbill.billing.payment.api.DirectPayment;
+import org.killbill.billing.payment.api.Payment;
import org.killbill.billing.payment.api.PaymentMethod;
import org.killbill.billing.payment.api.TransactionStatus;
import org.killbill.billing.payment.api.TransactionType;
@@ -160,7 +160,7 @@ public class DefaultPaymentDao implements PaymentDao {
@Override
- public List<PaymentTransactionModelDao> getDirectPaymentTransactionsByExternalKey(final String transactionExternalKey, final InternalTenantContext context) {
+ public List<PaymentTransactionModelDao> getPaymentTransactionsByExternalKey(final String transactionExternalKey, final InternalTenantContext context) {
return transactionalSqlDao.execute(new EntitySqlDaoTransactionWrapper<List<PaymentTransactionModelDao>>() {
@Override
public List<PaymentTransactionModelDao> inTransaction(final EntitySqlDaoWrapperFactory<EntitySqlDao> entitySqlDaoWrapperFactory) throws Exception {
@@ -170,7 +170,7 @@ public class DefaultPaymentDao implements PaymentDao {
}
@Override
- public PaymentModelDao getDirectPaymentByExternalKey(final String paymentExternalKey, final InternalTenantContext context) {
+ public PaymentModelDao getPaymentByExternalKey(final String paymentExternalKey, final InternalTenantContext context) {
return transactionalSqlDao.execute(new EntitySqlDaoTransactionWrapper<PaymentModelDao>() {
@Override
public PaymentModelDao inTransaction(final EntitySqlDaoWrapperFactory<EntitySqlDao> entitySqlDaoWrapperFactory) throws Exception {
@@ -180,17 +180,17 @@ public class DefaultPaymentDao implements PaymentDao {
}
@Override
- public Pagination<PaymentModelDao> getDirectPayments(final String pluginName, final Long offset, final Long limit, final InternalTenantContext context) {
+ public Pagination<PaymentModelDao> getPayments(final String pluginName, final Long offset, final Long limit, final InternalTenantContext context) {
return paginationHelper.getPagination(PaymentSqlDao.class,
- new PaginationIteratorBuilder<PaymentModelDao, DirectPayment, PaymentSqlDao>() {
+ new PaginationIteratorBuilder<PaymentModelDao, Payment, PaymentSqlDao>() {
@Override
- public Long getCount(final PaymentSqlDao directPaymentSqlDao, final InternalTenantContext context) {
- return directPaymentSqlDao.getCountByPluginName(pluginName, context);
+ public Long getCount(final PaymentSqlDao paymentSqlDao, final InternalTenantContext context) {
+ return paymentSqlDao.getCountByPluginName(pluginName, context);
}
@Override
- public Iterator<PaymentModelDao> build(final PaymentSqlDao directPaymentSqlDao, final Long limit, final InternalTenantContext context) {
- final Iterator<PaymentModelDao> result = directPaymentSqlDao.getByPluginName(pluginName, offset, limit, context);
+ public Iterator<PaymentModelDao> build(final PaymentSqlDao paymentSqlDao, final Long limit, final InternalTenantContext context) {
+ final Iterator<PaymentModelDao> result = paymentSqlDao.getByPluginName(pluginName, offset, limit, context);
return result;
}
},
@@ -201,40 +201,40 @@ public class DefaultPaymentDao implements PaymentDao {
}
@Override
- public PaymentModelDao insertDirectPaymentWithFirstTransaction(final PaymentModelDao directPayment, final PaymentTransactionModelDao directPaymentTransaction, final InternalCallContext context) {
+ public PaymentModelDao insertPaymentWithFirstTransaction(final PaymentModelDao payment, final PaymentTransactionModelDao paymentTransaction, final InternalCallContext context) {
return transactionalSqlDao.execute(new EntitySqlDaoTransactionWrapper<PaymentModelDao>() {
@Override
public PaymentModelDao inTransaction(final EntitySqlDaoWrapperFactory<EntitySqlDao> entitySqlDaoWrapperFactory) throws Exception {
- final PaymentSqlDao directPaymentSqlDao = entitySqlDaoWrapperFactory.become(PaymentSqlDao.class);
- directPaymentSqlDao.create(directPayment, context);
- entitySqlDaoWrapperFactory.become(TransactionSqlDao.class).create(directPaymentTransaction, context);
- return directPaymentSqlDao.getById(directPayment.getId().toString(), context);
+ final PaymentSqlDao paymentSqlDao = entitySqlDaoWrapperFactory.become(PaymentSqlDao.class);
+ paymentSqlDao.create(payment, context);
+ entitySqlDaoWrapperFactory.become(TransactionSqlDao.class).create(paymentTransaction, context);
+ return paymentSqlDao.getById(payment.getId().toString(), context);
}
});
}
@Override
- public PaymentTransactionModelDao updateDirectPaymentWithNewTransaction(final UUID directPaymentId, final PaymentTransactionModelDao directPaymentTransaction, final InternalCallContext context) {
+ public PaymentTransactionModelDao updatePaymentWithNewTransaction(final UUID paymentId, final PaymentTransactionModelDao paymentTransaction, final InternalCallContext context) {
return transactionalSqlDao.execute(new EntitySqlDaoTransactionWrapper<PaymentTransactionModelDao>() {
@Override
public PaymentTransactionModelDao inTransaction(final EntitySqlDaoWrapperFactory<EntitySqlDao> entitySqlDaoWrapperFactory) throws Exception {
final TransactionSqlDao transactional = entitySqlDaoWrapperFactory.become(TransactionSqlDao.class);
- transactional.create(directPaymentTransaction, context);
- final PaymentTransactionModelDao directPaymentTransactionModelDao = transactional.getById(directPaymentTransaction.getId().toString(), context);
+ transactional.create(paymentTransaction, context);
+ final PaymentTransactionModelDao paymentTransactionModelDao = transactional.getById(paymentTransaction.getId().toString(), context);
- entitySqlDaoWrapperFactory.become(PaymentSqlDao.class).updatePaymentForNewTransaction(directPaymentId.toString(), context);
+ entitySqlDaoWrapperFactory.become(PaymentSqlDao.class).updatePaymentForNewTransaction(paymentId.toString(), context);
- return directPaymentTransactionModelDao;
+ return paymentTransactionModelDao;
}
});
}
@Override
- public void updateDirectPaymentAndTransactionOnCompletion(final UUID directPaymentId, final String currentPaymentStateName,
+ public void updatePaymentAndTransactionOnCompletion(final UUID paymentId, final String currentPaymentStateName,
@Nullable final String lastPaymentSuccessStateName,
- final UUID directTransactionId, final TransactionStatus paymentStatus,
+ final UUID transactionId, final TransactionStatus paymentStatus,
final BigDecimal processedAmount, final Currency processedCurrency,
final String gatewayErrorCode, final String gatewayErrorMsg,
final InternalCallContext context) {
@@ -242,14 +242,14 @@ public class DefaultPaymentDao implements PaymentDao {
@Override
public Void inTransaction(final EntitySqlDaoWrapperFactory<EntitySqlDao> entitySqlDaoWrapperFactory) throws Exception {
- entitySqlDaoWrapperFactory.become(TransactionSqlDao.class).updateTransactionStatus(directTransactionId.toString(),
+ entitySqlDaoWrapperFactory.become(TransactionSqlDao.class).updateTransactionStatus(transactionId.toString(),
processedAmount, processedCurrency == null ? null : processedCurrency.toString(),
paymentStatus == null ? null : paymentStatus.toString(),
gatewayErrorCode, gatewayErrorMsg, context);
if (lastPaymentSuccessStateName != null) {
- entitySqlDaoWrapperFactory.become(PaymentSqlDao.class).updateLastSuccessPaymentStateName(directPaymentId.toString(), currentPaymentStateName, lastPaymentSuccessStateName, context);
+ entitySqlDaoWrapperFactory.become(PaymentSqlDao.class).updateLastSuccessPaymentStateName(paymentId.toString(), currentPaymentStateName, lastPaymentSuccessStateName, context);
} else {
- entitySqlDaoWrapperFactory.become(PaymentSqlDao.class).updatePaymentStateName(directPaymentId.toString(), currentPaymentStateName, context);
+ entitySqlDaoWrapperFactory.become(PaymentSqlDao.class).updatePaymentStateName(paymentId.toString(), currentPaymentStateName, context);
}
return null;
}
@@ -258,27 +258,27 @@ public class DefaultPaymentDao implements PaymentDao {
}
@Override
- public PaymentModelDao getDirectPayment(final UUID directPaymentId, final InternalTenantContext context) {
+ public PaymentModelDao getPayment(final UUID paymentId, final InternalTenantContext context) {
return transactionalSqlDao.execute(new EntitySqlDaoTransactionWrapper<PaymentModelDao>() {
@Override
public PaymentModelDao inTransaction(final EntitySqlDaoWrapperFactory<EntitySqlDao> entitySqlDaoWrapperFactory) throws Exception {
- return entitySqlDaoWrapperFactory.become(PaymentSqlDao.class).getById(directPaymentId.toString(), context);
+ return entitySqlDaoWrapperFactory.become(PaymentSqlDao.class).getById(paymentId.toString(), context);
}
});
}
@Override
- public PaymentTransactionModelDao getDirectPaymentTransaction(final UUID directTransactionId, final InternalTenantContext context) {
+ public PaymentTransactionModelDao getPaymentTransaction(final UUID transactionId, final InternalTenantContext context) {
return transactionalSqlDao.execute(new EntitySqlDaoTransactionWrapper<PaymentTransactionModelDao>() {
@Override
public PaymentTransactionModelDao inTransaction(final EntitySqlDaoWrapperFactory<EntitySqlDao> entitySqlDaoWrapperFactory) throws Exception {
- return entitySqlDaoWrapperFactory.become(TransactionSqlDao.class).getById(directTransactionId.toString(), context);
+ return entitySqlDaoWrapperFactory.become(TransactionSqlDao.class).getById(transactionId.toString(), context);
}
});
}
@Override
- public List<PaymentModelDao> getDirectPaymentsForAccount(final UUID accountId, final InternalTenantContext context) {
+ public List<PaymentModelDao> getPaymentsForAccount(final UUID accountId, final InternalTenantContext context) {
Preconditions.checkArgument(context.getAccountRecordId() != null);
return transactionalSqlDao.execute(new EntitySqlDaoTransactionWrapper<List<PaymentModelDao>>() {
@Override
@@ -289,7 +289,7 @@ public class DefaultPaymentDao implements PaymentDao {
}
@Override
- public List<PaymentTransactionModelDao> getDirectTransactionsForAccount(final UUID accountId, final InternalTenantContext context) {
+ public List<PaymentTransactionModelDao> getTransactionsForAccount(final UUID accountId, final InternalTenantContext context) {
Preconditions.checkArgument(context.getAccountRecordId() != null);
return transactionalSqlDao.execute(new EntitySqlDaoTransactionWrapper<List<PaymentTransactionModelDao>>() {
@Override
@@ -300,11 +300,11 @@ public class DefaultPaymentDao implements PaymentDao {
}
@Override
- public List<PaymentTransactionModelDao> getDirectTransactionsForDirectPayment(final UUID directPaymentId, final InternalTenantContext context) {
+ public List<PaymentTransactionModelDao> getTransactionsForPayment(final UUID paymentId, final InternalTenantContext context) {
return transactionalSqlDao.execute(new EntitySqlDaoTransactionWrapper<List<PaymentTransactionModelDao>>() {
@Override
public List<PaymentTransactionModelDao> inTransaction(final EntitySqlDaoWrapperFactory<EntitySqlDao> entitySqlDaoWrapperFactory) throws Exception {
- return entitySqlDaoWrapperFactory.become(TransactionSqlDao.class).getByPaymentId(directPaymentId, context);
+ return entitySqlDaoWrapperFactory.become(TransactionSqlDao.class).getByPaymentId(paymentId, context);
}
});
}
diff --git a/payment/src/main/java/org/killbill/billing/payment/dao/PaymentDao.java b/payment/src/main/java/org/killbill/billing/payment/dao/PaymentDao.java
index b6cfac0..640601e 100644
--- a/payment/src/main/java/org/killbill/billing/payment/dao/PaymentDao.java
+++ b/payment/src/main/java/org/killbill/billing/payment/dao/PaymentDao.java
@@ -41,32 +41,32 @@ public interface PaymentDao {
public List<PaymentAttemptModelDao> getPaymentAttemptByTransactionExternalKey(String externalKey, InternalTenantContext context);
- public List<PaymentTransactionModelDao> getDirectPaymentTransactionsByExternalKey(String transactionExternalKey, InternalTenantContext context);
+ public List<PaymentTransactionModelDao> getPaymentTransactionsByExternalKey(String transactionExternalKey, InternalTenantContext context);
- public PaymentModelDao getDirectPaymentByExternalKey(String externalKey, InternalTenantContext context);
+ public PaymentModelDao getPaymentByExternalKey(String externalKey, InternalTenantContext context);
- public Pagination<PaymentModelDao> getDirectPayments(String pluginName, Long offset, Long limit, InternalTenantContext context);
+ public Pagination<PaymentModelDao> getPayments(String pluginName, Long offset, Long limit, InternalTenantContext context);
- public PaymentModelDao insertDirectPaymentWithFirstTransaction(PaymentModelDao directPayment, PaymentTransactionModelDao directPaymentTransaction, InternalCallContext context);
+ public PaymentModelDao insertPaymentWithFirstTransaction(PaymentModelDao payment, PaymentTransactionModelDao paymentTransaction, InternalCallContext context);
- public PaymentTransactionModelDao updateDirectPaymentWithNewTransaction(UUID directPaymentId, PaymentTransactionModelDao directPaymentTransaction, InternalCallContext context);
+ public PaymentTransactionModelDao updatePaymentWithNewTransaction(UUID paymentId, PaymentTransactionModelDao paymentTransaction, InternalCallContext context);
- public void updateDirectPaymentAndTransactionOnCompletion(UUID directPaymentId, String currentPaymentStateName,
+ public void updatePaymentAndTransactionOnCompletion(UUID paymentId, String currentPaymentStateName,
String lastPaymentSuccessStateName,
- UUID directTransactionId, TransactionStatus paymentStatus,
+ UUID transactionId, TransactionStatus paymentStatus,
BigDecimal processedAmount, Currency processedCurrency,
String gatewayErrorCode, String gatewayErrorMsg,
InternalCallContext context);
- public PaymentModelDao getDirectPayment(UUID directPaymentId, InternalTenantContext context);
+ public PaymentModelDao getPayment(UUID paymentId, InternalTenantContext context);
- public PaymentTransactionModelDao getDirectPaymentTransaction(UUID directTransactionId, InternalTenantContext context);
+ public PaymentTransactionModelDao getPaymentTransaction(UUID transactionId, InternalTenantContext context);
- public List<PaymentModelDao> getDirectPaymentsForAccount(UUID accountId, InternalTenantContext context);
+ public List<PaymentModelDao> getPaymentsForAccount(UUID accountId, InternalTenantContext context);
- public List<PaymentTransactionModelDao> getDirectTransactionsForAccount(UUID accountId, InternalTenantContext context);
+ public List<PaymentTransactionModelDao> getTransactionsForAccount(UUID accountId, InternalTenantContext context);
- public List<PaymentTransactionModelDao> getDirectTransactionsForDirectPayment(UUID directPaymentId, InternalTenantContext context);
+ public List<PaymentTransactionModelDao> getTransactionsForPayment(UUID paymentId, InternalTenantContext context);
public PaymentAttemptModelDao getPaymentAttempt(UUID attemptId, InternalTenantContext context);
diff --git a/payment/src/main/java/org/killbill/billing/payment/dao/PaymentModelDao.java b/payment/src/main/java/org/killbill/billing/payment/dao/PaymentModelDao.java
index de3607b..35d3f4b 100644
--- a/payment/src/main/java/org/killbill/billing/payment/dao/PaymentModelDao.java
+++ b/payment/src/main/java/org/killbill/billing/payment/dao/PaymentModelDao.java
@@ -22,13 +22,13 @@ import javax.annotation.Nullable;
import org.joda.time.DateTime;
import org.killbill.billing.entity.EntityBase;
-import org.killbill.billing.payment.api.DirectPayment;
+import org.killbill.billing.payment.api.Payment;
import org.killbill.billing.util.dao.TableName;
import org.killbill.billing.util.entity.dao.EntityModelDao;
import com.google.common.base.Objects;
-public class PaymentModelDao extends EntityBase implements EntityModelDao<DirectPayment> {
+public class PaymentModelDao extends EntityBase implements EntityModelDao<Payment> {
public static final Integer INVALID_PAYMENT_NUMBER = new Integer(-17);
diff --git a/payment/src/main/java/org/killbill/billing/payment/dao/PaymentSqlDao.java b/payment/src/main/java/org/killbill/billing/payment/dao/PaymentSqlDao.java
index 2a1b8d8..432d130 100644
--- a/payment/src/main/java/org/killbill/billing/payment/dao/PaymentSqlDao.java
+++ b/payment/src/main/java/org/killbill/billing/payment/dao/PaymentSqlDao.java
@@ -20,7 +20,7 @@ import java.util.Iterator;
import org.killbill.billing.callcontext.InternalCallContext;
import org.killbill.billing.callcontext.InternalTenantContext;
-import org.killbill.billing.payment.api.DirectPayment;
+import org.killbill.billing.payment.api.Payment;
import org.killbill.billing.util.audit.ChangeType;
import org.killbill.billing.util.entity.dao.Audited;
import org.killbill.billing.util.entity.dao.EntitySqlDao;
@@ -32,23 +32,23 @@ import org.skife.jdbi.v2.sqlobject.SqlQuery;
import org.skife.jdbi.v2.sqlobject.SqlUpdate;
@EntitySqlDaoStringTemplate
-public interface PaymentSqlDao extends EntitySqlDao<PaymentModelDao, DirectPayment> {
+public interface PaymentSqlDao extends EntitySqlDao<PaymentModelDao, Payment> {
@SqlUpdate
@Audited(ChangeType.UPDATE)
- void updatePaymentForNewTransaction(@Bind("id") final String directPaymentId,
+ void updatePaymentForNewTransaction(@Bind("id") final String paymentId,
@BindBean final InternalCallContext context);
@SqlUpdate
@Audited(ChangeType.UPDATE)
- void updatePaymentStateName(@Bind("id") final String directPaymentId,
+ void updatePaymentStateName(@Bind("id") final String paymentId,
@Bind("stateName") final String stateName,
@BindBean final InternalCallContext context);
@SqlUpdate
@Audited(ChangeType.UPDATE)
- void updateLastSuccessPaymentStateName(@Bind("id") final String directPaymentId,
+ void updateLastSuccessPaymentStateName(@Bind("id") final String paymentId,
@Bind("stateName") final String stateName,
@Bind("lastSuccessStateName") final String lastSuccessStateName,
@BindBean final InternalCallContext context);
diff --git a/payment/src/main/java/org/killbill/billing/payment/dao/PaymentTransactionModelDao.java b/payment/src/main/java/org/killbill/billing/payment/dao/PaymentTransactionModelDao.java
index e718a6f..cb88241 100644
--- a/payment/src/main/java/org/killbill/billing/payment/dao/PaymentTransactionModelDao.java
+++ b/payment/src/main/java/org/killbill/billing/payment/dao/PaymentTransactionModelDao.java
@@ -24,7 +24,7 @@ import javax.annotation.Nullable;
import org.joda.time.DateTime;
import org.killbill.billing.catalog.api.Currency;
import org.killbill.billing.entity.EntityBase;
-import org.killbill.billing.payment.api.DirectPaymentTransaction;
+import org.killbill.billing.payment.api.PaymentTransaction;
import org.killbill.billing.payment.api.TransactionStatus;
import org.killbill.billing.payment.api.TransactionType;
import org.killbill.billing.util.dao.TableName;
@@ -32,7 +32,7 @@ import org.killbill.billing.util.entity.dao.EntityModelDao;
import com.google.common.base.Objects;
-public class PaymentTransactionModelDao extends EntityBase implements EntityModelDao<DirectPaymentTransaction> {
+public class PaymentTransactionModelDao extends EntityBase implements EntityModelDao<PaymentTransaction> {
private UUID attemptId;
private UUID paymentId;
diff --git a/payment/src/main/java/org/killbill/billing/payment/dao/TransactionSqlDao.java b/payment/src/main/java/org/killbill/billing/payment/dao/TransactionSqlDao.java
index fb29b85..e9abc96 100644
--- a/payment/src/main/java/org/killbill/billing/payment/dao/TransactionSqlDao.java
+++ b/payment/src/main/java/org/killbill/billing/payment/dao/TransactionSqlDao.java
@@ -24,7 +24,7 @@ import java.util.UUID;
import org.killbill.billing.callcontext.InternalCallContext;
import org.killbill.billing.callcontext.InternalTenantContext;
-import org.killbill.billing.payment.api.DirectPaymentTransaction;
+import org.killbill.billing.payment.api.PaymentTransaction;
import org.killbill.billing.util.audit.ChangeType;
import org.killbill.billing.util.entity.dao.Audited;
import org.killbill.billing.util.entity.dao.EntitySqlDao;
@@ -36,7 +36,7 @@ import org.skife.jdbi.v2.sqlobject.SqlQuery;
import org.skife.jdbi.v2.sqlobject.SqlUpdate;
@EntitySqlDaoStringTemplate
-public interface TransactionSqlDao extends EntitySqlDao<PaymentTransactionModelDao, DirectPaymentTransaction> {
+public interface TransactionSqlDao extends EntitySqlDao<PaymentTransactionModelDao, PaymentTransaction> {
@SqlUpdate
@Audited(ChangeType.UPDATE)
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 eeb7319..2a8e0aa 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
@@ -18,7 +18,7 @@
package org.killbill.billing.payment.glue;
-import org.killbill.billing.payment.api.DirectPaymentApi;
+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;
@@ -43,14 +43,14 @@ public class DefaultPaymentService implements PaymentService {
private final InvoiceHandler invoiceHandler;
private final PaymentTagHandler tagHandler;
private final PersistentBus eventBus;
- private final DirectPaymentApi api;
+ private final PaymentApi api;
private final DefaultRetryService retryService;
private final Janitor janitor;
@Inject
public DefaultPaymentService(final InvoiceHandler invoiceHandler,
final PaymentTagHandler tagHandler,
- final DirectPaymentApi api,
+ final PaymentApi api,
final DefaultRetryService retryService,
final PersistentBus eventBus,
final Janitor janitor) {
@@ -97,7 +97,7 @@ public class DefaultPaymentService implements PaymentService {
}
@Override
- public DirectPaymentApi getPaymentApi() {
+ public PaymentApi getPaymentApi() {
return api;
}
}
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 18ca713..744a571 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
@@ -28,21 +28,21 @@ import javax.inject.Provider;
import org.killbill.automaton.DefaultStateMachineConfig;
import org.killbill.automaton.StateMachineConfig;
import org.killbill.billing.osgi.api.OSGIServiceRegistration;
-import org.killbill.billing.payment.api.DefaultDirectPaymentApi;
+import org.killbill.billing.payment.api.DefaultPaymentApi;
import org.killbill.billing.payment.api.DefaultPaymentGatewayApi;
-import org.killbill.billing.payment.api.DirectPaymentApi;
+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.core.DirectPaymentProcessor;
+import org.killbill.billing.payment.core.PaymentProcessor;
import org.killbill.billing.payment.core.Janitor;
import org.killbill.billing.payment.core.PaymentGatewayProcessor;
import org.killbill.billing.payment.core.PaymentMethodProcessor;
import org.killbill.billing.payment.core.PluginControlledPaymentProcessor;
import org.killbill.billing.payment.core.sm.PaymentStateMachineHelper;
-import org.killbill.billing.payment.core.sm.PluginControlledDirectPaymentAutomatonRunner;
+import org.killbill.billing.payment.core.sm.PluginControlledPaymentAutomatonRunner;
import org.killbill.billing.payment.core.sm.RetryStateMachineHelper;
import org.killbill.billing.payment.dao.DefaultPaymentDao;
import org.killbill.billing.payment.dao.PaymentDao;
@@ -132,7 +132,7 @@ public class PaymentModule extends KillBillModule {
}
protected void installAutomatonRunner() {
- bind(PluginControlledDirectPaymentAutomatonRunner.class).asEagerSingleton();
+ bind(PluginControlledPaymentAutomatonRunner.class).asEagerSingleton();
}
protected void installProcessors(final PaymentConfig paymentConfig) {
@@ -146,7 +146,7 @@ public class PaymentModule extends KillBillModule {
}
});
bind(ExecutorService.class).annotatedWith(Names.named(PLUGIN_EXECUTOR_NAMED)).toInstance(pluginExecutorService);
- bind(DirectPaymentProcessor.class).asEagerSingleton();
+ bind(PaymentProcessor.class).asEagerSingleton();
bind(PluginControlledPaymentProcessor.class).asEagerSingleton();
bind(PaymentGatewayProcessor.class).asEagerSingleton();
bind(PaymentMethodProcessor.class).asEagerSingleton();
@@ -161,7 +161,7 @@ public class PaymentModule extends KillBillModule {
bind(new TypeLiteral<OSGIServiceRegistration<PaymentPluginApi>>() {}).toProvider(DefaultPaymentProviderPluginRegistryProvider.class).asEagerSingleton();
bind(new TypeLiteral<OSGIServiceRegistration<PaymentControlPluginApi>>() {}).toProvider(DefaultPaymentControlProviderPluginRegistryProvider.class).asEagerSingleton();
- bind(DirectPaymentApi.class).to(DefaultDirectPaymentApi.class).asEagerSingleton();
+ bind(PaymentApi.class).to(DefaultPaymentApi.class).asEagerSingleton();
bind(PaymentGatewayApi.class).to(DefaultPaymentGatewayApi.class).asEagerSingleton();
bind(InvoiceHandler.class).asEagerSingleton();
bind(PaymentTagHandler.class).asEagerSingleton();
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 f47842b..578c76b 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
@@ -77,7 +77,7 @@ public class TestPaymentApi extends PaymentTestSuiteWithEmbeddedDB {
final String paymentExternalKey = "bwwrr";
final String transactionExternalKey = "krapaut";
- final DirectPayment payment = paymentApi.createPurchase(account, account.getPaymentMethodId(), null, requestedAmount, Currency.AED, paymentExternalKey, transactionExternalKey,
+ final Payment payment = paymentApi.createPurchase(account, account.getPaymentMethodId(), null, requestedAmount, Currency.AED, paymentExternalKey, transactionExternalKey,
ImmutableList.<PluginProperty>of(), callContext);
assertEquals(payment.getExternalKey(), paymentExternalKey);
@@ -91,7 +91,7 @@ public class TestPaymentApi extends PaymentTestSuiteWithEmbeddedDB {
assertEquals(payment.getTransactions().size(), 1);
assertEquals(payment.getTransactions().get(0).getExternalKey(), transactionExternalKey);
- assertEquals(payment.getTransactions().get(0).getDirectPaymentId(), payment.getId());
+ assertEquals(payment.getTransactions().get(0).getPaymentId(), payment.getId());
assertEquals(payment.getTransactions().get(0).getAmount().compareTo(requestedAmount), 0);
assertEquals(payment.getTransactions().get(0).getCurrency(), Currency.AED);
assertEquals(payment.getTransactions().get(0).getProcessedAmount().compareTo(requestedAmount), 0);
@@ -113,7 +113,7 @@ public class TestPaymentApi extends PaymentTestSuiteWithEmbeddedDB {
final String transactionExternalKey = "kaput";
final String transactionExternalKey2 = "kapu2t";
- final DirectPayment payment = paymentApi.createAuthorization(account, account.getPaymentMethodId(), null, authAmount, Currency.AED, paymentExternalKey, transactionExternalKey,
+ final Payment payment = paymentApi.createAuthorization(account, account.getPaymentMethodId(), null, authAmount, Currency.AED, paymentExternalKey, transactionExternalKey,
ImmutableList.<PluginProperty>of(), callContext);
assertEquals(payment.getExternalKey(), paymentExternalKey);
@@ -127,7 +127,7 @@ public class TestPaymentApi extends PaymentTestSuiteWithEmbeddedDB {
assertEquals(payment.getTransactions().size(), 1);
assertEquals(payment.getTransactions().get(0).getExternalKey(), transactionExternalKey);
- assertEquals(payment.getTransactions().get(0).getDirectPaymentId(), payment.getId());
+ assertEquals(payment.getTransactions().get(0).getPaymentId(), payment.getId());
assertEquals(payment.getTransactions().get(0).getAmount().compareTo(authAmount), 0);
assertEquals(payment.getTransactions().get(0).getCurrency(), Currency.AED);
assertEquals(payment.getTransactions().get(0).getProcessedAmount().compareTo(authAmount), 0);
@@ -138,7 +138,7 @@ public class TestPaymentApi extends PaymentTestSuiteWithEmbeddedDB {
assertNull(payment.getTransactions().get(0).getGatewayErrorMsg());
assertNull(payment.getTransactions().get(0).getGatewayErrorCode());
- final DirectPayment payment2 = paymentApi.createCapture(account, payment.getId(), captureAmount, Currency.AED, transactionExternalKey2,
+ final Payment payment2 = paymentApi.createCapture(account, payment.getId(), captureAmount, Currency.AED, transactionExternalKey2,
ImmutableList.<PluginProperty>of(), callContext);
assertEquals(payment2.getExternalKey(), paymentExternalKey);
@@ -152,7 +152,7 @@ public class TestPaymentApi extends PaymentTestSuiteWithEmbeddedDB {
assertEquals(payment2.getTransactions().size(), 2);
assertEquals(payment2.getTransactions().get(1).getExternalKey(), transactionExternalKey2);
- assertEquals(payment2.getTransactions().get(1).getDirectPaymentId(), payment.getId());
+ assertEquals(payment2.getTransactions().get(1).getPaymentId(), payment.getId());
assertEquals(payment2.getTransactions().get(1).getAmount().compareTo(captureAmount), 0);
assertEquals(payment2.getTransactions().get(1).getCurrency(), Currency.AED);
assertEquals(payment2.getTransactions().get(1).getProcessedAmount().compareTo(captureAmount), 0);
@@ -176,13 +176,13 @@ public class TestPaymentApi extends PaymentTestSuiteWithEmbeddedDB {
final String transactionExternalKey3 = "sioux3";
final String transactionExternalKey4 = "sioux4";
- final DirectPayment payment = paymentApi.createAuthorization(account, account.getPaymentMethodId(), null, authAmount, Currency.USD, paymentExternalKey, transactionExternalKey,
+ final Payment payment = paymentApi.createAuthorization(account, account.getPaymentMethodId(), null, authAmount, Currency.USD, paymentExternalKey, transactionExternalKey,
ImmutableList.<PluginProperty>of(), callContext);
paymentApi.createCapture(account, payment.getId(), captureAmount, Currency.USD, transactionExternalKey2,
ImmutableList.<PluginProperty>of(), callContext);
- final DirectPayment payment3 = paymentApi.createCapture(account, payment.getId(), captureAmount, Currency.USD, transactionExternalKey3,
+ final Payment payment3 = paymentApi.createCapture(account, payment.getId(), captureAmount, Currency.USD, transactionExternalKey3,
ImmutableList.<PluginProperty>of(), callContext);
assertEquals(payment3.getExternalKey(), paymentExternalKey);
@@ -195,7 +195,7 @@ public class TestPaymentApi extends PaymentTestSuiteWithEmbeddedDB {
assertEquals(payment3.getCurrency(), Currency.USD);
assertEquals(payment3.getTransactions().size(), 3);
- final DirectPayment payment4 = paymentApi.createRefund(account, payment3.getId(), payment3.getCapturedAmount(), Currency.USD, transactionExternalKey4, ImmutableList.<PluginProperty>of(), callContext);
+ final Payment payment4 = paymentApi.createRefund(account, payment3.getId(), payment3.getCapturedAmount(), Currency.USD, transactionExternalKey4, ImmutableList.<PluginProperty>of(), callContext);
assertEquals(payment4.getAuthAmount().compareTo(authAmount), 0);
assertEquals(payment4.getCapturedAmount().compareTo(captureAmount.add(captureAmount)), 0);
assertEquals(payment4.getPurchasedAmount().compareTo(BigDecimal.ZERO), 0);
@@ -203,7 +203,7 @@ public class TestPaymentApi extends PaymentTestSuiteWithEmbeddedDB {
assertEquals(payment4.getTransactions().size(), 4);
assertEquals(payment4.getTransactions().get(3).getExternalKey(), transactionExternalKey4);
- assertEquals(payment4.getTransactions().get(3).getDirectPaymentId(), payment.getId());
+ assertEquals(payment4.getTransactions().get(3).getPaymentId(), payment.getId());
assertEquals(payment4.getTransactions().get(3).getAmount().compareTo(payment3.getCapturedAmount()), 0);
assertEquals(payment4.getTransactions().get(3).getCurrency(), Currency.USD);
assertEquals(payment4.getTransactions().get(3).getProcessedAmount().compareTo(payment3.getCapturedAmount()), 0);
@@ -238,7 +238,7 @@ public class TestPaymentApi extends PaymentTestSuiteWithEmbeddedDB {
new BigDecimal("1.0"),
Currency.USD));
- final DirectPayment payment = paymentApi.createPurchaseWithPaymentControl(account, account.getPaymentMethodId(), null, requestedAmount, Currency.USD, paymentExternalKey, transactionExternalKey,
+ final Payment payment = paymentApi.createPurchaseWithPaymentControl(account, account.getPaymentMethodId(), null, requestedAmount, Currency.USD, paymentExternalKey, transactionExternalKey,
createPropertiesForInvoice(invoice), INVOICE_PAYMENT, callContext);
assertEquals(payment.getExternalKey(), paymentExternalKey);
@@ -252,7 +252,7 @@ public class TestPaymentApi extends PaymentTestSuiteWithEmbeddedDB {
assertEquals(payment.getTransactions().size(), 1);
assertEquals(payment.getTransactions().get(0).getExternalKey(), transactionExternalKey);
- assertEquals(payment.getTransactions().get(0).getDirectPaymentId(), payment.getId());
+ assertEquals(payment.getTransactions().get(0).getPaymentId(), payment.getId());
assertEquals(payment.getTransactions().get(0).getAmount().compareTo(requestedAmount), 0);
assertEquals(payment.getTransactions().get(0).getCurrency(), Currency.USD);
assertEquals(payment.getTransactions().get(0).getProcessedAmount().compareTo(requestedAmount), 0);
@@ -325,11 +325,11 @@ public class TestPaymentApi extends PaymentTestSuiteWithEmbeddedDB {
Currency.USD);
invoice.addInvoiceItem(invoiceItem);
- final DirectPayment payment = paymentApi.createPurchaseWithPaymentControl(account, account.getPaymentMethodId(), null, requestedAmount, Currency.USD, paymentExternalKey, transactionExternalKey,
+ final Payment payment = paymentApi.createPurchaseWithPaymentControl(account, account.getPaymentMethodId(), null, requestedAmount, Currency.USD, paymentExternalKey, transactionExternalKey,
createPropertiesForInvoice(invoice), INVOICE_PAYMENT, callContext);
final List<PluginProperty> refundProperties = ImmutableList.<PluginProperty>of();
- final DirectPayment payment2 = paymentApi.createRefundWithPaymentControl(account, payment.getId(), requestedAmount, Currency.USD, transactionExternalKey2,
+ final Payment payment2 = paymentApi.createRefundWithPaymentControl(account, payment.getId(), requestedAmount, Currency.USD, transactionExternalKey2,
refundProperties, INVOICE_PAYMENT, callContext);
assertEquals(payment2.getTransactions().size(), 2);
@@ -368,7 +368,7 @@ public class TestPaymentApi extends PaymentTestSuiteWithEmbeddedDB {
Currency.USD);
invoice.addInvoiceItem(invoiceItem);
- final DirectPayment payment = paymentApi.createPurchaseWithPaymentControl(account, account.getPaymentMethodId(), null, requestedAmount, Currency.USD, paymentExternalKey, transactionExternalKey,
+ final Payment payment = paymentApi.createPurchaseWithPaymentControl(account, account.getPaymentMethodId(), null, requestedAmount, Currency.USD, paymentExternalKey, transactionExternalKey,
createPropertiesForInvoice(invoice), INVOICE_PAYMENT, callContext);
final List<PluginProperty> refundProperties = ImmutableList.<PluginProperty>of();
@@ -406,7 +406,7 @@ public class TestPaymentApi extends PaymentTestSuiteWithEmbeddedDB {
Currency.USD);
invoice.addInvoiceItem(invoiceItem);
- final DirectPayment payment = paymentApi.createPurchaseWithPaymentControl(account, account.getPaymentMethodId(), null, requestedAmount, Currency.USD, paymentExternalKey, transactionExternalKey,
+ final Payment payment = paymentApi.createPurchaseWithPaymentControl(account, account.getPaymentMethodId(), null, requestedAmount, Currency.USD, paymentExternalKey, transactionExternalKey,
createPropertiesForInvoice(invoice), INVOICE_PAYMENT, callContext);
final List<PluginProperty> refundProperties = new ArrayList<PluginProperty>();
@@ -415,7 +415,7 @@ public class TestPaymentApi extends PaymentTestSuiteWithEmbeddedDB {
final PluginProperty refundIdsProp = new PluginProperty(InvoicePaymentControlPluginApi.PROP_IPCD_REFUND_IDS_WITH_AMOUNT_KEY, uuidBigDecimalHashMap, false);
refundProperties.add(refundIdsProp);
- final DirectPayment payment2 = paymentApi.createRefundWithPaymentControl(account, payment.getId(), null, Currency.USD, transactionExternalKey2,
+ final Payment payment2 = paymentApi.createRefundWithPaymentControl(account, payment.getId(), null, Currency.USD, transactionExternalKey2,
refundProperties, INVOICE_PAYMENT, callContext);
assertEquals(payment2.getTransactions().size(), 2);
@@ -437,11 +437,11 @@ public class TestPaymentApi extends PaymentTestSuiteWithEmbeddedDB {
final String transactionExternalKey = "couac";
final String transactionExternalKey2 = "couyc";
- final DirectPayment payment = paymentApi.createPurchase(account, account.getPaymentMethodId(), null, requestedAmount, Currency.AED, paymentExternalKey, transactionExternalKey,
+ final Payment payment = paymentApi.createPurchase(account, account.getPaymentMethodId(), null, requestedAmount, Currency.AED, paymentExternalKey, transactionExternalKey,
ImmutableList.<PluginProperty>of(), callContext);
paymentApi.createChargeback(account, payment.getId(), requestedAmount, Currency.AED, transactionExternalKey2, callContext);
- final DirectPayment payment2 = paymentApi.getPayment(payment.getId(), false, ImmutableList.<PluginProperty>of(), callContext);
+ final Payment payment2 = paymentApi.getPayment(payment.getId(), false, ImmutableList.<PluginProperty>of(), callContext);
assertEquals(payment2.getExternalKey(), paymentExternalKey);
assertEquals(payment2.getPaymentMethodId(), account.getPaymentMethodId());
@@ -454,7 +454,7 @@ public class TestPaymentApi extends PaymentTestSuiteWithEmbeddedDB {
assertEquals(payment2.getTransactions().size(), 2);
assertEquals(payment2.getTransactions().get(1).getExternalKey(), transactionExternalKey2);
- assertEquals(payment2.getTransactions().get(1).getDirectPaymentId(), payment.getId());
+ assertEquals(payment2.getTransactions().get(1).getPaymentId(), payment.getId());
assertEquals(payment2.getTransactions().get(1).getAmount().compareTo(requestedAmount), 0);
assertEquals(payment2.getTransactions().get(1).getCurrency(), Currency.AED);
@@ -510,7 +510,7 @@ public class TestPaymentApi extends PaymentTestSuiteWithEmbeddedDB {
public void testSimpleAuthCaptureWithInvalidPaymentId() throws Exception {
final BigDecimal requestedAmount = new BigDecimal("80.0091");
- final DirectPayment initialPayment = paymentApi.createAuthorization(account, account.getPaymentMethodId(), null, requestedAmount, account.getCurrency(),
+ final Payment initialPayment = paymentApi.createAuthorization(account, account.getPaymentMethodId(), null, requestedAmount, account.getCurrency(),
UUID.randomUUID().toString(), UUID.randomUUID().toString(), ImmutableList.<PluginProperty>of(), callContext);
@@ -520,7 +520,7 @@ public class TestPaymentApi extends PaymentTestSuiteWithEmbeddedDB {
} catch (PaymentApiException e) {
Assert.assertEquals(e.getCode(), ErrorCode.PAYMENT_NO_SUCH_PAYMENT.getCode());
- final DirectPayment latestPayment = paymentApi.getPayment(initialPayment.getId(), false, ImmutableList.<PluginProperty>of(), callContext);
+ final Payment latestPayment = paymentApi.getPayment(initialPayment.getId(), false, ImmutableList.<PluginProperty>of(), callContext);
assertEquals(latestPayment, initialPayment);
}
}
@@ -530,7 +530,7 @@ public class TestPaymentApi extends PaymentTestSuiteWithEmbeddedDB {
public void testSimpleAuthCaptureWithInvalidCurrency() throws Exception {
final BigDecimal requestedAmount = new BigDecimal("80.0091");
- final DirectPayment initialPayment = paymentApi.createAuthorization(account, account.getPaymentMethodId(), null, requestedAmount, account.getCurrency(),
+ final Payment initialPayment = paymentApi.createAuthorization(account, account.getPaymentMethodId(), null, requestedAmount, account.getCurrency(),
UUID.randomUUID().toString(), UUID.randomUUID().toString(), ImmutableList.<PluginProperty>of(), callContext);
@@ -540,7 +540,7 @@ public class TestPaymentApi extends PaymentTestSuiteWithEmbeddedDB {
} catch (PaymentApiException e) {
Assert.assertEquals(e.getCode(), ErrorCode.PAYMENT_INVALID_PARAMETER.getCode());
- final DirectPayment latestPayment = paymentApi.getPayment(initialPayment.getId(), false, ImmutableList.<PluginProperty>of(), callContext);
+ final Payment latestPayment = paymentApi.getPayment(initialPayment.getId(), false, ImmutableList.<PluginProperty>of(), callContext);
assertEquals(latestPayment, initialPayment);
}
}
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 38f777e..22454ae 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
@@ -136,7 +136,7 @@ public class TestPaymentApiNoDB extends PaymentTestSuiteNoDB {
final PluginProperty prop1 = new PluginProperty(InvoicePaymentControlPluginApi.PROP_IPCD_INVOICE_ID, invoice.getId().toString(), false);
properties.add(prop1);
- final DirectPayment paymentInfo = paymentApi.createPurchaseWithPaymentControl(account, account.getPaymentMethodId(), null, requestedAmount, account.getCurrency(),
+ final Payment paymentInfo = paymentApi.createPurchaseWithPaymentControl(account, account.getPaymentMethodId(), null, requestedAmount, account.getCurrency(),
invoice.getId().toString(), UUID.randomUUID().toString(), properties, PAYMENT_OPTIONS, callContext);
if (expectedAmount == null) {
fail("Expected to fail because requested amount > invoice amount");
@@ -148,7 +148,7 @@ public class TestPaymentApiNoDB extends PaymentTestSuiteNoDB {
assertEquals(paymentInfo.getCurrency(), Currency.USD);
assertTrue(paymentInfo.getTransactions().get(0).getAmount().compareTo(expectedAmount) == 0);
assertEquals(paymentInfo.getTransactions().get(0).getCurrency(), Currency.USD);
- assertEquals(paymentInfo.getTransactions().get(0).getDirectPaymentId(), paymentInfo.getId());
+ assertEquals(paymentInfo.getTransactions().get(0).getPaymentId(), paymentInfo.getId());
assertEquals(paymentInfo.getTransactions().get(0).getTransactionType(), TransactionType.PURCHASE);
assertEquals(paymentInfo.getTransactions().get(0).getTransactionStatus(), TransactionStatus.SUCCESS);
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 b9f59c3..efd2963 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
@@ -20,13 +20,13 @@ import java.util.Collections;
import org.killbill.automaton.OperationResult;
import org.killbill.billing.osgi.api.OSGIServiceRegistration;
-import org.killbill.billing.payment.api.DefaultDirectPayment;
-import org.killbill.billing.payment.api.DefaultDirectPaymentTransaction;
-import org.killbill.billing.payment.api.DirectPayment;
-import org.killbill.billing.payment.api.DirectPaymentTransaction;
+import org.killbill.billing.payment.api.DefaultPayment;
+import org.killbill.billing.payment.api.DefaultPaymentTransaction;
+import org.killbill.billing.payment.api.Payment;
+import org.killbill.billing.payment.api.PaymentTransaction;
import org.killbill.billing.payment.api.PaymentApiException;
import org.killbill.billing.payment.api.TransactionStatus;
-import org.killbill.billing.payment.core.DirectPaymentProcessor;
+import org.killbill.billing.payment.core.PaymentProcessor;
import org.killbill.billing.payment.dao.PaymentDao;
import org.killbill.billing.payment.dao.PaymentModelDao;
import org.killbill.billing.payment.dao.PaymentTransactionModelDao;
@@ -43,14 +43,14 @@ public class MockRetryAuthorizeOperationCallback extends RetryAuthorizeOperation
private Exception exception;
private OperationResult result;
- public MockRetryAuthorizeOperationCallback(final GlobalLocker locker, final PluginDispatcher<OperationResult> paymentPluginDispatcher, final RetryableDirectPaymentStateContext directPaymentStateContext, final DirectPaymentProcessor directPaymentProcessor, final OSGIServiceRegistration<PaymentControlPluginApi> retryPluginRegistry, final PaymentDao paymentDao, final Clock clock) {
- super(locker, paymentPluginDispatcher, directPaymentStateContext, directPaymentProcessor, retryPluginRegistry);
+ 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) {
+ super(locker, paymentPluginDispatcher, paymentStateContext, paymentProcessor, retryPluginRegistry);
this.paymentDao = paymentDao;
this.clock = clock;
}
@Override
- protected DirectPayment doCallSpecificOperationCallback() throws PaymentApiException {
+ protected Payment doCallSpecificOperationCallback() throws PaymentApiException {
if (exception != null) {
if (exception instanceof PaymentApiException) {
throw (PaymentApiException) exception;
@@ -60,25 +60,25 @@ public class MockRetryAuthorizeOperationCallback extends RetryAuthorizeOperation
}
final PaymentModelDao payment = new PaymentModelDao(clock.getUTCNow(),
clock.getUTCNow(),
- directPaymentStateContext.account.getId(),
- directPaymentStateContext.paymentMethodId,
- directPaymentStateContext.directPaymentExternalKey);
+ paymentStateContext.account.getId(),
+ paymentStateContext.paymentMethodId,
+ paymentStateContext.paymentExternalKey);
final PaymentTransactionModelDao transaction = new PaymentTransactionModelDao(clock.getUTCNow(),
clock.getUTCNow(),
- directPaymentStateContext.getAttemptId(),
- directPaymentStateContext.directPaymentTransactionExternalKey,
- directPaymentStateContext.directPaymentId,
- directPaymentStateContext.transactionType,
+ paymentStateContext.getAttemptId(),
+ paymentStateContext.paymentTransactionExternalKey,
+ paymentStateContext.paymentId,
+ paymentStateContext.transactionType,
clock.getUTCNow(),
TransactionStatus.SUCCESS,
- directPaymentStateContext.amount,
- directPaymentStateContext.currency,
+ paymentStateContext.amount,
+ paymentStateContext.currency,
"",
"");
- final PaymentModelDao paymentModelDao = paymentDao.insertDirectPaymentWithFirstTransaction(payment, transaction, directPaymentStateContext.internalCallContext);
- final DirectPaymentTransaction convertedTransaction = new DefaultDirectPaymentTransaction(transaction.getId(),
- directPaymentStateContext.getAttemptId(),
+ final PaymentModelDao paymentModelDao = paymentDao.insertPaymentWithFirstTransaction(payment, transaction, paymentStateContext.internalCallContext);
+ final PaymentTransaction convertedTransaction = new DefaultPaymentTransaction(transaction.getId(),
+ paymentStateContext.getAttemptId(),
transaction.getTransactionExternalKey(),
transaction.getCreatedDate(),
transaction.getUpdatedDate(),
@@ -94,7 +94,7 @@ public class MockRetryAuthorizeOperationCallback extends RetryAuthorizeOperation
transaction.getGatewayErrorMsg(),
null);
- return new DefaultDirectPayment(paymentModelDao.getId(), paymentModelDao.getCreatedDate(), paymentModelDao.getUpdatedDate(), paymentModelDao.getAccountId(),
+ return new DefaultPayment(paymentModelDao.getId(), paymentModelDao.getCreatedDate(), paymentModelDao.getUpdatedDate(), paymentModelDao.getAccountId(),
paymentModelDao.getPaymentMethodId(), paymentModelDao.getPaymentNumber(), paymentModelDao.getExternalKey(), Collections.singletonList(convertedTransaction));
}
diff --git a/payment/src/test/java/org/killbill/billing/payment/core/sm/TestPluginOperation.java b/payment/src/test/java/org/killbill/billing/payment/core/sm/TestPluginOperation.java
index d13f814..8af57a6 100644
--- a/payment/src/test/java/org/killbill/billing/payment/core/sm/TestPluginOperation.java
+++ b/payment/src/test/java/org/killbill/billing/payment/core/sm/TestPluginOperation.java
@@ -77,7 +77,7 @@ public class TestPluginOperation extends PaymentTestSuiteNoDB {
@Test(groups = "fast")
public void testOperationTimeout() throws Exception {
final CallbackTest callback = new CallbackTest(Integer.MAX_VALUE);
- final DirectPaymentOperation pluginOperation = getPluginOperation(false, 1);
+ final PaymentOperation pluginOperation = getPluginOperation(false, 1);
try {
pluginOperation.dispatchWithAccountLockAndTimeout(callback);
@@ -91,7 +91,7 @@ public class TestPluginOperation extends PaymentTestSuiteNoDB {
@Test(groups = "fast")
public void testOperationThrowsPaymentApiException() throws Exception {
final CallbackTest callback = new CallbackTest(new PaymentApiException(ErrorCode.__UNKNOWN_ERROR_CODE));
- final DirectPaymentOperation pluginOperation = getPluginOperation();
+ final PaymentOperation pluginOperation = getPluginOperation();
try {
pluginOperation.dispatchWithAccountLockAndTimeout(callback);
@@ -105,7 +105,7 @@ public class TestPluginOperation extends PaymentTestSuiteNoDB {
@Test(groups = "fast")
public void testOperationThrowsRuntimeException() throws Exception {
final CallbackTest callback = new CallbackTest(new NullPointerException("Expected for the test"));
- final DirectPaymentOperation pluginOperation = getPluginOperation();
+ final PaymentOperation pluginOperation = getPluginOperation();
try {
pluginOperation.dispatchWithAccountLockAndTimeout(callback);
@@ -119,7 +119,7 @@ public class TestPluginOperation extends PaymentTestSuiteNoDB {
private void testLocking(final boolean withAccountLock) throws Exception {
final Semaphore available = new Semaphore(1, true);
final CallbackTest callback = new CallbackTest(available);
- final DirectPaymentOperation pluginOperation = getPluginOperation(withAccountLock);
+ final PaymentOperation pluginOperation = getPluginOperation(withAccountLock);
// Take the only permit
available.acquire();
@@ -158,7 +158,7 @@ public class TestPluginOperation extends PaymentTestSuiteNoDB {
Assert.assertEquals(callback.getRunCount(), withAccountLock ? 1 : 2);
}
- private void runPluginOperationInBackground(final DirectPaymentOperation pluginOperation, final CallbackTest callback, final boolean shouldFailBecauseOfLockFailure) throws Exception {
+ private void runPluginOperationInBackground(final PaymentOperation pluginOperation, final CallbackTest callback, final boolean shouldFailBecauseOfLockFailure) throws Exception {
final AtomicBoolean threadStarted = new AtomicBoolean(false);
final Thread t1 = new Thread(new Runnable() {
@Override
@@ -190,18 +190,18 @@ public class TestPluginOperation extends PaymentTestSuiteNoDB {
Awaitility.await().untilTrue(threadStarted);
}
- private DirectPaymentOperation getPluginOperation() throws PaymentApiException {
+ private PaymentOperation getPluginOperation() throws PaymentApiException {
return getPluginOperation(false);
}
- private DirectPaymentOperation getPluginOperation(final boolean shouldLockAccount) throws PaymentApiException {
+ private PaymentOperation getPluginOperation(final boolean shouldLockAccount) throws PaymentApiException {
return getPluginOperation(shouldLockAccount, Integer.MAX_VALUE);
}
- private DirectPaymentOperation getPluginOperation(final boolean shouldLockAccount, final int timeoutSeconds) throws PaymentApiException {
+ private PaymentOperation getPluginOperation(final boolean shouldLockAccount, final int timeoutSeconds) throws PaymentApiException {
final PluginDispatcher<OperationResult> paymentPluginDispatcher = new PluginDispatcher<OperationResult>(timeoutSeconds, Executors.newCachedThreadPool());
- final DirectPaymentStateContext directPaymentStateContext = new DirectPaymentStateContext(UUID.randomUUID(),
+ final PaymentStateContext paymentStateContext = new PaymentStateContext(UUID.randomUUID(),
null,
UUID.randomUUID().toString(),
UUID.randomUUID().toString(),
@@ -215,9 +215,9 @@ public class TestPluginOperation extends PaymentTestSuiteNoDB {
internalCallContext,
callContext);
- final DirectPaymentAutomatonDAOHelper daoHelper = Mockito.mock(DirectPaymentAutomatonDAOHelper.class);
+ final PaymentAutomatonDAOHelper daoHelper = Mockito.mock(PaymentAutomatonDAOHelper.class);
Mockito.when(daoHelper.getPaymentProviderPlugin()).thenReturn(null);
- return new PluginOperationTest(daoHelper, locker, paymentPluginDispatcher, directPaymentStateContext);
+ return new PluginOperationTest(daoHelper, locker, paymentPluginDispatcher, paymentStateContext);
}
private static final class CallbackTest implements WithAccountLockCallback<OperationResult, PaymentApiException> {
@@ -288,10 +288,10 @@ public class TestPluginOperation extends PaymentTestSuiteNoDB {
}
}
- private static final class PluginOperationTest extends DirectPaymentOperation {
+ private static final class PluginOperationTest extends PaymentOperation {
- protected PluginOperationTest(final DirectPaymentAutomatonDAOHelper daoHelper, final GlobalLocker locker, final PluginDispatcher<OperationResult> paymentPluginDispatcher, final DirectPaymentStateContext directPaymentStateContext) throws PaymentApiException {
- super(daoHelper, locker, paymentPluginDispatcher, directPaymentStateContext);
+ protected PluginOperationTest(final PaymentAutomatonDAOHelper daoHelper, final GlobalLocker locker, final PluginDispatcher<OperationResult> paymentPluginDispatcher, final PaymentStateContext paymentStateContext) throws PaymentApiException {
+ super(daoHelper, locker, paymentPluginDispatcher, paymentStateContext);
}
@Override
diff --git a/payment/src/test/java/org/killbill/billing/payment/dao/MockPaymentDao.java b/payment/src/test/java/org/killbill/billing/payment/dao/MockPaymentDao.java
index 6c6946f..932beeb 100644
--- a/payment/src/test/java/org/killbill/billing/payment/dao/MockPaymentDao.java
+++ b/payment/src/test/java/org/killbill/billing/payment/dao/MockPaymentDao.java
@@ -121,7 +121,7 @@ public class MockPaymentDao implements PaymentDao {
}
@Override
- public List<PaymentTransactionModelDao> getDirectPaymentTransactionsByExternalKey(final String transactionExternalKey, final InternalTenantContext context) {
+ public List<PaymentTransactionModelDao> getPaymentTransactionsByExternalKey(final String transactionExternalKey, final InternalTenantContext context) {
final List<PaymentTransactionModelDao> result = new ArrayList<PaymentTransactionModelDao>();
synchronized (this) {
for (PaymentTransactionModelDao cur : transactions.values()) {
@@ -134,7 +134,7 @@ public class MockPaymentDao implements PaymentDao {
}
@Override
- public PaymentModelDao getDirectPaymentByExternalKey(final String externalKey, final InternalTenantContext context) {
+ public PaymentModelDao getPaymentByExternalKey(final String externalKey, final InternalTenantContext context) {
synchronized (this) {
for (PaymentModelDao cur : payments.values()) {
if (cur.getExternalKey().equals(externalKey)) {
@@ -146,35 +146,35 @@ public class MockPaymentDao implements PaymentDao {
}
@Override
- public Pagination<PaymentModelDao> getDirectPayments(final String pluginName, final Long offset, final Long limit, final InternalTenantContext context) {
+ public Pagination<PaymentModelDao> getPayments(final String pluginName, final Long offset, final Long limit, final InternalTenantContext context) {
return null;
}
@Override
- public PaymentModelDao insertDirectPaymentWithFirstTransaction(final PaymentModelDao directPayment, final PaymentTransactionModelDao directPaymentTransaction, final InternalCallContext context) {
+ public PaymentModelDao insertPaymentWithFirstTransaction(final PaymentModelDao payment, final PaymentTransactionModelDao paymentTransaction, final InternalCallContext context) {
synchronized (this) {
- payments.put(directPayment.getId(), directPayment);
- transactions.put(directPaymentTransaction.getId(), directPaymentTransaction);
+ payments.put(payment.getId(), payment);
+ transactions.put(paymentTransaction.getId(), paymentTransaction);
}
- return directPayment;
+ return payment;
}
@Override
- public PaymentTransactionModelDao updateDirectPaymentWithNewTransaction(final UUID directPaymentId, final PaymentTransactionModelDao directPaymentTransaction, final InternalCallContext context) {
+ public PaymentTransactionModelDao updatePaymentWithNewTransaction(final UUID paymentId, final PaymentTransactionModelDao paymentTransaction, final InternalCallContext context) {
synchronized (this) {
- transactions.put(directPaymentTransaction.getId(), directPaymentTransaction);
+ transactions.put(paymentTransaction.getId(), paymentTransaction);
}
- return directPaymentTransaction;
+ return paymentTransaction;
}
@Override
- public void updateDirectPaymentAndTransactionOnCompletion(final UUID directPaymentId, final String currentPaymentStateName, final String lastSuccessPaymentStateName, final UUID directTransactionId, final TransactionStatus paymentStatus, final BigDecimal processedAmount, final Currency processedCurrency, final String gatewayErrorCode, final String gatewayErrorMsg, final InternalCallContext context) {
+ public void updatePaymentAndTransactionOnCompletion(final UUID paymentId, final String currentPaymentStateName, final String lastSuccessPaymentStateName, final UUID transactionId, final TransactionStatus paymentStatus, final BigDecimal processedAmount, final Currency processedCurrency, final String gatewayErrorCode, final String gatewayErrorMsg, final InternalCallContext context) {
synchronized (this) {
- final PaymentModelDao payment = payments.get(directPaymentId);
+ final PaymentModelDao payment = payments.get(paymentId);
if (payment != null) {
payment.setStateName(currentPaymentStateName);
}
- final PaymentTransactionModelDao transaction = transactions.get(directTransactionId);
+ final PaymentTransactionModelDao transaction = transactions.get(transactionId);
if (transaction != null) {
transaction.setTransactionStatus(paymentStatus);
transaction.setProcessedAmount(processedAmount);
@@ -186,21 +186,21 @@ public class MockPaymentDao implements PaymentDao {
}
@Override
- public PaymentModelDao getDirectPayment(final UUID directPaymentId, final InternalTenantContext context) {
+ public PaymentModelDao getPayment(final UUID paymentId, final InternalTenantContext context) {
synchronized (this) {
- return payments.get(directPaymentId);
+ return payments.get(paymentId);
}
}
@Override
- public PaymentTransactionModelDao getDirectPaymentTransaction(final UUID directTransactionId, final InternalTenantContext context) {
+ public PaymentTransactionModelDao getPaymentTransaction(final UUID transactionId, final InternalTenantContext context) {
synchronized (this) {
- return transactions.get(directTransactionId);
+ return transactions.get(transactionId);
}
}
@Override
- public List<PaymentModelDao> getDirectPaymentsForAccount(final UUID accountId, final InternalTenantContext context) {
+ public List<PaymentModelDao> getPaymentsForAccount(final UUID accountId, final InternalTenantContext context) {
synchronized (this) {
return ImmutableList.copyOf(Iterables.filter(payments.values(), new Predicate<PaymentModelDao>() {
@Override
@@ -212,7 +212,7 @@ public class MockPaymentDao implements PaymentDao {
}
@Override
- public List<PaymentTransactionModelDao> getDirectTransactionsForAccount(final UUID accountId, final InternalTenantContext context) {
+ public List<PaymentTransactionModelDao> getTransactionsForAccount(final UUID accountId, final InternalTenantContext context) {
synchronized (this) {
return ImmutableList.copyOf(Iterables.filter(transactions.values(), new Predicate<PaymentTransactionModelDao>() {
@Override
@@ -229,12 +229,12 @@ public class MockPaymentDao implements PaymentDao {
}
@Override
- public List<PaymentTransactionModelDao> getDirectTransactionsForDirectPayment(final UUID directPaymentId, final InternalTenantContext context) {
+ public List<PaymentTransactionModelDao> getTransactionsForPayment(final UUID paymentId, final InternalTenantContext context) {
synchronized (this) {
return ImmutableList.copyOf(Iterables.filter(transactions.values(), new Predicate<PaymentTransactionModelDao>() {
@Override
public boolean apply(final PaymentTransactionModelDao input) {
- return input.getPaymentId().equals(directPaymentId);
+ return input.getPaymentId().equals(paymentId);
}
}));
}
diff --git a/payment/src/test/java/org/killbill/billing/payment/dao/TestDefaultPaymentDao.java b/payment/src/test/java/org/killbill/billing/payment/dao/TestDefaultPaymentDao.java
index 3036806..67434d6 100644
--- a/payment/src/test/java/org/killbill/billing/payment/dao/TestDefaultPaymentDao.java
+++ b/payment/src/test/java/org/killbill/billing/payment/dao/TestDefaultPaymentDao.java
@@ -32,39 +32,39 @@ import org.testng.annotations.Test;
public class TestDefaultPaymentDao extends PaymentTestSuiteWithEmbeddedDB {
@Test(groups = "slow")
- public void testDirectPaymentCRUD() throws Exception {
+ public void testPaymentCRUD() throws Exception {
for (int i = 0; i < 3; i++) {
- testDirectPaymentCRUDForAccount(UUID.randomUUID(), i + 1);
+ testPaymentCRUDForAccount(UUID.randomUUID(), i + 1);
}
}
- public void testDirectPaymentCRUDForAccount(final UUID accountId, final int accountNb) {
+ public void testPaymentCRUDForAccount(final UUID accountId, final int accountNb) {
// We need to create specific call contexts to make the account_record_id magic work
final InternalCallContext accountCallContext = new InternalCallContext(internalCallContext, (long) accountNb);
- final PaymentModelDao specifiedFirstPaymentModelDao = generateDirectPaymentModelDao(accountId);
- final PaymentTransactionModelDao specifiedFirstDirectPaymentTransactionModelDao = generateDirectPaymentTransactionModelDao(specifiedFirstPaymentModelDao.getId());
+ final PaymentModelDao specifiedFirstPaymentModelDao = generatePaymentModelDao(accountId);
+ final PaymentTransactionModelDao specifiedFirstPaymentTransactionModelDao = generatePaymentTransactionModelDao(specifiedFirstPaymentModelDao.getId());
// Create and verify the payment and transaction
- final PaymentModelDao firstPaymentModelDao = paymentDao.insertDirectPaymentWithFirstTransaction(specifiedFirstPaymentModelDao, specifiedFirstDirectPaymentTransactionModelDao, accountCallContext);
- verifyDirectPayment(firstPaymentModelDao, specifiedFirstPaymentModelDao);
- verifyDirectPaymentAndTransactions(accountCallContext, specifiedFirstPaymentModelDao, specifiedFirstDirectPaymentTransactionModelDao);
+ final PaymentModelDao firstPaymentModelDao = paymentDao.insertPaymentWithFirstTransaction(specifiedFirstPaymentModelDao, specifiedFirstPaymentTransactionModelDao, accountCallContext);
+ verifyPayment(firstPaymentModelDao, specifiedFirstPaymentModelDao);
+ verifyPaymentAndTransactions(accountCallContext, specifiedFirstPaymentModelDao, specifiedFirstPaymentTransactionModelDao);
// Create a second transaction for the same payment
- final PaymentTransactionModelDao specifiedSecondDirectPaymentTransactionModelDao = generateDirectPaymentTransactionModelDao(specifiedFirstPaymentModelDao.getId());
- final PaymentTransactionModelDao secondDirectTransactionModelDao = paymentDao.updateDirectPaymentWithNewTransaction(specifiedFirstDirectPaymentTransactionModelDao.getPaymentId(), specifiedSecondDirectPaymentTransactionModelDao, accountCallContext);
- verifyDirectPaymentTransaction(secondDirectTransactionModelDao, specifiedSecondDirectPaymentTransactionModelDao);
- verifyDirectPaymentAndTransactions(accountCallContext, specifiedFirstPaymentModelDao, specifiedFirstDirectPaymentTransactionModelDao, specifiedSecondDirectPaymentTransactionModelDao);
+ final PaymentTransactionModelDao specifiedSecondPaymentTransactionModelDao = generatePaymentTransactionModelDao(specifiedFirstPaymentModelDao.getId());
+ final PaymentTransactionModelDao secondTransactionModelDao = paymentDao.updatePaymentWithNewTransaction(specifiedFirstPaymentTransactionModelDao.getPaymentId(), specifiedSecondPaymentTransactionModelDao, accountCallContext);
+ verifyPaymentTransaction(secondTransactionModelDao, specifiedSecondPaymentTransactionModelDao);
+ verifyPaymentAndTransactions(accountCallContext, specifiedFirstPaymentModelDao, specifiedFirstPaymentTransactionModelDao, specifiedSecondPaymentTransactionModelDao);
// Update the latest transaction
final BigDecimal processedAmount = new BigDecimal("902341.23232");
final Currency processedCurrency = Currency.USD;
final String gatewayErrorCode = UUID.randomUUID().toString().substring(0, 5);
final String gatewayErrorMsg = UUID.randomUUID().toString();
- paymentDao.updateDirectPaymentAndTransactionOnCompletion(specifiedSecondDirectPaymentTransactionModelDao.getPaymentId(),
+ paymentDao.updatePaymentAndTransactionOnCompletion(specifiedSecondPaymentTransactionModelDao.getPaymentId(),
"SOME_ERRORED_STATE",
"SOME_ERRORED_STATE",
- specifiedSecondDirectPaymentTransactionModelDao.getId(),
+ specifiedSecondPaymentTransactionModelDao.getId(),
TransactionStatus.PAYMENT_FAILURE,
processedAmount,
processedCurrency,
@@ -72,59 +72,59 @@ public class TestDefaultPaymentDao extends PaymentTestSuiteWithEmbeddedDB {
gatewayErrorMsg,
accountCallContext);
- final PaymentTransactionModelDao updatedSecondDirectPaymentTransactionModelDao = paymentDao.getDirectPaymentTransaction(specifiedSecondDirectPaymentTransactionModelDao.getId(), accountCallContext);
- Assert.assertEquals(updatedSecondDirectPaymentTransactionModelDao.getTransactionStatus(), TransactionStatus.PAYMENT_FAILURE);
- Assert.assertEquals(updatedSecondDirectPaymentTransactionModelDao.getGatewayErrorMsg(), gatewayErrorMsg);
- Assert.assertEquals(updatedSecondDirectPaymentTransactionModelDao.getGatewayErrorMsg(), gatewayErrorMsg);
+ final PaymentTransactionModelDao updatedSecondPaymentTransactionModelDao = paymentDao.getPaymentTransaction(specifiedSecondPaymentTransactionModelDao.getId(), accountCallContext);
+ Assert.assertEquals(updatedSecondPaymentTransactionModelDao.getTransactionStatus(), TransactionStatus.PAYMENT_FAILURE);
+ Assert.assertEquals(updatedSecondPaymentTransactionModelDao.getGatewayErrorMsg(), gatewayErrorMsg);
+ Assert.assertEquals(updatedSecondPaymentTransactionModelDao.getGatewayErrorMsg(), gatewayErrorMsg);
// Create multiple payments for that account
for (int i = 0; i < 3; i++) {
- final PaymentModelDao paymentModelDao = generateDirectPaymentModelDao(accountId);
- final PaymentTransactionModelDao directPaymentTransactionModelDao = generateDirectPaymentTransactionModelDao(paymentModelDao.getId());
+ final PaymentModelDao paymentModelDao = generatePaymentModelDao(accountId);
+ final PaymentTransactionModelDao paymentTransactionModelDao = generatePaymentTransactionModelDao(paymentModelDao.getId());
- final PaymentModelDao insertedPaymentModelDao = paymentDao.insertDirectPaymentWithFirstTransaction(paymentModelDao, directPaymentTransactionModelDao, accountCallContext);
- verifyDirectPayment(insertedPaymentModelDao, paymentModelDao);
+ final PaymentModelDao insertedPaymentModelDao = paymentDao.insertPaymentWithFirstTransaction(paymentModelDao, paymentTransactionModelDao, accountCallContext);
+ verifyPayment(insertedPaymentModelDao, paymentModelDao);
}
- Assert.assertEquals(paymentDao.getDirectPaymentsForAccount(specifiedFirstPaymentModelDao.getAccountId(), accountCallContext).size(), 4);
+ Assert.assertEquals(paymentDao.getPaymentsForAccount(specifiedFirstPaymentModelDao.getAccountId(), accountCallContext).size(), 4);
}
- private void verifyDirectPaymentAndTransactions(final InternalCallContext accountCallContext, final PaymentModelDao specifiedFirstPaymentModelDao, final PaymentTransactionModelDao... specifiedFirstDirectPaymentTransactionModelDaos) {
- for (final PaymentTransactionModelDao specifiedFirstDirectPaymentTransactionModelDao : specifiedFirstDirectPaymentTransactionModelDaos) {
- final PaymentTransactionModelDao firstDirectTransactionModelDao = paymentDao.getDirectPaymentTransaction(specifiedFirstDirectPaymentTransactionModelDao.getId(), accountCallContext);
- verifyDirectPaymentTransaction(firstDirectTransactionModelDao, specifiedFirstDirectPaymentTransactionModelDao);
+ private void verifyPaymentAndTransactions(final InternalCallContext accountCallContext, final PaymentModelDao specifiedFirstPaymentModelDao, final PaymentTransactionModelDao... specifiedFirstPaymentTransactionModelDaos) {
+ for (final PaymentTransactionModelDao specifiedFirstPaymentTransactionModelDao : specifiedFirstPaymentTransactionModelDaos) {
+ final PaymentTransactionModelDao firstTransactionModelDao = paymentDao.getPaymentTransaction(specifiedFirstPaymentTransactionModelDao.getId(), accountCallContext);
+ verifyPaymentTransaction(firstTransactionModelDao, specifiedFirstPaymentTransactionModelDao);
}
// Retrieve the payment directly
- final PaymentModelDao secondPaymentModelDao = paymentDao.getDirectPayment(specifiedFirstPaymentModelDao.getId(), accountCallContext);
- verifyDirectPayment(secondPaymentModelDao, specifiedFirstPaymentModelDao);
+ final PaymentModelDao secondPaymentModelDao = paymentDao.getPayment(specifiedFirstPaymentModelDao.getId(), accountCallContext);
+ verifyPayment(secondPaymentModelDao, specifiedFirstPaymentModelDao);
// Retrieve the payments for the account
- final List<PaymentModelDao> paymentsForAccount = paymentDao.getDirectPaymentsForAccount(specifiedFirstPaymentModelDao.getAccountId(), accountCallContext);
+ final List<PaymentModelDao> paymentsForAccount = paymentDao.getPaymentsForAccount(specifiedFirstPaymentModelDao.getAccountId(), accountCallContext);
Assert.assertEquals(paymentsForAccount.size(), 1);
- verifyDirectPayment(paymentsForAccount.get(0), specifiedFirstPaymentModelDao);
+ verifyPayment(paymentsForAccount.get(0), specifiedFirstPaymentModelDao);
// Retrieve the transactions for the account
- final List<PaymentTransactionModelDao> transactionsForAccount = paymentDao.getDirectTransactionsForAccount(specifiedFirstPaymentModelDao.getAccountId(), accountCallContext);
- Assert.assertEquals(transactionsForAccount.size(), specifiedFirstDirectPaymentTransactionModelDaos.length);
- for (int i = 0; i < specifiedFirstDirectPaymentTransactionModelDaos.length; i++) {
- verifyDirectPaymentTransaction(transactionsForAccount.get(i), specifiedFirstDirectPaymentTransactionModelDaos[i]);
+ final List<PaymentTransactionModelDao> transactionsForAccount = paymentDao.getTransactionsForAccount(specifiedFirstPaymentModelDao.getAccountId(), accountCallContext);
+ Assert.assertEquals(transactionsForAccount.size(), specifiedFirstPaymentTransactionModelDaos.length);
+ for (int i = 0; i < specifiedFirstPaymentTransactionModelDaos.length; i++) {
+ verifyPaymentTransaction(transactionsForAccount.get(i), specifiedFirstPaymentTransactionModelDaos[i]);
}
// Retrieve the transactions for the payment
- final List<PaymentTransactionModelDao> transactionsForPayment = paymentDao.getDirectTransactionsForDirectPayment(specifiedFirstPaymentModelDao.getId(), accountCallContext);
- Assert.assertEquals(transactionsForPayment.size(), specifiedFirstDirectPaymentTransactionModelDaos.length);
- for (int i = 0; i < specifiedFirstDirectPaymentTransactionModelDaos.length; i++) {
- verifyDirectPaymentTransaction(transactionsForPayment.get(i), specifiedFirstDirectPaymentTransactionModelDaos[i]);
+ final List<PaymentTransactionModelDao> transactionsForPayment = paymentDao.getTransactionsForPayment(specifiedFirstPaymentModelDao.getId(), accountCallContext);
+ Assert.assertEquals(transactionsForPayment.size(), specifiedFirstPaymentTransactionModelDaos.length);
+ for (int i = 0; i < specifiedFirstPaymentTransactionModelDaos.length; i++) {
+ verifyPaymentTransaction(transactionsForPayment.get(i), specifiedFirstPaymentTransactionModelDaos[i]);
}
}
- private PaymentTransactionModelDao generateDirectPaymentTransactionModelDao(final UUID directPaymentId) {
+ private PaymentTransactionModelDao generatePaymentTransactionModelDao(final UUID paymentId) {
return new PaymentTransactionModelDao(UUID.randomUUID(),
null,
UUID.randomUUID().toString(),
clock.getUTCNow(),
clock.getUTCNow(),
- directPaymentId,
+ paymentId,
TransactionType.CAPTURE,
clock.getUTCNow(),
TransactionStatus.SUCCESS,
@@ -135,7 +135,7 @@ public class TestDefaultPaymentDao extends PaymentTestSuiteWithEmbeddedDB {
);
}
- private PaymentModelDao generateDirectPaymentModelDao(final UUID accountId) {
+ private PaymentModelDao generatePaymentModelDao(final UUID accountId) {
return new PaymentModelDao(UUID.randomUUID(),
clock.getUTCNow(),
clock.getUTCNow(),
@@ -146,22 +146,22 @@ public class TestDefaultPaymentDao extends PaymentTestSuiteWithEmbeddedDB {
);
}
- private void verifyDirectPayment(final PaymentModelDao loadedPaymentModelDao, final PaymentModelDao specifiedPaymentModelDao) {
+ private void verifyPayment(final PaymentModelDao loadedPaymentModelDao, final PaymentModelDao specifiedPaymentModelDao) {
Assert.assertEquals(loadedPaymentModelDao.getAccountId(), specifiedPaymentModelDao.getAccountId());
Assert.assertTrue(loadedPaymentModelDao.getPaymentNumber() > 0);
Assert.assertEquals(loadedPaymentModelDao.getPaymentMethodId(), specifiedPaymentModelDao.getPaymentMethodId());
Assert.assertEquals(loadedPaymentModelDao.getExternalKey(), specifiedPaymentModelDao.getExternalKey());
}
- private void verifyDirectPaymentTransaction(final PaymentTransactionModelDao loadedDirectPaymentTransactionModelDao, final PaymentTransactionModelDao specifiedDirectPaymentTransactionModelDao) {
- Assert.assertEquals(loadedDirectPaymentTransactionModelDao.getPaymentId(), specifiedDirectPaymentTransactionModelDao.getPaymentId());
- Assert.assertEquals(loadedDirectPaymentTransactionModelDao.getTransactionExternalKey(), specifiedDirectPaymentTransactionModelDao.getTransactionExternalKey());
- Assert.assertEquals(loadedDirectPaymentTransactionModelDao.getTransactionType(), specifiedDirectPaymentTransactionModelDao.getTransactionType());
- Assert.assertEquals(loadedDirectPaymentTransactionModelDao.getEffectiveDate().compareTo(specifiedDirectPaymentTransactionModelDao.getEffectiveDate()), 0);
- Assert.assertEquals(loadedDirectPaymentTransactionModelDao.getTransactionStatus(), specifiedDirectPaymentTransactionModelDao.getTransactionStatus());
- Assert.assertEquals(loadedDirectPaymentTransactionModelDao.getAmount().compareTo(specifiedDirectPaymentTransactionModelDao.getAmount()), 0);
- Assert.assertEquals(loadedDirectPaymentTransactionModelDao.getCurrency(), specifiedDirectPaymentTransactionModelDao.getCurrency());
- Assert.assertEquals(loadedDirectPaymentTransactionModelDao.getGatewayErrorCode(), specifiedDirectPaymentTransactionModelDao.getGatewayErrorCode());
- Assert.assertEquals(loadedDirectPaymentTransactionModelDao.getGatewayErrorMsg(), specifiedDirectPaymentTransactionModelDao.getGatewayErrorMsg());
+ private void verifyPaymentTransaction(final PaymentTransactionModelDao loadedPaymentTransactionModelDao, final PaymentTransactionModelDao specifiedPaymentTransactionModelDao) {
+ Assert.assertEquals(loadedPaymentTransactionModelDao.getPaymentId(), specifiedPaymentTransactionModelDao.getPaymentId());
+ Assert.assertEquals(loadedPaymentTransactionModelDao.getTransactionExternalKey(), specifiedPaymentTransactionModelDao.getTransactionExternalKey());
+ Assert.assertEquals(loadedPaymentTransactionModelDao.getTransactionType(), specifiedPaymentTransactionModelDao.getTransactionType());
+ Assert.assertEquals(loadedPaymentTransactionModelDao.getEffectiveDate().compareTo(specifiedPaymentTransactionModelDao.getEffectiveDate()), 0);
+ Assert.assertEquals(loadedPaymentTransactionModelDao.getTransactionStatus(), specifiedPaymentTransactionModelDao.getTransactionStatus());
+ Assert.assertEquals(loadedPaymentTransactionModelDao.getAmount().compareTo(specifiedPaymentTransactionModelDao.getAmount()), 0);
+ Assert.assertEquals(loadedPaymentTransactionModelDao.getCurrency(), specifiedPaymentTransactionModelDao.getCurrency());
+ Assert.assertEquals(loadedPaymentTransactionModelDao.getGatewayErrorCode(), specifiedPaymentTransactionModelDao.getGatewayErrorCode());
+ Assert.assertEquals(loadedPaymentTransactionModelDao.getGatewayErrorMsg(), specifiedPaymentTransactionModelDao.getGatewayErrorMsg());
}
}
diff --git a/payment/src/test/java/org/killbill/billing/payment/dao/TestPaymentDao.java b/payment/src/test/java/org/killbill/billing/payment/dao/TestPaymentDao.java
index 44b8be2..beff2d2 100644
--- a/payment/src/test/java/org/killbill/billing/payment/dao/TestPaymentDao.java
+++ b/payment/src/test/java/org/killbill/billing/payment/dao/TestPaymentDao.java
@@ -21,10 +21,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
-import javax.annotation.Nullable;
-
import org.joda.time.DateTime;
-import org.killbill.billing.GuicyKillbillTestSuite;
import org.killbill.billing.callcontext.InternalCallContext;
import org.killbill.billing.catalog.api.Currency;
import org.killbill.billing.payment.PaymentTestSuiteWithEmbeddedDB;
@@ -51,7 +48,7 @@ public class TestPaymentDao extends PaymentTestSuiteWithEmbeddedDB {
@Test(groups = "slow")
public void testPaymentAttempt() throws PluginPropertySerializerException {
- final UUID directTransactionId = UUID.randomUUID();
+ final UUID transactionId = UUID.randomUUID();
final String paymentExternalKey = "vraiment?";
final String transactionExternalKey = "tduteuqweq";
final String stateName = "INIT";
@@ -66,7 +63,7 @@ public class TestPaymentDao extends PaymentTestSuiteWithEmbeddedDB {
final byte[] serialized = PluginPropertySerializer.serialize(properties);
final PaymentAttemptModelDao attempt = new PaymentAttemptModelDao(UUID.randomUUID(), UUID.randomUUID(), clock.getUTCNow(), clock.getUTCNow(),
- paymentExternalKey, directTransactionId, transactionExternalKey, transactionType, stateName,
+ paymentExternalKey, transactionId, transactionExternalKey, transactionType, stateName,
BigDecimal.ZERO, Currency.ALL, pluginName, serialized);
PaymentAttemptModelDao savedAttempt = paymentDao.insertPaymentAttemptWithProperties(attempt, internalCallContext);
@@ -112,28 +109,28 @@ public class TestPaymentDao extends PaymentTestSuiteWithEmbeddedDB {
TransactionStatus.SUCCESS, BigDecimal.TEN, Currency.AED,
"success", "");
- final PaymentModelDao savedPayment = paymentDao.insertDirectPaymentWithFirstTransaction(paymentModelDao, transactionModelDao, internalCallContext);
+ final PaymentModelDao savedPayment = paymentDao.insertPaymentWithFirstTransaction(paymentModelDao, transactionModelDao, internalCallContext);
assertEquals(savedPayment.getId(), paymentModelDao.getId());
assertEquals(savedPayment.getAccountId(), paymentModelDao.getAccountId());
assertEquals(savedPayment.getExternalKey(), paymentModelDao.getExternalKey());
assertEquals(savedPayment.getPaymentMethodId(), paymentModelDao.getPaymentMethodId());
assertNull(savedPayment.getStateName());
- final PaymentModelDao savedPayment2 = paymentDao.getDirectPayment(savedPayment.getId(), internalCallContext);
+ final PaymentModelDao savedPayment2 = paymentDao.getPayment(savedPayment.getId(), internalCallContext);
assertEquals(savedPayment2.getId(), paymentModelDao.getId());
assertEquals(savedPayment2.getAccountId(), paymentModelDao.getAccountId());
assertEquals(savedPayment2.getExternalKey(), paymentModelDao.getExternalKey());
assertEquals(savedPayment2.getPaymentMethodId(), paymentModelDao.getPaymentMethodId());
assertNull(savedPayment2.getStateName());
- final PaymentModelDao savedPayment3 = paymentDao.getDirectPaymentByExternalKey(externalKey, internalCallContext);
+ final PaymentModelDao savedPayment3 = paymentDao.getPaymentByExternalKey(externalKey, internalCallContext);
assertEquals(savedPayment3.getId(), paymentModelDao.getId());
assertEquals(savedPayment3.getAccountId(), paymentModelDao.getAccountId());
assertEquals(savedPayment3.getExternalKey(), paymentModelDao.getExternalKey());
assertEquals(savedPayment3.getPaymentMethodId(), paymentModelDao.getPaymentMethodId());
assertNull(savedPayment3.getStateName());
- final PaymentTransactionModelDao savedTransaction = paymentDao.getDirectPaymentTransaction(transactionModelDao.getId(), internalCallContext);
+ final PaymentTransactionModelDao savedTransaction = paymentDao.getPaymentTransaction(transactionModelDao.getId(), internalCallContext);
assertEquals(savedTransaction.getTransactionExternalKey(), transactionExternalKey);
assertEquals(savedTransaction.getPaymentId(), paymentModelDao.getId());
assertEquals(savedTransaction.getTransactionType(), TransactionType.AUTHORIZE);
@@ -141,7 +138,7 @@ public class TestPaymentDao extends PaymentTestSuiteWithEmbeddedDB {
assertEquals(savedTransaction.getAmount().compareTo(BigDecimal.TEN), 0);
assertEquals(savedTransaction.getCurrency(), Currency.AED);
- final List<PaymentTransactionModelDao> savedTransactions = paymentDao.getDirectPaymentTransactionsByExternalKey(transactionExternalKey, internalCallContext);
+ final List<PaymentTransactionModelDao> savedTransactions = paymentDao.getPaymentTransactionsByExternalKey(transactionExternalKey, internalCallContext);
assertEquals(savedTransactions.size(), 1);
final PaymentTransactionModelDao savedTransaction2 = savedTransactions.get(0);
assertEquals(savedTransaction2.getTransactionExternalKey(), transactionExternalKey);
@@ -156,7 +153,7 @@ public class TestPaymentDao extends PaymentTestSuiteWithEmbeddedDB {
TransactionStatus.UNKNOWN, BigDecimal.TEN, Currency.AED,
"success", "");
- final PaymentTransactionModelDao savedTransactionModelDao2 = paymentDao.updateDirectPaymentWithNewTransaction(savedPayment.getId(), transactionModelDao2, internalCallContext);
+ final PaymentTransactionModelDao savedTransactionModelDao2 = paymentDao.updatePaymentWithNewTransaction(savedPayment.getId(), transactionModelDao2, internalCallContext);
assertEquals(savedTransactionModelDao2.getTransactionExternalKey(), transactionExternalKey2);
assertEquals(savedTransactionModelDao2.getPaymentId(), paymentModelDao.getId());
assertEquals(savedTransactionModelDao2.getTransactionType(), TransactionType.AUTHORIZE);
@@ -164,13 +161,13 @@ public class TestPaymentDao extends PaymentTestSuiteWithEmbeddedDB {
assertEquals(savedTransactionModelDao2.getAmount().compareTo(BigDecimal.TEN), 0);
assertEquals(savedTransactionModelDao2.getCurrency(), Currency.AED);
- final List<PaymentTransactionModelDao> transactions = paymentDao.getDirectTransactionsForDirectPayment(savedPayment.getId(), internalCallContext);
+ final List<PaymentTransactionModelDao> transactions = paymentDao.getTransactionsForPayment(savedPayment.getId(), internalCallContext);
assertEquals(transactions.size(), 2);
- paymentDao.updateDirectPaymentAndTransactionOnCompletion(savedPayment.getId(), "AUTH_ABORTED", "AUTH_SUCCESS", transactionModelDao2.getId(), TransactionStatus.SUCCESS,
+ paymentDao.updatePaymentAndTransactionOnCompletion(savedPayment.getId(), "AUTH_ABORTED", "AUTH_SUCCESS", transactionModelDao2.getId(), TransactionStatus.SUCCESS,
BigDecimal.ONE, Currency.USD, null, "nothing", internalCallContext);
- final PaymentModelDao savedPayment4 = paymentDao.getDirectPayment(savedPayment.getId(), internalCallContext);
+ final PaymentModelDao savedPayment4 = paymentDao.getPayment(savedPayment.getId(), internalCallContext);
assertEquals(savedPayment4.getId(), paymentModelDao.getId());
assertEquals(savedPayment4.getAccountId(), paymentModelDao.getAccountId());
assertEquals(savedPayment4.getExternalKey(), paymentModelDao.getExternalKey());
@@ -178,7 +175,7 @@ public class TestPaymentDao extends PaymentTestSuiteWithEmbeddedDB {
assertEquals(savedPayment4.getStateName(), "AUTH_ABORTED");
assertEquals(savedPayment4.getLastSuccessStateName(), "AUTH_SUCCESS");
- final PaymentTransactionModelDao savedTransactionModelDao4 = paymentDao.getDirectPaymentTransaction(savedTransactionModelDao2.getId(), internalCallContext);
+ final PaymentTransactionModelDao savedTransactionModelDao4 = paymentDao.getPaymentTransaction(savedTransactionModelDao2.getId(), internalCallContext);
assertEquals(savedTransactionModelDao4.getTransactionExternalKey(), transactionExternalKey2);
assertEquals(savedTransactionModelDao4.getPaymentId(), paymentModelDao.getId());
assertEquals(savedTransactionModelDao4.getTransactionType(), TransactionType.AUTHORIZE);
@@ -190,26 +187,26 @@ public class TestPaymentDao extends PaymentTestSuiteWithEmbeddedDB {
assertNull(savedTransactionModelDao4.getGatewayErrorCode());
assertEquals(savedTransactionModelDao4.getGatewayErrorMsg(), "nothing");
- paymentDao.updateDirectPaymentAndTransactionOnCompletion(savedPayment.getId(), "AUTH_ABORTED", null, transactionModelDao2.getId(), TransactionStatus.SUCCESS,
+ paymentDao.updatePaymentAndTransactionOnCompletion(savedPayment.getId(), "AUTH_ABORTED", null, transactionModelDao2.getId(), TransactionStatus.SUCCESS,
BigDecimal.ONE, Currency.USD, null, "nothing", internalCallContext);
- final PaymentModelDao savedPayment4Again = paymentDao.getDirectPayment(savedPayment.getId(), internalCallContext);
+ final PaymentModelDao savedPayment4Again = paymentDao.getPayment(savedPayment.getId(), internalCallContext);
assertEquals(savedPayment4Again.getId(), paymentModelDao.getId());
assertEquals(savedPayment4Again.getStateName(), "AUTH_ABORTED");
assertEquals(savedPayment4Again.getLastSuccessStateName(), "AUTH_SUCCESS");
- paymentDao.updateDirectPaymentAndTransactionOnCompletion(savedPayment.getId(), "AUTH_ABORTED", "AUTH_SUCCESS", transactionModelDao2.getId(), TransactionStatus.SUCCESS,
+ paymentDao.updatePaymentAndTransactionOnCompletion(savedPayment.getId(), "AUTH_ABORTED", "AUTH_SUCCESS", transactionModelDao2.getId(), TransactionStatus.SUCCESS,
BigDecimal.ONE, Currency.USD, null, "nothing", internalCallContext);
- final PaymentModelDao savedPayment4Final = paymentDao.getDirectPayment(savedPayment.getId(), internalCallContext);
+ final PaymentModelDao savedPayment4Final = paymentDao.getPayment(savedPayment.getId(), internalCallContext);
assertEquals(savedPayment4Final.getId(), paymentModelDao.getId());
assertEquals(savedPayment4Final.getStateName(), "AUTH_ABORTED");
assertEquals(savedPayment4Final.getLastSuccessStateName(), "AUTH_SUCCESS");
- final List<PaymentModelDao> payments = paymentDao.getDirectPaymentsForAccount(accountId, internalCallContext);
+ final List<PaymentModelDao> payments = paymentDao.getPaymentsForAccount(accountId, internalCallContext);
assertEquals(payments.size(), 1);
- final List<PaymentTransactionModelDao> transactions2 = paymentDao.getDirectTransactionsForAccount(accountId, internalCallContext);
+ final List<PaymentTransactionModelDao> transactions2 = paymentDao.getTransactionsForAccount(accountId, internalCallContext);
assertEquals(transactions2.size(), 2);
}
@@ -270,20 +267,20 @@ public class TestPaymentDao extends PaymentTestSuiteWithEmbeddedDB {
TransactionStatus.PENDING, BigDecimal.TEN, Currency.AED,
"pending", "");
- paymentDao.insertDirectPaymentWithFirstTransaction(paymentModelDao, transaction1, internalCallContext);
+ paymentDao.insertPaymentWithFirstTransaction(paymentModelDao, transaction1, internalCallContext);
final PaymentTransactionModelDao transaction2 = new PaymentTransactionModelDao(initialTime, initialTime, null, transactionExternalKey2,
paymentModelDao.getId(), TransactionType.AUTHORIZE, initialTime,
TransactionStatus.PENDING, BigDecimal.TEN, Currency.AED,
"pending", "");
- paymentDao.updateDirectPaymentWithNewTransaction(paymentModelDao.getId(), transaction2, internalCallContext);
+ paymentDao.updatePaymentWithNewTransaction(paymentModelDao.getId(), transaction2, internalCallContext);
final PaymentTransactionModelDao transaction3 = new PaymentTransactionModelDao(initialTime, initialTime, null, transactionExternalKey3,
paymentModelDao.getId(), TransactionType.AUTHORIZE, initialTime,
TransactionStatus.SUCCESS, BigDecimal.TEN, Currency.AED,
"success", "");
- paymentDao.updateDirectPaymentWithNewTransaction(paymentModelDao.getId(), transaction3, internalCallContext);
+ paymentDao.updatePaymentWithNewTransaction(paymentModelDao.getId(), transaction3, internalCallContext);
clock.addDays(1);
final DateTime newTime = clock.getUTCNow();
@@ -298,7 +295,7 @@ public class TestPaymentDao extends PaymentTestSuiteWithEmbeddedDB {
paymentModelDao.getId(), TransactionType.AUTHORIZE, newTime,
TransactionStatus.PENDING, BigDecimal.TEN, Currency.AED,
"pending", "");
- paymentDao.updateDirectPaymentWithNewTransaction(paymentModelDao.getId(), transaction4, internalCallContextWithNewTime);
+ paymentDao.updatePaymentWithNewTransaction(paymentModelDao.getId(), transaction4, internalCallContextWithNewTime);
final List<PaymentTransactionModelDao> result = getPendingTransactions(paymentModelDao.getId());
@@ -321,7 +318,7 @@ public class TestPaymentDao extends PaymentTestSuiteWithEmbeddedDB {
}
private List<PaymentTransactionModelDao> getPendingTransactions(final UUID paymentId) {
- final List<PaymentTransactionModelDao> total = paymentDao.getDirectTransactionsForDirectPayment(paymentId, internalCallContext);
+ final List<PaymentTransactionModelDao> total = paymentDao.getTransactionsForPayment(paymentId, internalCallContext);
return ImmutableList.copyOf(Iterables.filter(total, new Predicate<PaymentTransactionModelDao>() {
@Override
public boolean apply(final PaymentTransactionModelDao input) {
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 3cf0024..0920123 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
@@ -20,8 +20,8 @@ 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.MockRetryableDirectPaymentAutomatonRunner;
-import org.killbill.billing.payment.core.sm.PluginControlledDirectPaymentAutomatonRunner;
+import org.killbill.billing.payment.core.sm.MockRetryablePaymentAutomatonRunner;
+import org.killbill.billing.payment.core.sm.PluginControlledPaymentAutomatonRunner;
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(PluginControlledDirectPaymentAutomatonRunner.class).to(MockRetryableDirectPaymentAutomatonRunner.class).asEagerSingleton();
+ bind(PluginControlledPaymentAutomatonRunner.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 485d4d4..f80693e 100644
--- a/payment/src/test/java/org/killbill/billing/payment/PaymentTestSuiteNoDB.java
+++ b/payment/src/test/java/org/killbill/billing/payment/PaymentTestSuiteNoDB.java
@@ -22,12 +22,12 @@ import org.killbill.billing.GuicyKillbillTestSuiteNoDB;
import org.killbill.billing.account.api.AccountInternalApi;
import org.killbill.billing.invoice.api.InvoiceInternalApi;
import org.killbill.billing.osgi.api.OSGIServiceRegistration;
-import org.killbill.billing.payment.api.DirectPaymentApi;
-import org.killbill.billing.payment.core.DirectPaymentProcessor;
+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.sm.PaymentStateMachineHelper;
-import org.killbill.billing.payment.core.sm.PluginControlledDirectPaymentAutomatonRunner;
+import org.killbill.billing.payment.core.sm.PluginControlledPaymentAutomatonRunner;
import org.killbill.billing.payment.dao.PaymentDao;
import org.killbill.billing.payment.glue.TestPaymentModuleNoDB;
import org.killbill.billing.payment.plugin.api.PaymentPluginApi;
@@ -58,7 +58,7 @@ public abstract class PaymentTestSuiteNoDB extends GuicyKillbillTestSuiteNoDB {
@Inject
protected PersistentBus eventBus;
@Inject
- protected DirectPaymentApi paymentApi;
+ protected PaymentApi paymentApi;
@Inject
protected AccountInternalApi accountInternalApi;
@Inject
@@ -68,11 +68,11 @@ public abstract class PaymentTestSuiteNoDB extends GuicyKillbillTestSuiteNoDB {
@Inject
protected PaymentStateMachineHelper paymentSMHelper;
@Inject
- protected DirectPaymentProcessor paymentProcessor;
+ protected PaymentProcessor paymentProcessor;
@Inject
protected PluginControlledPaymentProcessor pluginControlledPaymentProcessor;
@Inject
- protected PluginControlledDirectPaymentAutomatonRunner retryableDirectPaymentAutomatonRunner;
+ protected PluginControlledPaymentAutomatonRunner retryablePaymentAutomatonRunner;
@Inject
protected DefaultRetryService retryService;
diff --git a/payment/src/test/java/org/killbill/billing/payment/PaymentTestSuiteWithEmbeddedDB.java b/payment/src/test/java/org/killbill/billing/payment/PaymentTestSuiteWithEmbeddedDB.java
index ad00182..0f78ff0 100644
--- a/payment/src/test/java/org/killbill/billing/payment/PaymentTestSuiteWithEmbeddedDB.java
+++ b/payment/src/test/java/org/killbill/billing/payment/PaymentTestSuiteWithEmbeddedDB.java
@@ -22,8 +22,8 @@ import org.killbill.billing.GuicyKillbillTestSuiteWithEmbeddedDB;
import org.killbill.billing.account.api.AccountInternalApi;
import org.killbill.billing.invoice.api.InvoiceInternalApi;
import org.killbill.billing.osgi.api.OSGIServiceRegistration;
-import org.killbill.billing.payment.api.DirectPaymentApi;
-import org.killbill.billing.payment.core.DirectPaymentProcessor;
+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.sm.PaymentStateMachineHelper;
import org.killbill.billing.payment.dao.PaymentDao;
@@ -49,7 +49,7 @@ public abstract class PaymentTestSuiteWithEmbeddedDB extends GuicyKillbillTestSu
@Inject
protected PaymentMethodProcessor paymentMethodProcessor;
@Inject
- protected DirectPaymentProcessor directPaymentProcessor;
+ protected PaymentProcessor paymentProcessor;
@Inject
protected InvoiceInternalApi invoiceApi;
@Inject
@@ -57,7 +57,7 @@ public abstract class PaymentTestSuiteWithEmbeddedDB extends GuicyKillbillTestSu
@Inject
protected PersistentBus eventBus;
@Inject
- protected DirectPaymentApi paymentApi;
+ protected PaymentApi paymentApi;
@Inject
protected AccountInternalApi accountApi;
@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 78ad763..39b5d50 100644
--- a/payment/src/test/java/org/killbill/billing/payment/TestJanitor.java
+++ b/payment/src/test/java/org/killbill/billing/payment/TestJanitor.java
@@ -29,8 +29,8 @@ import org.killbill.billing.catalog.api.Currency;
import org.killbill.billing.invoice.api.Invoice;
import org.killbill.billing.invoice.api.InvoiceApiException;
import org.killbill.billing.invoice.api.InvoiceItem;
-import org.killbill.billing.payment.api.DirectPayment;
-import org.killbill.billing.payment.api.DirectPaymentTransaction;
+import org.killbill.billing.payment.api.Payment;
+import org.killbill.billing.payment.api.PaymentTransaction;
import org.killbill.billing.payment.api.PaymentApiException;
import org.killbill.billing.payment.api.PaymentOptions;
import org.killbill.billing.payment.api.PluginProperty;
@@ -117,7 +117,7 @@ public class TestJanitor extends PaymentTestSuiteWithEmbeddedDB {
new BigDecimal("1.0"),
Currency.USD));
- final DirectPayment payment = paymentApi.createPurchaseWithPaymentControl(account, account.getPaymentMethodId(), null, requestedAmount, Currency.USD, paymentExternalKey, transactionExternalKey,
+ final Payment payment = paymentApi.createPurchaseWithPaymentControl(account, account.getPaymentMethodId(), null, requestedAmount, Currency.USD, paymentExternalKey, transactionExternalKey,
createPropertiesForInvoice(invoice), INVOICE_PAYMENT, callContext);
assertEquals(payment.getTransactions().size(), 1);
assertEquals(payment.getTransactions().get(0).getTransactionStatus(), TransactionStatus.SUCCESS);
@@ -166,7 +166,7 @@ public class TestJanitor extends PaymentTestSuiteWithEmbeddedDB {
Currency.USD);
invoice.addInvoiceItem(invoiceItem);
- final DirectPayment payment = paymentApi.createPurchaseWithPaymentControl(account, account.getPaymentMethodId(), null, requestedAmount, Currency.USD, paymentExternalKey, transactionExternalKey,
+ final Payment payment = paymentApi.createPurchaseWithPaymentControl(account, account.getPaymentMethodId(), null, requestedAmount, Currency.USD, paymentExternalKey, transactionExternalKey,
createPropertiesForInvoice(invoice), INVOICE_PAYMENT, callContext);
final List<PluginProperty> refundProperties = new ArrayList<PluginProperty>();
@@ -175,11 +175,11 @@ public class TestJanitor extends PaymentTestSuiteWithEmbeddedDB {
final PluginProperty refundIdsProp = new PluginProperty(InvoicePaymentControlPluginApi.PROP_IPCD_REFUND_IDS_WITH_AMOUNT_KEY, uuidBigDecimalHashMap, false);
refundProperties.add(refundIdsProp);
- final DirectPayment payment2 = paymentApi.createRefundWithPaymentControl(account, payment.getId(), null, Currency.USD, transactionExternalKey2,
+ final Payment payment2 = paymentApi.createRefundWithPaymentControl(account, payment.getId(), null, Currency.USD, transactionExternalKey2,
refundProperties, INVOICE_PAYMENT, callContext);
assertEquals(payment2.getTransactions().size(), 2);
- DirectPaymentTransaction refundTransaction = payment2.getTransactions().get(1);
+ PaymentTransaction refundTransaction = payment2.getTransactions().get(1);
assertEquals(refundTransaction.getTransactionType(), TransactionType.REFUND);
final List<PaymentAttemptModelDao> attempts = paymentDao.getPaymentAttempts(paymentExternalKey, internalCallContext);
diff --git a/payment/src/test/java/org/killbill/billing/payment/TestPaymentHelper.java b/payment/src/test/java/org/killbill/billing/payment/TestPaymentHelper.java
index cd6bd40..562a94d 100644
--- a/payment/src/test/java/org/killbill/billing/payment/TestPaymentHelper.java
+++ b/payment/src/test/java/org/killbill/billing/payment/TestPaymentHelper.java
@@ -31,7 +31,7 @@ import org.killbill.billing.invoice.api.Invoice;
import org.killbill.billing.invoice.api.InvoiceApiException;
import org.killbill.billing.invoice.api.InvoiceInternalApi;
import org.killbill.billing.invoice.api.InvoiceItem;
-import org.killbill.billing.payment.api.DirectPaymentApi;
+import org.killbill.billing.payment.api.PaymentApi;
import org.killbill.billing.payment.api.PaymentMethodPlugin;
import org.killbill.billing.payment.api.PluginProperty;
import org.killbill.billing.payment.provider.DefaultNoOpPaymentMethodPlugin;
@@ -49,7 +49,7 @@ public class TestPaymentHelper {
protected final AccountInternalApi AccountApi;
protected final InvoiceInternalApi invoiceApi;
- protected DirectPaymentApi paymentApi;
+ protected PaymentApi paymentApi;
private final PersistentBus eventBus;
private final Clock clock;
@@ -57,7 +57,7 @@ public class TestPaymentHelper {
@Inject
public TestPaymentHelper(final AccountInternalApi AccountApi, final InvoiceInternalApi invoiceApi,
- final DirectPaymentApi paymentApi, final PersistentBus eventBus,
+ final PaymentApi paymentApi, final PersistentBus eventBus,
final Clock clock,
final CallContext context) {
this.eventBus = eventBus;
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 e40692f..9b9537e 100644
--- a/payment/src/test/java/org/killbill/billing/payment/TestRetryService.java
+++ b/payment/src/test/java/org/killbill/billing/payment/TestRetryService.java
@@ -25,13 +25,11 @@ import java.util.UUID;
import java.util.concurrent.Callable;
import java.util.concurrent.TimeoutException;
-import javax.annotation.Nullable;
-
import org.joda.time.LocalDate;
import org.killbill.billing.account.api.Account;
import org.killbill.billing.catalog.api.Currency;
import org.killbill.billing.invoice.api.Invoice;
-import org.killbill.billing.payment.api.DirectPayment;
+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;
@@ -84,8 +82,8 @@ public class TestRetryService extends PaymentTestSuiteNoDB {
retryService.stop();
}
- private DirectPayment getPaymentForExternalKey(final String externalKey) throws PaymentApiException {
- final DirectPayment payment = paymentProcessor.getPaymentByExternalKey(externalKey, false, ImmutableList.<PluginProperty>of(), callContext, internalCallContext);
+ private Payment getPaymentForExternalKey(final String externalKey) throws PaymentApiException {
+ final Payment payment = paymentProcessor.getPaymentByExternalKey(externalKey, false, ImmutableList.<PluginProperty>of(), callContext, internalCallContext);
return payment;
}
@@ -152,11 +150,11 @@ public class TestRetryService extends PaymentTestSuiteNoDB {
}
assertTrue(failed);
- DirectPayment payment = getPaymentForExternalKey(paymentExternalKey);
+ Payment payment = getPaymentForExternalKey(paymentExternalKey);
List<PaymentAttemptModelDao> attempts = paymentDao.getPaymentAttempts(paymentExternalKey, internalCallContext);
assertEquals(attempts.size(), 1);
- final List<PaymentTransactionModelDao> transactions = paymentDao.getDirectTransactionsForDirectPayment(payment.getId(), internalCallContext);
+ final List<PaymentTransactionModelDao> transactions = paymentDao.getTransactionsForPayment(payment.getId(), internalCallContext);
assertEquals(transactions.size(), 1);
diff --git a/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestAccountTimeline.java b/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestAccountTimeline.java
index 35d2e89..62dd8b9 100644
--- a/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestAccountTimeline.java
+++ b/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestAccountTimeline.java
@@ -124,18 +124,18 @@ public class TestAccountTimeline extends TestJaxrsBase {
final InvoicePayment payment = timeline.getPayments().get(0);
// Verify payments
- final List<PaymentTransaction> purchaseTransactions = getDirectPaymentTransactions(timeline.getPayments(), TransactionType.PURCHASE.toString());
+ final List<PaymentTransaction> purchaseTransactions = getPaymentTransactions(timeline.getPayments(), TransactionType.PURCHASE.toString());
Assert.assertEquals(purchaseTransactions.size(), 1);
final PaymentTransaction purchaseTransaction = purchaseTransactions.get(0);
// Verify refunds
- final List<PaymentTransaction> refundTransactions = getDirectPaymentTransactions(timeline.getPayments(), TransactionType.REFUND.toString());
+ final List<PaymentTransaction> refundTransactions = getPaymentTransactions(timeline.getPayments(), TransactionType.REFUND.toString());
Assert.assertEquals(refundTransactions.size(), 1);
final PaymentTransaction refundTransaction = refundTransactions.get(0);
Assert.assertEquals(refundTransaction.getPaymentId(), payment.getPaymentId());
Assert.assertEquals(refundTransaction.getAmount().compareTo(refundAmount), 0);
- final List<PaymentTransaction> chargebackTransactions = getDirectPaymentTransactions(timeline.getPayments(), TransactionType.CHARGEBACK.toString());
+ final List<PaymentTransaction> chargebackTransactions = getPaymentTransactions(timeline.getPayments(), TransactionType.CHARGEBACK.toString());
Assert.assertEquals(chargebackTransactions.size(), 1);
final PaymentTransaction chargebackTransaction = chargebackTransactions.get(0);
Assert.assertEquals(chargebackTransaction.getPaymentId(), payment.getPaymentId());
diff --git a/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestChargeback.java b/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestChargeback.java
index d5929de..ab4fb28 100644
--- a/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestChargeback.java
+++ b/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestChargeback.java
@@ -74,7 +74,7 @@ public class TestChargeback extends TestJaxrsBase {
}
final List<InvoicePayment> payments = killBillClient.getInvoicePaymentsForAccount(payment.getAccountId());
- final List<PaymentTransaction> transactions = getDirectPaymentTransactions(payments, TransactionType.CHARGEBACK.toString());
+ final List<PaymentTransaction> transactions = getPaymentTransactions(payments, TransactionType.CHARGEBACK.toString());
Assert.assertEquals(transactions.size(), 5);
int found = 0;
for (final PaymentTransaction transaction : transactions) {
@@ -140,7 +140,7 @@ public class TestChargeback extends TestJaxrsBase {
@Test(groups = "slow", description = "Accounts can have zero chargeback")
public void testNoChargebackForAccount() throws Exception {
final List<InvoicePayment> payments = killBillClient.getInvoicePaymentsForAccount(UUID.randomUUID());
- final List<PaymentTransaction> transactions = getDirectPaymentTransactions(payments, TransactionType.CHARGEBACK.toString());
+ final List<PaymentTransaction> transactions = getPaymentTransactions(payments, TransactionType.CHARGEBACK.toString());
Assert.assertEquals(transactions.size(), 0);
}
@@ -151,7 +151,7 @@ public class TestChargeback extends TestJaxrsBase {
chargeback.setAmount(BigDecimal.TEN);
final InvoicePayment chargebackJson = killBillClient.createInvoicePaymentChargeback(chargeback, createdBy, reason, comment);
- final List<PaymentTransaction> chargebackTransactions = getDirectPaymentTransactions(ImmutableList.of(chargebackJson), TransactionType.CHARGEBACK.toString());
+ final List<PaymentTransaction> chargebackTransactions = getPaymentTransactions(ImmutableList.of(chargebackJson), TransactionType.CHARGEBACK.toString());
assertEquals(chargebackTransactions.size(), 1);
assertEquals(chargebackTransactions.get(0).getAmount().compareTo(chargeback.getAmount()), 0);
@@ -159,7 +159,7 @@ public class TestChargeback extends TestJaxrsBase {
// Find the chargeback by account
final List<InvoicePayment> payments = killBillClient.getInvoicePaymentsForAccount(payment.getAccountId());
- final List<PaymentTransaction> transactions = getDirectPaymentTransactions(payments, TransactionType.CHARGEBACK.toString());
+ final List<PaymentTransaction> transactions = getPaymentTransactions(payments, TransactionType.CHARGEBACK.toString());
Assert.assertEquals(transactions.size(), 1);
assertEquals(transactions.get(0).getAmount().compareTo(chargeback.getAmount()), 0);
assertEquals(transactions.get(0).getPaymentId(), chargeback.getPaymentId());
diff --git a/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestInvoicePayment.java b/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestInvoicePayment.java
index eae620e..880b81c 100644
--- a/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestInvoicePayment.java
+++ b/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestInvoicePayment.java
@@ -204,7 +204,7 @@ public class TestInvoicePayment extends TestJaxrsBase {
final InvoicePayments allPayments = killBillClient.getInvoicePaymentsForAccount(lastPayment.getAccountId());
Assert.assertEquals(allPayments.size(), 6);
- final List<PaymentTransaction> objRefundFromJson = getDirectPaymentTransactions(allPayments, TransactionType.REFUND.toString());
+ final List<PaymentTransaction> objRefundFromJson = getPaymentTransactions(allPayments, TransactionType.REFUND.toString());
Assert.assertEquals(objRefundFromJson.size(), 5);
Payments paymentsPage = killBillClient.getPayments(0L, 1L);
@@ -236,14 +236,14 @@ public class TestInvoicePayment extends TestJaxrsBase {
Assert.assertEquals(paymentMethodJson.getAccountId(), accountJson.getAccountId());
// Verify the refunds
- final List<PaymentTransaction> objRefundFromJson = getDirectPaymentTransactions(paymentsForAccount, TransactionType.REFUND.toString());
+ final List<PaymentTransaction> objRefundFromJson = getPaymentTransactions(paymentsForAccount, TransactionType.REFUND.toString());
Assert.assertEquals(objRefundFromJson.size(), 0);
return paymentJson;
}
private void verifyRefund(final InvoicePayment paymentJson, final Payment paymentAfterRefund, final BigDecimal refundAmount) throws KillBillClientException {
- final List<PaymentTransaction> transactions = getDirectPaymentTransactions(ImmutableList.of(paymentAfterRefund), TransactionType.REFUND.toString());
+ final List<PaymentTransaction> transactions = getPaymentTransactions(ImmutableList.of(paymentAfterRefund), TransactionType.REFUND.toString());
Assert.assertEquals(transactions.size(), 1);
final PaymentTransaction refund = transactions.get(0);
diff --git a/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestJaxrsBase.java b/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestJaxrsBase.java
index 3691d34..d1dfa5d 100644
--- a/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestJaxrsBase.java
+++ b/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestJaxrsBase.java
@@ -256,7 +256,7 @@ public class TestJaxrsBase extends KillbillClient {
}
}
- protected static <T extends Payment> List<PaymentTransaction> getDirectPaymentTransactions(final List<T> payments, final String transactionType) {
+ protected static <T extends Payment> List<PaymentTransaction> getPaymentTransactions(final List<T> payments, final String transactionType) {
return ImmutableList.copyOf(Iterables.concat(Iterables.transform(payments, new Function<T, Iterable<PaymentTransaction>>() {
@Override
public Iterable<PaymentTransaction> apply(final T input) {
diff --git a/util/src/main/java/org/killbill/billing/util/audit/DefaultAccountAuditLogs.java b/util/src/main/java/org/killbill/billing/util/audit/DefaultAccountAuditLogs.java
index f33064b..1871609 100644
--- a/util/src/main/java/org/killbill/billing/util/audit/DefaultAccountAuditLogs.java
+++ b/util/src/main/java/org/killbill/billing/util/audit/DefaultAccountAuditLogs.java
@@ -91,8 +91,8 @@ public class DefaultAccountAuditLogs implements AccountAuditLogs {
}
@Override
- public List<AuditLog> getAuditLogsForPaymentTransaction(final UUID directPaymentTransactionId) {
- return getAuditLogs(ObjectType.TRANSACTION).getAuditLogs(directPaymentTransactionId);
+ public List<AuditLog> getAuditLogsForPaymentTransaction(final UUID paymentTransactionId) {
+ return getAuditLogs(ObjectType.TRANSACTION).getAuditLogs(paymentTransactionId);
}
@Override
diff --git a/util/src/test/java/org/killbill/billing/mock/glue/MockPaymentModule.java b/util/src/test/java/org/killbill/billing/mock/glue/MockPaymentModule.java
index 645b8db..1175270 100644
--- a/util/src/test/java/org/killbill/billing/mock/glue/MockPaymentModule.java
+++ b/util/src/test/java/org/killbill/billing/mock/glue/MockPaymentModule.java
@@ -18,7 +18,7 @@
package org.killbill.billing.mock.glue;
-import org.killbill.billing.payment.api.DirectPaymentApi;
+import org.killbill.billing.payment.api.PaymentApi;
import org.killbill.billing.payment.api.PaymentInternalApi;
import org.killbill.billing.platform.api.KillbillConfigSource;
import org.killbill.billing.util.glue.KillBillModule;
@@ -32,7 +32,7 @@ public class MockPaymentModule extends KillBillModule {
@Override
protected void configure() {
- bind(DirectPaymentApi.class).toInstance(Mockito.mock(DirectPaymentApi.class));
+ bind(PaymentApi.class).toInstance(Mockito.mock(PaymentApi.class));
bind(PaymentInternalApi.class).toInstance(Mockito.mock(PaymentInternalApi.class));
}
}