killbill-aplcache

diff --git a/payment/src/main/java/org/killbill/billing/payment/core/sm/payments/AuthorizeOperation.java b/payment/src/main/java/org/killbill/billing/payment/core/sm/payments/AuthorizeOperation.java
index fdbe229..d8cf528 100644
--- a/payment/src/main/java/org/killbill/billing/payment/core/sm/payments/AuthorizeOperation.java
+++ b/payment/src/main/java/org/killbill/billing/payment/core/sm/payments/AuthorizeOperation.java
@@ -44,13 +44,13 @@ public class AuthorizeOperation extends PaymentOperation {
     @Override
     protected PaymentTransactionInfoPlugin doCallSpecificOperationCallback() throws PaymentPluginApiException {
         logger.debug("Starting AUTHORIZE for payment {} ({} {})", paymentStateContext.getPaymentId(), paymentStateContext.getAmount(), paymentStateContext.getCurrency());
-        return plugin.authorizePayment(paymentStateContext.getAccount().getId(),
-                                       paymentStateContext.getPaymentId(),
-                                       paymentStateContext.getTransactionId(),
-                                       paymentStateContext.getPaymentMethodId(),
-                                       paymentStateContext.getAmount(),
-                                       paymentStateContext.getCurrency(),
-                                       paymentStateContext.getProperties(),
-                                       paymentStateContext.getCallContext());
+        return paymentPluginApi.authorizePayment(paymentStateContext.getAccount().getId(),
+                                                 paymentStateContext.getPaymentId(),
+                                                 paymentStateContext.getTransactionId(),
+                                                 paymentStateContext.getPaymentMethodId(),
+                                                 paymentStateContext.getAmount(),
+                                                 paymentStateContext.getCurrency(),
+                                                 paymentStateContext.getProperties(),
+                                                 paymentStateContext.getCallContext());
     }
 }

diff --git a/payment/src/main/java/org/killbill/billing/payment/core/sm/payments/CaptureOperation.java b/payment/src/main/java/org/killbill/billing/payment/core/sm/payments/CaptureOperation.java
index cbafd42..6f4440d 100644
--- a/payment/src/main/java/org/killbill/billing/payment/core/sm/payments/CaptureOperation.java
+++ b/payment/src/main/java/org/killbill/billing/payment/core/sm/payments/CaptureOperation.java
@@ -44,13 +44,13 @@ public class CaptureOperation extends PaymentOperation {
     @Override
     protected PaymentTransactionInfoPlugin doCallSpecificOperationCallback() throws PaymentPluginApiException {
         logger.debug("Starting CAPTURE for payment {} ({} {})", paymentStateContext.getPaymentId(), paymentStateContext.getAmount(), paymentStateContext.getCurrency());
-        return plugin.capturePayment(paymentStateContext.getAccount().getId(),
-                                     paymentStateContext.getPaymentId(),
-                                     paymentStateContext.getTransactionId(),
-                                     paymentStateContext.getPaymentMethodId(),
-                                     paymentStateContext.getAmount(),
-                                     paymentStateContext.getCurrency(),
-                                     paymentStateContext.getProperties(),
-                                     paymentStateContext.getCallContext());
+        return paymentPluginApi.capturePayment(paymentStateContext.getAccount().getId(),
+                                               paymentStateContext.getPaymentId(),
+                                               paymentStateContext.getTransactionId(),
+                                               paymentStateContext.getPaymentMethodId(),
+                                               paymentStateContext.getAmount(),
+                                               paymentStateContext.getCurrency(),
+                                               paymentStateContext.getProperties(),
+                                               paymentStateContext.getCallContext());
     }
 }

