killbill-aplcache

diff --git a/payment/src/main/java/org/killbill/billing/payment/api/DefaultAdminPaymentApi.java b/payment/src/main/java/org/killbill/billing/payment/api/DefaultAdminPaymentApi.java
index 7b57166..6b02b9b 100644
--- a/payment/src/main/java/org/killbill/billing/payment/api/DefaultAdminPaymentApi.java
+++ b/payment/src/main/java/org/killbill/billing/payment/api/DefaultAdminPaymentApi.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2014-2015 Groupon, Inc
- * Copyright 2014-2015 The Billing Project, LLC
+ * Copyright 2014-2016 Groupon, Inc
+ * Copyright 2014-2016 The Billing Project, LLC
  *
  * The Billing Project licenses this file to you under the Apache License, version 2.0
  * (the "License"); you may not use this file except in compliance with the
@@ -24,34 +24,39 @@ import org.killbill.billing.callcontext.InternalCallContext;
 import org.killbill.billing.payment.dao.PaymentDao;
 import org.killbill.billing.util.callcontext.CallContext;
 import org.killbill.billing.util.callcontext.InternalCallContextFactory;
-import org.killbill.commons.locker.GlobalLocker;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public class DefaultAdminPaymentApi implements AdminPaymentApi {
 
-    private static final Logger log = LoggerFactory.getLogger(DefaultAdminPaymentApi.class);
-
     private final PaymentDao paymentDao;
-    private final GlobalLocker locker;
     private final InternalCallContextFactory internalCallContextFactory;
 
     @Inject
-    public DefaultAdminPaymentApi(final PaymentDao paymentDao, final InternalCallContextFactory internalCallContextFactory, final GlobalLocker locker) {
+    public DefaultAdminPaymentApi(final PaymentDao paymentDao, final InternalCallContextFactory internalCallContextFactory) {
         this.paymentDao = paymentDao;
         this.internalCallContextFactory = internalCallContextFactory;
-        this.locker = locker;
     }
 
     @Override
-    public void fixPaymentTransactionState(final Payment payment, PaymentTransaction paymentTransaction, TransactionStatus transactionStatus, @Nullable String lastSuccessPaymentState, String currentPaymentStateName,
-                                              Iterable<PluginProperty> properties, CallContext callContext)
-            throws PaymentApiException {
-
+    public void fixPaymentTransactionState(final Payment payment,
+                                           final PaymentTransaction paymentTransaction,
+                                           final TransactionStatus transactionStatus,
+                                           @Nullable final String lastSuccessPaymentState,
+                                           final String currentPaymentStateName,
+                                           final Iterable<PluginProperty> properties,
+                                           final CallContext callContext) throws PaymentApiException {
         final InternalCallContext internalCallContext = internalCallContextFactory.createInternalCallContext(payment.getAccountId(), callContext);
-        paymentDao.updatePaymentAndTransactionOnCompletion(payment.getAccountId(), null, payment.getId(), paymentTransaction.getTransactionType(),
-                                                           currentPaymentStateName, lastSuccessPaymentState, paymentTransaction.getId(),
-                                                           transactionStatus, paymentTransaction.getProcessedAmount(), paymentTransaction.getProcessedCurrency(),
-                                                           paymentTransaction.getGatewayErrorCode(), paymentTransaction.getGatewayErrorMsg(), internalCallContext);
+        paymentDao.updatePaymentAndTransactionOnCompletion(payment.getAccountId(),
+                                                           null,
+                                                           payment.getId(),
+                                                           paymentTransaction.getTransactionType(),
+                                                           currentPaymentStateName,
+                                                           lastSuccessPaymentState,
+                                                           paymentTransaction.getId(),
+                                                           transactionStatus,
+                                                           paymentTransaction.getProcessedAmount(),
+                                                           paymentTransaction.getProcessedCurrency(),
+                                                           paymentTransaction.getGatewayErrorCode(),
+                                                           paymentTransaction.getGatewayErrorMsg(),
+                                                           internalCallContext);
     }
 }