diff --git a/payment/src/main/java/org/killbill/billing/payment/core/sm/payments/CreditOperation.java b/payment/src/main/java/org/killbill/billing/payment/core/sm/payments/CreditOperation.java
index 2d26268..f98908e 100644
--- a/payment/src/main/java/org/killbill/billing/payment/core/sm/payments/CreditOperation.java
+++ b/payment/src/main/java/org/killbill/billing/payment/core/sm/payments/CreditOperation.java
@@ -44,13 +44,13 @@ public class CreditOperation extends PaymentOperation {
     @Override
     protected PaymentTransactionInfoPlugin doCallSpecificOperationCallback() throws PaymentPluginApiException {
         logger.debug("Starting CREDIT for payment {} ({} {})", paymentStateContext.getPaymentId(), paymentStateContext.getAmount(), paymentStateContext.getCurrency());
-        return plugin.creditPayment(paymentStateContext.getAccount().getId(),
-                                    paymentStateContext.getPaymentId(),
-                                    paymentStateContext.getTransactionId(),
-                                    paymentStateContext.getPaymentMethodId(),
-                                    paymentStateContext.getAmount(),
-                                    paymentStateContext.getCurrency(),
-                                    paymentStateContext.getProperties(),
-                                    paymentStateContext.getCallContext());
+        return paymentPluginApi.creditPayment(paymentStateContext.getAccount().getId(),
+                                              paymentStateContext.getPaymentId(),
+                                              paymentStateContext.getTransactionId(),
+                                              paymentStateContext.getPaymentMethodId(),
+                                              paymentStateContext.getAmount(),
+                                              paymentStateContext.getCurrency(),
+                                              paymentStateContext.getProperties(),
+                                              paymentStateContext.getCallContext());
     }
 }

diff --git a/payment/src/main/java/org/killbill/billing/payment/core/sm/payments/PaymentOperation.java b/payment/src/main/java/org/killbill/billing/payment/core/sm/payments/PaymentOperation.java
index 1658720..cd77f0c 100644
--- a/payment/src/main/java/org/killbill/billing/payment/core/sm/payments/PaymentOperation.java
+++ b/payment/src/main/java/org/killbill/billing/payment/core/sm/payments/PaymentOperation.java
@@ -55,7 +55,7 @@ public abstract class PaymentOperation extends OperationCallbackBase<PaymentTran
     private final Logger logger = LoggerFactory.getLogger(PaymentOperation.class);
 
     protected final PaymentAutomatonDAOHelper daoHelper;
-    protected PaymentPluginApi plugin;
+    protected PaymentPluginApi paymentPluginApi;
 
     protected PaymentOperation(final GlobalLocker locker,
                                final PaymentAutomatonDAOHelper daoHelper,
@@ -69,7 +69,7 @@ public abstract class PaymentOperation extends OperationCallbackBase<PaymentTran
     @Override
     public OperationResult doOperationCallback() throws OperationException {
         try {
-            this.plugin = daoHelper.getPaymentPluginApi();
+            this.paymentPluginApi = daoHelper.getPaymentPluginApi();
         } catch (final PaymentApiException e) {
             throw convertToUnknownTransactionStatusAndErroredPaymentState(e);
         }

diff --git a/payment/src/main/java/org/killbill/billing/payment/core/sm/payments/PurchaseOperation.java b/payment/src/main/java/org/killbill/billing/payment/core/sm/payments/PurchaseOperation.java
index 7fab5e1..aff762f 100644
--- a/payment/src/main/java/org/killbill/billing/payment/core/sm/payments/PurchaseOperation.java
+++ b/payment/src/main/java/org/killbill/billing/payment/core/sm/payments/PurchaseOperation.java
@@ -44,13 +44,13 @@ public class PurchaseOperation extends PaymentOperation {
     @Override
     protected PaymentTransactionInfoPlugin doCallSpecificOperationCallback() throws PaymentPluginApiException {
         logger.debug("Starting PURCHASE for payment {} ({} {})", paymentStateContext.getPaymentId(), paymentStateContext.getAmount(), paymentStateContext.getCurrency());
-        return plugin.purchasePayment(paymentStateContext.getAccount().getId(),
-                                      paymentStateContext.getPaymentId(),
-                                      paymentStateContext.getTransactionId(),
-                                      paymentStateContext.getPaymentMethodId(),
-                                      paymentStateContext.getAmount(),
-                                      paymentStateContext.getCurrency(),
-                                      paymentStateContext.getProperties(),
-                                      paymentStateContext.getCallContext());
+        return paymentPluginApi.purchasePayment(paymentStateContext.getAccount().getId(),
+                                                paymentStateContext.getPaymentId(),
+                                                paymentStateContext.getTransactionId(),
+                                                paymentStateContext.getPaymentMethodId(),
+                                                paymentStateContext.getAmount(),
+                                                paymentStateContext.getCurrency(),
+                                                paymentStateContext.getProperties(),
+                                                paymentStateContext.getCallContext());
     }
 }

diff --git a/payment/src/main/java/org/killbill/billing/payment/core/sm/payments/RefundOperation.java b/payment/src/main/java/org/killbill/billing/payment/core/sm/payments/RefundOperation.java
index b236ac0..1d86abb 100644
--- a/payment/src/main/java/org/killbill/billing/payment/core/sm/payments/RefundOperation.java
+++ b/payment/src/main/java/org/killbill/billing/payment/core/sm/payments/RefundOperation.java
@@ -44,13 +44,13 @@ public class RefundOperation extends PaymentOperation {
     @Override
     protected PaymentTransactionInfoPlugin doCallSpecificOperationCallback() throws PaymentPluginApiException {
         logger.debug("Starting REFUND for payment {} ({} {})", paymentStateContext.getPaymentId(), paymentStateContext.getAmount(), paymentStateContext.getCurrency());
-        return plugin.refundPayment(paymentStateContext.getAccount().getId(),
-                                    paymentStateContext.getPaymentId(),
-                                    paymentStateContext.getTransactionId(),
-                                    paymentStateContext.getPaymentMethodId(),
-                                    paymentStateContext.getAmount(),
-                                    paymentStateContext.getCurrency(),
-                                    paymentStateContext.getProperties(),
-                                    paymentStateContext.getCallContext());
+        return paymentPluginApi.refundPayment(paymentStateContext.getAccount().getId(),
+                                              paymentStateContext.getPaymentId(),
+                                              paymentStateContext.getTransactionId(),
+                                              paymentStateContext.getPaymentMethodId(),
+                                              paymentStateContext.getAmount(),
+                                              paymentStateContext.getCurrency(),
+                                              paymentStateContext.getProperties(),
+                                              paymentStateContext.getCallContext());
     }
 }

diff --git a/payment/src/main/java/org/killbill/billing/payment/core/sm/payments/VoidOperation.java b/payment/src/main/java/org/killbill/billing/payment/core/sm/payments/VoidOperation.java
index b6542d9..c932c59 100644
--- a/payment/src/main/java/org/killbill/billing/payment/core/sm/payments/VoidOperation.java
+++ b/payment/src/main/java/org/killbill/billing/payment/core/sm/payments/VoidOperation.java
@@ -44,11 +44,11 @@ public class VoidOperation extends PaymentOperation {
     @Override
     protected PaymentTransactionInfoPlugin doCallSpecificOperationCallback() throws PaymentPluginApiException {
         logger.debug("Starting VOID for payment {} ({} {})", paymentStateContext.getPaymentId(), paymentStateContext.getAmount(), paymentStateContext.getCurrency());
-        return plugin.voidPayment(paymentStateContext.getAccount().getId(),
-                                  paymentStateContext.getPaymentId(),
-                                  paymentStateContext.getTransactionId(),
-                                  paymentStateContext.getPaymentMethodId(),
-                                  paymentStateContext.getProperties(),
-                                  paymentStateContext.getCallContext());
+        return paymentPluginApi.voidPayment(paymentStateContext.getAccount().getId(),
+                                            paymentStateContext.getPaymentId(),
+                                            paymentStateContext.getTransactionId(),
+                                            paymentStateContext.getPaymentMethodId(),
+                                            paymentStateContext.getProperties(),
+                                            paymentStateContext.getCallContext());
     }
 }