killbill-aplcache
Changes
entitlement/src/main/java/org/killbill/billing/entitlement/api/svcs/DefaultEntitlementApiBase.java 4(+2 -2)
entitlement/src/main/java/org/killbill/billing/entitlement/dao/DefaultBlockingStateDao.java 2(+1 -1)
invoice/src/main/java/org/killbill/billing/invoice/notification/DefaultNextBillingDateNotifier.java 2(+1 -1)
invoice/src/main/java/org/killbill/billing/invoice/template/formatters/DefaultInvoiceFormatter.java 2(+1 -1)
payment/src/main/java/org/killbill/billing/payment/core/janitor/IncompletePaymentAttemptTask.java 6(+3 -3)
payment/src/main/java/org/killbill/billing/payment/core/sm/control/ControlPluginRunner.java 6(+3 -3)
payment/src/main/java/org/killbill/billing/payment/core/sm/control/OperationControlCallback.java 2(+1 -1)
payment/src/main/java/org/killbill/billing/payment/core/sm/payments/PaymentEnteringStateCallback.java 2(+1 -1)
payment/src/main/java/org/killbill/billing/payment/invoice/InvoicePaymentControlPluginApi.java 2(+1 -1)
profiles/killbill/src/main/java/org/killbill/billing/server/notifications/PushNotificationListener.java 2(+1 -1)
subscription/src/main/java/org/killbill/billing/subscription/api/svcs/DefaultSubscriptionInternalApi.java 2(+1 -1)
subscription/src/main/java/org/killbill/billing/subscription/engine/core/DefaultSubscriptionBaseService.java 6(+3 -3)
Details
diff --git a/account/src/main/java/org/killbill/billing/account/dao/DefaultAccountDao.java b/account/src/main/java/org/killbill/billing/account/dao/DefaultAccountDao.java
index fbbdcc7..7d9815d 100644
--- a/account/src/main/java/org/killbill/billing/account/dao/DefaultAccountDao.java
+++ b/account/src/main/java/org/killbill/billing/account/dao/DefaultAccountDao.java
@@ -94,7 +94,7 @@ public class DefaultAccountDao extends EntityDaoBase<AccountModelDao, Account, A
try {
eventBus.postFromTransaction(creationEvent, entitySqlDaoWrapperFactory.getHandle().getConnection());
} catch (final EventBusException e) {
- log.warn(String.format("Failed to post account creation event for accountId='%s'", savedAccount.getId()), e);
+ log.warn("Failed to post account creation event for accountId='{}'", savedAccount.getId(), e);
}
}
@@ -166,7 +166,7 @@ public class DefaultAccountDao extends EntityDaoBase<AccountModelDao, Account, A
try {
eventBus.postFromTransaction(changeEvent, entitySqlDaoWrapperFactory.getHandle().getConnection());
} catch (final EventBusException e) {
- log.warn(String.format("Failed to post account change event for accountId='%s'", accountId), e);
+ log.warn("Failed to post account change event for accountId='{}'", accountId, e);
}
return null;
@@ -205,7 +205,7 @@ public class DefaultAccountDao extends EntityDaoBase<AccountModelDao, Account, A
try {
eventBus.postFromTransaction(changeEvent, entitySqlDaoWrapperFactory.getHandle().getConnection());
} catch (final EventBusException e) {
- log.warn(String.format("Failed to post account change event for accountId='%s'", accountId), e);
+ log.warn("Failed to post account change event for accountId='{}'", accountId, e);
}
return null;
}
diff --git a/beatrix/src/main/java/org/killbill/billing/beatrix/extbus/BeatrixListener.java b/beatrix/src/main/java/org/killbill/billing/beatrix/extbus/BeatrixListener.java
index b3d547a..98a8df8 100644
--- a/beatrix/src/main/java/org/killbill/billing/beatrix/extbus/BeatrixListener.java
+++ b/beatrix/src/main/java/org/killbill/billing/beatrix/extbus/BeatrixListener.java
@@ -106,10 +106,10 @@ public class BeatrixListener {
// However when using InMemoryBus, this can happen as there is no retry logic (at the 'ext' bus level) and so we should re-throw at this level to kick-in the retry logic from the 'main' bus
// (The use of RuntimeException is somewhat arbitrary)
//
- log.warn(String.format("Failed to post event %s", event), e);
+ log.warn("Failed to post event {}", event, e);
throw new RuntimeException(e);
} catch (JsonProcessingException e) {
- log.warn(String.format("Failed to post event %s", event), e);
+ log.warn("Failed to post event {}", event, e);
}
}
diff --git a/entitlement/src/main/java/org/killbill/billing/entitlement/api/DefaultSubscriptionApi.java b/entitlement/src/main/java/org/killbill/billing/entitlement/api/DefaultSubscriptionApi.java
index c0d67e4..959435f 100644
--- a/entitlement/src/main/java/org/killbill/billing/entitlement/api/DefaultSubscriptionApi.java
+++ b/entitlement/src/main/java/org/killbill/billing/entitlement/api/DefaultSubscriptionApi.java
@@ -204,7 +204,7 @@ public class DefaultSubscriptionApi implements SubscriptionApi {
try {
return getSubscriptionBundle(subscriptionBaseBundle.getId(), context);
} catch (final SubscriptionApiException e) {
- log.warn(String.format("Error retrieving bundleId='%s'", subscriptionBaseBundle.getId()), e);
+ log.warn("Error retrieving bundleId='{}'", subscriptionBaseBundle.getId(), e);
return null;
}
}
@@ -228,7 +228,7 @@ public class DefaultSubscriptionApi implements SubscriptionApi {
try {
return getSubscriptionBundle(subscriptionBaseBundle.getId(), context);
} catch (final SubscriptionApiException e) {
- log.warn(String.format("Error retrieving bundleId='%s'", subscriptionBaseBundle.getId()), e);
+ log.warn("Error retrieving bundleId='{}'", subscriptionBaseBundle.getId(), e);
return null;
}
}
diff --git a/entitlement/src/main/java/org/killbill/billing/entitlement/api/svcs/DefaultEntitlementApiBase.java b/entitlement/src/main/java/org/killbill/billing/entitlement/api/svcs/DefaultEntitlementApiBase.java
index dd7dfc0..7d1ef3d 100644
--- a/entitlement/src/main/java/org/killbill/billing/entitlement/api/svcs/DefaultEntitlementApiBase.java
+++ b/entitlement/src/main/java/org/killbill/billing/entitlement/api/svcs/DefaultEntitlementApiBase.java
@@ -189,7 +189,7 @@ public class DefaultEntitlementApiBase {
try {
eventBus.post(event);
} catch (EventBusException e) {
- log.warn(String.format("Failed to post event %s", event), e);
+ log.warn("Failed to post event {}", event, e);
}
} catch (SubscriptionBaseApiException e) {
@@ -241,7 +241,7 @@ public class DefaultEntitlementApiBase {
try {
eventBus.post(event);
} catch (EventBusException e) {
- log.warn(String.format("Failed to post event %s", event), e);
+ log.warn("Failed to post event {}", event, e);
}
} catch (SubscriptionBaseApiException e) {
diff --git a/entitlement/src/main/java/org/killbill/billing/entitlement/dao/DefaultBlockingStateDao.java b/entitlement/src/main/java/org/killbill/billing/entitlement/dao/DefaultBlockingStateDao.java
index 36edc48..7615862 100644
--- a/entitlement/src/main/java/org/killbill/billing/entitlement/dao/DefaultBlockingStateDao.java
+++ b/entitlement/src/main/java/org/killbill/billing/entitlement/dao/DefaultBlockingStateDao.java
@@ -334,7 +334,7 @@ public class DefaultBlockingStateDao extends EntityDaoBase<BlockingStateModelDao
try {
eventBus.postFromTransaction(event, entitySqlDaoWrapperFactory.getHandle().getConnection());
} catch (final EventBusException e) {
- log.warn(String.format("Failed to post event %s", event), e);
+ log.warn("Failed to post event {}", event, e);
}
}
diff --git a/entitlement/src/main/java/org/killbill/billing/entitlement/DefaultEntitlementService.java b/entitlement/src/main/java/org/killbill/billing/entitlement/DefaultEntitlementService.java
index 5810af6..d74b8be 100644
--- a/entitlement/src/main/java/org/killbill/billing/entitlement/DefaultEntitlementService.java
+++ b/entitlement/src/main/java/org/killbill/billing/entitlement/DefaultEntitlementService.java
@@ -127,12 +127,12 @@ public class DefaultEntitlementService implements EntitlementService {
try {
entitlement = entitlementInternalApi.getEntitlementForId(key.getEntitlementId(), internalCallContext);
} catch (final EntitlementApiException e) {
- log.error(String.format("Error retrieving entitlementId='%s'", key.getEntitlementId()), e);
+ log.error("Error retrieving entitlementId='{}'", key.getEntitlementId(), e);
return;
}
if (!(entitlement instanceof DefaultEntitlement)) {
- log.error(String.format("Error retrieving entitlementId='%s', unexpected entitlement className='%s'", key.getEntitlementId(), entitlement.getClass().getName()));
+ log.error("Error retrieving entitlementId='{}', unexpected entitlement className='{}'", key.getEntitlementId(), entitlement.getClass().getName());
return;
}
@@ -147,7 +147,7 @@ public class DefaultEntitlementService implements EntitlementService {
entitlementInternalApi.resume(key.getBundleId(), internalCallContext.toLocalDate(key.getEffectiveDate(), ((DefaultEntitlement) entitlement).getSubscriptionBase().getStartDate()), ImmutableList.<PluginProperty>of(), internalCallContext);
}
} catch (final EntitlementApiException e) {
- log.error(String.format("Error processing event for entitlementId='%s'", entitlement.getId()), e);
+ log.error("Error processing event for entitlementId='{}'", entitlement.getId(), e);
}
}
@@ -190,7 +190,7 @@ public class DefaultEntitlementService implements EntitlementService {
try {
eventBus.post(event);
} catch (final EventBusException e) {
- log.warn(String.format("Failed to post event %s", event), e);
+ log.warn("Failed to post event {}", event, e);
}
}
diff --git a/invoice/src/main/java/org/killbill/billing/invoice/api/InvoiceApiHelper.java b/invoice/src/main/java/org/killbill/billing/invoice/api/InvoiceApiHelper.java
index 8a5933b..2b02a73 100644
--- a/invoice/src/main/java/org/killbill/billing/invoice/api/InvoiceApiHelper.java
+++ b/invoice/src/main/java/org/killbill/billing/invoice/api/InvoiceApiHelper.java
@@ -103,7 +103,7 @@ public class InvoiceApiHelper {
final List<InvoiceItemModelDao> createdInvoiceItems = dao.createInvoices(invoiceModelDaos, internalCallContext);
return fromInvoiceItemModelDao(createdInvoiceItems);
} catch (final LockFailedException e) {
- log.error(String.format("Failed to process invoice items for account %s", accountId.toString()), e);
+ log.warn("Failed to process invoice items for accountId='{}'", accountId.toString(), e);
return ImmutableList.<InvoiceItem>of();
} finally {
if (lock != null) {
diff --git a/invoice/src/main/java/org/killbill/billing/invoice/api/user/DefaultInvoiceUserApi.java b/invoice/src/main/java/org/killbill/billing/invoice/api/user/DefaultInvoiceUserApi.java
index f44c153..c7ba438 100644
--- a/invoice/src/main/java/org/killbill/billing/invoice/api/user/DefaultInvoiceUserApi.java
+++ b/invoice/src/main/java/org/killbill/billing/invoice/api/user/DefaultInvoiceUserApi.java
@@ -460,7 +460,7 @@ public class DefaultInvoiceUserApi implements InvoiceUserApi {
try {
eventBus.post(event);
} catch (final EventBusException e) {
- log.warn(String.format("Failed to post event %s", event), e);
+ log.warn("Failed to post event {}", event, e);
}
}
diff --git a/invoice/src/main/java/org/killbill/billing/invoice/dao/DefaultInvoiceDao.java b/invoice/src/main/java/org/killbill/billing/invoice/dao/DefaultInvoiceDao.java
index c010ce9..8c376bd 100644
--- a/invoice/src/main/java/org/killbill/billing/invoice/dao/DefaultInvoiceDao.java
+++ b/invoice/src/main/java/org/killbill/billing/invoice/dao/DefaultInvoiceDao.java
@@ -848,7 +848,7 @@ public class DefaultInvoiceDao extends EntityDaoBase<InvoiceModelDao, Invoice, I
eventBus.postFromTransaction(new DefaultInvoiceAdjustmentEvent(invoiceId, accountId, context.getAccountRecordId(), context.getTenantRecordId(), userToken),
entitySqlDaoWrapperFactory.getHandle().getConnection());
} catch (final EventBusException e) {
- log.warn(String.format("Failed to post adjustment event for invoiceId='%s'", invoiceId), e);
+ log.warn("Failed to post adjustment event for invoiceId='{}'", invoiceId, e);
}
}
@@ -887,7 +887,7 @@ public class DefaultInvoiceDao extends EntityDaoBase<InvoiceModelDao, Invoice, I
try {
eventBus.postFromTransaction(busEvent, entitySqlDaoWrapperFactory.getHandle().getConnection());
} catch (final EventBusException e) {
- log.warn(String.format("Failed to post invoice payment event for invoiceId='%s'", invoicePaymentModelDao.getInvoiceId()), e);
+ log.warn("Failed to post invoice payment event for invoiceId='{}'", invoicePaymentModelDao.getInvoiceId(), e);
}
}
diff --git a/invoice/src/main/java/org/killbill/billing/invoice/InvoiceDispatcher.java b/invoice/src/main/java/org/killbill/billing/invoice/InvoiceDispatcher.java
index 4bbf5e0..d46a0ed 100644
--- a/invoice/src/main/java/org/killbill/billing/invoice/InvoiceDispatcher.java
+++ b/invoice/src/main/java/org/killbill/billing/invoice/InvoiceDispatcher.java
@@ -182,7 +182,7 @@ public class InvoiceDispatcher {
try {
eventBus.post(event);
} catch (EventBusException e) {
- log.warn(String.format("Failed to post event %s", event), e);
+ log.warn("Failed to post event {}", event, e);
}
}
}
@@ -190,7 +190,7 @@ public class InvoiceDispatcher {
private Invoice processSubscriptionInternal(final UUID subscriptionId, final DateTime targetDate, final boolean dryRunForNotification, final InternalCallContext context) throws InvoiceApiException {
try {
if (subscriptionId == null) {
- log.error("Failed handling SubscriptionBase change.", new InvoiceApiException(ErrorCode.INVOICE_INVALID_TRANSITION));
+ log.warn("Failed handling SubscriptionBase change.", new InvoiceApiException(ErrorCode.INVOICE_INVALID_TRANSITION));
return null;
}
final UUID accountId = subscriptionApi.getAccountIdFromSubscriptionId(subscriptionId, context);
@@ -198,7 +198,7 @@ public class InvoiceDispatcher {
return processAccount(accountId, targetDate, dryRunArguments, context);
} catch (final SubscriptionBaseApiException e) {
- log.error("Failed handling SubscriptionBase change.",
+ log.warn("Failed handling SubscriptionBase change.",
new InvoiceApiException(ErrorCode.INVOICE_NO_ACCOUNT_ID_FOR_SUBSCRIPTION_ID, subscriptionId.toString()));
return null;
}
@@ -212,9 +212,7 @@ public class InvoiceDispatcher {
return processAccountWithLock(accountId, targetDate, dryRunArguments, context);
} catch (final LockFailedException e) {
- // Not good!
- log.error(String.format("Failed to process invoice for account %s, targetDate %s",
- accountId.toString(), targetDate), e);
+ log.warn("Failed to process invoice for accountId='{}', targetDate='{}'", accountId.toString(), targetDate, e);
} finally {
if (lock != null) {
lock.release();
@@ -558,7 +556,7 @@ public class InvoiceDispatcher {
try {
eventBus.post(event);
} catch (final EventBusException e) {
- log.warn(String.format("Failed to post event %s", event), e);
+ log.warn("Failed to post event {}", event, e);
}
}
diff --git a/invoice/src/main/java/org/killbill/billing/invoice/InvoiceListener.java b/invoice/src/main/java/org/killbill/billing/invoice/InvoiceListener.java
index 51c1e5b..d9ed893 100644
--- a/invoice/src/main/java/org/killbill/billing/invoice/InvoiceListener.java
+++ b/invoice/src/main/java/org/killbill/billing/invoice/InvoiceListener.java
@@ -69,7 +69,7 @@ public class InvoiceListener {
final InternalCallContext context = internalCallContextFactory.createInternalCallContext(event.getSearchKey2(), event.getSearchKey1(), "RepairBundle", CallOrigin.INTERNAL, UserType.SYSTEM, event.getUserToken());
dispatcher.processAccount(event.getAccountId(), event.getEffectiveDate(), null, context);
} catch (InvoiceApiException e) {
- log.warn(String.format("Unable to process event %s", event), e);
+ log.warn("Unable to process event {}", event, e);
}
}
@@ -88,7 +88,7 @@ public class InvoiceListener {
final InternalCallContext context = internalCallContextFactory.createInternalCallContext(event.getSearchKey2(), event.getSearchKey1(), "SubscriptionBaseTransition", CallOrigin.INTERNAL, UserType.SYSTEM, event.getUserToken());
dispatcher.processSubscriptionForInvoiceGeneration(event, context);
} catch (InvoiceApiException e) {
- log.warn(String.format("Unable to process event %s", event), e);
+ log.warn("Unable to process event {}", event, e);
}
}
@@ -100,7 +100,7 @@ public class InvoiceListener {
final InternalCallContext context = internalCallContextFactory.createInternalCallContext(event.getSearchKey2(), event.getSearchKey1(), "SubscriptionBaseTransition", CallOrigin.INTERNAL, UserType.SYSTEM, event.getUserToken());
dispatcher.processAccount(event.getAccountId(), event.getEffectiveTransitionTime(), null, context);
} catch (InvoiceApiException e) {
- log.warn(String.format("Unable to process event %s", event), e);
+ log.warn("Unable to process event {}", event, e);
}
}
@@ -118,9 +118,9 @@ public class InvoiceListener {
final UUID accountId = accountApi.getByRecordId(event.getSearchKey1(), context);
dispatcher.processAccount(accountId, clock.getUTCNow(), null, context);
} catch (InvoiceApiException e) {
- log.warn(String.format("Unable to process event %s", event), e);
+ log.warn("Unable to process event {}", event, e);
} catch (AccountApiException e) {
- log.warn(String.format("Unable to process event %s", event), e);
+ log.warn("Unable to process event {}", event, e);
}
}
@@ -129,7 +129,7 @@ public class InvoiceListener {
final InternalCallContext context = internalCallContextFactory.createInternalCallContext(tenantRecordId, accountRecordId, "Next Billing Date", CallOrigin.INTERNAL, UserType.SYSTEM, userToken);
dispatcher.processSubscriptionForInvoiceGeneration(subscriptionId, eventDateTime, context);
} catch (InvoiceApiException e) {
- log.warn(String.format("Unable to process subscriptionId='%s', eventDateTime='%s", subscriptionId, eventDateTime), e);
+ log.warn("Unable to process subscriptionId='{}', eventDateTime='{}'", subscriptionId, eventDateTime, e);
}
}
@@ -138,7 +138,7 @@ public class InvoiceListener {
final InternalCallContext context = internalCallContextFactory.createInternalCallContext(tenantRecordId, accountRecordId, "Next Billing Date", CallOrigin.INTERNAL, UserType.SYSTEM, userToken);
dispatcher.processSubscriptionForInvoiceNotification(subscriptionId, eventDateTime, context);
} catch (InvoiceApiException e) {
- log.warn(String.format("Unable to process subscriptionId='%s', eventDateTime='%s", subscriptionId, eventDateTime), e);
+ log.warn("Unable to process subscriptionId='{}', eventDateTime='{}'", subscriptionId, eventDateTime, e);
}
}
}
diff --git a/invoice/src/main/java/org/killbill/billing/invoice/InvoiceTagHandler.java b/invoice/src/main/java/org/killbill/billing/invoice/InvoiceTagHandler.java
index 12472ac..facb7ba 100644
--- a/invoice/src/main/java/org/killbill/billing/invoice/InvoiceTagHandler.java
+++ b/invoice/src/main/java/org/killbill/billing/invoice/InvoiceTagHandler.java
@@ -67,7 +67,7 @@ public class InvoiceTagHandler {
try {
dispatcher.processAccount(accountId, clock.getUTCNow(), null, context);
} catch (InvoiceApiException e) {
- log.warn(String.format("Failed to process tag removal AUTO_INVOICING_OFF for accountId='%s'", accountId), e);
+ log.warn("Failed to process tag removal AUTO_INVOICING_OFF for accountId='{}'", accountId, e);
}
}
}
diff --git a/invoice/src/main/java/org/killbill/billing/invoice/notification/DefaultNextBillingDateNotifier.java b/invoice/src/main/java/org/killbill/billing/invoice/notification/DefaultNextBillingDateNotifier.java
index 93494b6..05e661f 100644
--- a/invoice/src/main/java/org/killbill/billing/invoice/notification/DefaultNextBillingDateNotifier.java
+++ b/invoice/src/main/java/org/killbill/billing/invoice/notification/DefaultNextBillingDateNotifier.java
@@ -92,7 +92,7 @@ public class DefaultNextBillingDateNotifier implements NextBillingDateNotifier {
processEventForInvoiceGeneration(key.getUuidKey(), targetDate, userToken, accountRecordId, tenantRecordId);
}
} catch (SubscriptionBaseApiException e) {
- log.error(String.format("Error retrieving subscriptionId='%s'", key.getUuidKey()), e);
+ log.warn("Error retrieving subscriptionId='{}'", key.getUuidKey(), e);
}
}
};
diff --git a/invoice/src/main/java/org/killbill/billing/invoice/template/formatters/DefaultInvoiceFormatter.java b/invoice/src/main/java/org/killbill/billing/invoice/template/formatters/DefaultInvoiceFormatter.java
index abf6119..6f38c8f 100644
--- a/invoice/src/main/java/org/killbill/billing/invoice/template/formatters/DefaultInvoiceFormatter.java
+++ b/invoice/src/main/java/org/killbill/billing/invoice/template/formatters/DefaultInvoiceFormatter.java
@@ -284,7 +284,7 @@ public class DefaultInvoiceFormatter implements InvoiceFormatter {
}
}
} catch (final CurrencyConversionException e) {
- logger.warn(String.format("Failed to retrieve currency conversion rates for currency='%s', dateConversion='%s'", currency, latestPaymentDate), e);
+ logger.warn("Failed to retrieve currency conversion rates for currency='{}', dateConversion='{}'", currency, latestPaymentDate, e);
return null;
}
logger.warn("Failed to retrieve currency conversion rates for currency='{}', dateConversion='{}'", currency, latestPaymentDate);
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 9a601ae..731db34 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
@@ -179,7 +179,7 @@ public class PaymentMethodResource extends JaxRsResourceBase {
account = accountUserApi.getAccountById(paymentMethod.getAccountId(), tenantContext);
accounts.put(paymentMethod.getAccountId(), account);
} catch (final AccountApiException e) {
- log.warn(String.format("Error retrieving accountId='%s'", paymentMethod.getAccountId()), e);
+ log.warn("Error retrieving accountId='{}'", paymentMethod.getAccountId(), e);
return null;
}
}
@@ -238,7 +238,7 @@ public class PaymentMethodResource extends JaxRsResourceBase {
account = accountUserApi.getAccountById(paymentMethod.getAccountId(), tenantContext);
accounts.put(paymentMethod.getAccountId(), account);
} catch (final AccountApiException e) {
- log.warn(String.format("Error retrieving accountId='%s'", paymentMethod.getAccountId()), e);
+ log.warn("Error retrieving accountId='{}'", paymentMethod.getAccountId(), e);
return null;
}
}
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 0e939ba..62ddc79 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
@@ -92,7 +92,6 @@ import org.slf4j.LoggerFactory;
import com.google.common.base.Preconditions;
import com.google.common.base.Predicate;
-import com.google.common.base.Strings;
import com.google.common.collect.Iterables;
import com.google.inject.Inject;
import com.wordnik.swagger.annotations.Api;
@@ -515,20 +514,19 @@ public class SubscriptionResource extends JaxRsResourceBase {
@Override
public void onSubscriptionBaseTransition(final EffectiveSubscriptionInternalEvent event) {
- log.info(String.format("Got event SubscriptionBaseTransition token='%s', type='%s', remaining='%d'",
- event.getUserToken(), event.getTransitionType(), event.getRemainingEventsForUserOperation()));
+ log.info("Got event SubscriptionBaseTransition token='{}', type='{}', remaining='{}'", event.getUserToken(), event.getTransitionType(), event.getRemainingEventsForUserOperation());
}
@Override
public void onEmptyInvoice(final NullInvoiceInternalEvent event) {
- log.info(String.format("Got event EmptyInvoiceNotification token='%s'", event.getUserToken()));
+ log.info("Got event EmptyInvoiceNotification token='{}'", event.getUserToken());
notifyForCompletion();
}
@Override
public void onInvoiceCreation(final InvoiceCreationInternalEvent event) {
- log.info(String.format("Got event InvoiceCreationNotification token='%s'", event.getUserToken()));
+ log.info("Got event InvoiceCreationNotification token='{}'", event.getUserToken());
if (event.getAmountOwed().compareTo(BigDecimal.ZERO) <= 0) {
notifyForCompletion();
}
@@ -536,19 +534,19 @@ public class SubscriptionResource extends JaxRsResourceBase {
@Override
public void onPaymentInfo(final PaymentInfoInternalEvent event) {
- log.info(String.format("Got event PaymentInfo token='%s'", event.getUserToken()));
+ log.info("Got event PaymentInfo token='{}'", event.getUserToken());
notifyForCompletion();
}
@Override
public void onPaymentError(final PaymentErrorInternalEvent event) {
- log.info(String.format("Got event PaymentError token='%s'", event.getUserToken()));
+ log.info("Got event PaymentError token='{}'", event.getUserToken());
notifyForCompletion();
}
@Override
public void onPaymentPluginError(final PaymentPluginErrorInternalEvent event) {
- log.info(String.format("Got event PaymentPluginError token='%s'", event.getUserToken()));
+ log.info("Got event PaymentPluginError token='{}'", event.getUserToken());
notifyForCompletion();
}
}
diff --git a/overdue/src/main/java/org/killbill/billing/overdue/applicator/OverdueStateApplicator.java b/overdue/src/main/java/org/killbill/billing/overdue/applicator/OverdueStateApplicator.java
index e1c5db4..22d0865 100644
--- a/overdue/src/main/java/org/killbill/billing/overdue/applicator/OverdueStateApplicator.java
+++ b/overdue/src/main/java/org/killbill/billing/overdue/applicator/OverdueStateApplicator.java
@@ -176,14 +176,14 @@ public class OverdueStateApplicator {
event = createOverdueEvent(account, previousOverdueState.getName(), nextOverdueState.getName(), isBlockBillingTransition(previousOverdueState, nextOverdueState),
isUnblockBillingTransition(previousOverdueState, nextOverdueState), context);
} catch (final BlockingApiException e) {
- log.warn(String.format("Failed to create OverdueChangeInternalEvent for accountId='%s'", account.getId()), e);
+ log.warn("Failed to create OverdueChangeInternalEvent for accountId='{}'", account.getId(), e);
return;
}
try {
bus.post(event);
} catch (final Exception e) {
- log.warn(String.format("Failed to post event %s", event), e);
+ log.warn("Failed to post event {}", event, e);
}
}
@@ -231,14 +231,14 @@ public class OverdueStateApplicator {
event = createOverdueEvent(account, previousOverdueState.getName(), clearState.getName(), isBlockBillingTransition(previousOverdueState, clearState),
isUnblockBillingTransition(previousOverdueState, clearState), context);
} catch (final BlockingApiException e) {
- log.warn(String.format("Failed to create OverdueChangeInternalEvent for accountId='%s'", account.getId()), e);
+ log.warn("Failed to create OverdueChangeInternalEvent for accountId='{}'", account.getId(), e);
return;
}
try {
bus.post(event);
} catch (final Exception e) {
- log.warn(String.format("Failed to post event %s", event), e);
+ log.warn("Failed to post event {}", event, e);
}
}
@@ -388,11 +388,11 @@ public class OverdueStateApplicator {
emailSender.sendPlainTextEmail(to, cc, subject, emailBody);
}
} catch (final IOException e) {
- log.warn(String.format("Unable to generate or send overdue notification email for accountId='%s'", account.getId()), e);
+ log.warn("Unable to generate or send overdue notification email for accountId='{}'", account.getId(), e);
} catch (final EmailApiException e) {
- log.warn(String.format("Unable to send overdue notification email for accountId='%s'", account.getId()), e);
+ log.warn("Unable to send overdue notification email for accountId='{}'", account.getId(), e);
} catch (final MustacheException e) {
- log.warn(String.format("Unable to generate overdue notification email for accountId='%s'", account.getId()), e);
+ log.warn("Unable to generate overdue notification email for accountId='{}'", account.getId(), e);
}
}
diff --git a/overdue/src/main/java/org/killbill/billing/overdue/listener/OverdueDispatcher.java b/overdue/src/main/java/org/killbill/billing/overdue/listener/OverdueDispatcher.java
index 58653d2..c631b72 100644
--- a/overdue/src/main/java/org/killbill/billing/overdue/listener/OverdueDispatcher.java
+++ b/overdue/src/main/java/org/killbill/billing/overdue/listener/OverdueDispatcher.java
@@ -50,7 +50,7 @@ public class OverdueDispatcher {
try {
factory.createOverdueWrapperFor(accountId, context).refresh(context);
} catch (BillingExceptionBase e) {
- log.error(String.format("Error processing Overdue for blockable %s", accountId), e);
+ log.warn("Error processing Overdue for accountId='{}'", accountId, e);
}
}
@@ -58,7 +58,7 @@ public class OverdueDispatcher {
try {
factory.createOverdueWrapperFor(accountId, context).clear(context);
} catch (BillingExceptionBase e) {
- log.error(String.format("Error processing Overdue for blockable %s (type %s)", accountId), e);
+ log.warn("Error processing Overdue for accountId='{}'", accountId, e);
}
}
}
diff --git a/overdue/src/main/java/org/killbill/billing/overdue/service/DefaultOverdueService.java b/overdue/src/main/java/org/killbill/billing/overdue/service/DefaultOverdueService.java
index 087eb5f..7aa0bed 100644
--- a/overdue/src/main/java/org/killbill/billing/overdue/service/DefaultOverdueService.java
+++ b/overdue/src/main/java/org/killbill/billing/overdue/service/DefaultOverdueService.java
@@ -91,7 +91,7 @@ public class DefaultOverdueService implements OverdueService {
overdueConfigCache.loadDefaultOverdueConfig(properties.getConfigURI());
isConfigLoaded = true;
} catch (OverdueApiException e) {
- log.warn(String.format("Overdue system disabled: unable to load the overdue config from uri='%s'", properties.getConfigURI()), e);
+ log.warn("Overdue system disabled: unable to load the overdue config from uri='{}'", properties.getConfigURI(), e);
}
}
}
diff --git a/overdue/src/main/java/org/killbill/billing/overdue/wrapper/OverdueWrapper.java b/overdue/src/main/java/org/killbill/billing/overdue/wrapper/OverdueWrapper.java
index 95a2b7d..7743e65 100644
--- a/overdue/src/main/java/org/killbill/billing/overdue/wrapper/OverdueWrapper.java
+++ b/overdue/src/main/java/org/killbill/billing/overdue/wrapper/OverdueWrapper.java
@@ -87,8 +87,7 @@ public class OverdueWrapper {
return refreshWithLock(context);
} catch (final LockFailedException e) {
- // Not good!
- log.error(String.format("Failed to process overdue for account %s", overdueable.getId()), e);
+ log.warn("Failed to process overdue for accountId='{}'", overdueable.getId(), e);
} finally {
if (lock != null) {
lock.release();
@@ -116,8 +115,7 @@ public class OverdueWrapper {
clearWithLock(context);
} catch (final LockFailedException e) {
- // Not good!
- log.error(String.format("Failed to clear overdue for account %s", overdueable.getId()), e);
+ log.warn("Failed to clear overdue for accountId='{}'", overdueable.getId(), e);
} finally {
if (lock != null) {
lock.release();
diff --git a/payment/src/main/java/org/killbill/billing/payment/core/janitor/CompletionTaskBase.java b/payment/src/main/java/org/killbill/billing/payment/core/janitor/CompletionTaskBase.java
index 5f3e8b4..6a86654 100644
--- a/payment/src/main/java/org/killbill/billing/payment/core/janitor/CompletionTaskBase.java
+++ b/payment/src/main/java/org/killbill/billing/payment/core/janitor/CompletionTaskBase.java
@@ -125,9 +125,9 @@ abstract class CompletionTaskBase<T> implements Runnable {
lock = locker.lockWithNumberOfTries(LockerType.ACCNT_INV_PAY.toString(), account.getExternalKey(), paymentConfig.getMaxGlobalLockRetries());
return callback.doIteration();
} catch (AccountApiException e) {
- log.warn(String.format("Error retrieving accountRecordId='%s'", internalTenantContext.getAccountRecordId()), e);
+ log.warn("Error retrieving accountRecordId='{}'", internalTenantContext.getAccountRecordId(), e);
} catch (LockFailedException e) {
- log.warn(String.format("Error locking accountRecordId='%s'", internalTenantContext.getAccountRecordId()), e);
+ log.warn("Error locking accountRecordId='{}'", internalTenantContext.getAccountRecordId(), e);
} finally {
if (lock != null) {
lock.release();
diff --git a/payment/src/main/java/org/killbill/billing/payment/core/janitor/IncompletePaymentAttemptTask.java b/payment/src/main/java/org/killbill/billing/payment/core/janitor/IncompletePaymentAttemptTask.java
index 183e779..ee44e8b 100644
--- a/payment/src/main/java/org/killbill/billing/payment/core/janitor/IncompletePaymentAttemptTask.java
+++ b/payment/src/main/java/org/killbill/billing/payment/core/janitor/IncompletePaymentAttemptTask.java
@@ -166,11 +166,11 @@ public class IncompletePaymentAttemptTask extends CompletionTaskBase<PaymentAtte
//
pluginControlledPaymentAutomatonRunner.completeRun(paymentStateContext);
} catch (final AccountApiException e) {
- log.warn(String.format("Error completing paymentAttemptId='%s'", attempt.getId()), e);
+ log.warn("Error completing paymentAttemptId='{}'", attempt.getId(), e);
} catch (final PluginPropertySerializerException e) {
- log.warn(String.format("Error completing paymentAttemptId='%s'", attempt.getId()), e);
+ log.warn("Error completing paymentAttemptId='{}'", attempt.getId(), e);
} catch (final PaymentApiException e) {
- log.warn(String.format("Error completing paymentAttemptId='%s'", attempt.getId()), e);
+ log.warn("Error completing paymentAttemptId='{}'", attempt.getId(), e);
}
}
}
diff --git a/payment/src/main/java/org/killbill/billing/payment/core/PaymentMethodProcessor.java b/payment/src/main/java/org/killbill/billing/payment/core/PaymentMethodProcessor.java
index 0ad8e57..45f79d6 100644
--- a/payment/src/main/java/org/killbill/billing/payment/core/PaymentMethodProcessor.java
+++ b/payment/src/main/java/org/killbill/billing/payment/core/PaymentMethodProcessor.java
@@ -139,7 +139,7 @@ public class PaymentMethodProcessor extends ProcessorBase {
accountInternalApi.updatePaymentMethod(account.getId(), pm.getId(), context);
}
} catch (final PaymentPluginApiException e) {
- log.warn(String.format("Error adding paymentMethodId='%s', plugin='%s'", pm.getId(), paymentPluginServiceName), e);
+ log.warn("Error adding paymentMethodId='{}', plugin='{}'", pm.getId(), paymentPluginServiceName, e);
throw new PaymentApiException(ErrorCode.PAYMENT_ADD_PAYMENT_METHOD, account.getId(), e.getErrorMessage());
} catch (final AccountApiException e) {
throw new PaymentApiException(e);
@@ -176,7 +176,7 @@ public class PaymentMethodProcessor extends ProcessorBase {
try {
paymentMethodPlugin = pluginApi.getPaymentMethodDetail(account.getId(), pm.getId(), properties, callContext);
} catch (final PaymentPluginApiException e) {
- log.warn(String.format("Error retrieving paymentMethodId='%s', plugin='%s'", pm.getId(), pm.getPluginName()), e);
+ log.warn("Error retrieving paymentMethodId='{}', plugin='{}'", pm.getId(), pm.getPluginName(), e);
return null;
}
@@ -227,7 +227,7 @@ public class PaymentMethodProcessor extends ProcessorBase {
final PaymentPluginApi pluginApi = getPaymentPluginApi(paymentMethodModelDao.getPluginName());
paymentMethodPlugin = pluginApi.getPaymentMethodDetail(paymentMethodModelDao.getAccountId(), paymentMethodModelDao.getId(), properties, tenantContext);
} catch (final PaymentPluginApiException e) {
- log.warn(String.format("Error retrieving paymentMethodId='%s', plugin='%s'", paymentMethodModelDao.getId(), paymentMethodModelDao.getPluginName()), e);
+ log.warn("Error retrieving paymentMethodId='{}', plugin='{}'", paymentMethodModelDao.getId(), paymentMethodModelDao.getPluginName(), e);
throw new PaymentApiException(ErrorCode.PAYMENT_GET_PAYMENT_METHODS, paymentMethodModelDao.getAccountId(), paymentMethodModelDao.getId());
}
} else {
@@ -424,7 +424,7 @@ public class PaymentMethodProcessor extends ProcessorBase {
paymentDao.deletedPaymentMethod(paymentMethodId, context);
return PluginDispatcher.createPluginDispatcherReturnType(null);
} catch (final PaymentPluginApiException e) {
- log.warn(String.format("Error deleting paymentMethodId='%s'", paymentMethodId), e);
+ log.warn("Error deleting paymentMethodId='{}'", paymentMethodId, e);
throw new PaymentApiException(ErrorCode.PAYMENT_DEL_PAYMENT_METHOD, account.getId(), e.getErrorMessage());
} catch (final AccountApiException e) {
throw new PaymentApiException(e);
@@ -502,7 +502,7 @@ public class PaymentMethodProcessor extends ProcessorBase {
return ImmutableList.<PaymentMethod>of();
}
} catch (final PaymentPluginApiException e) {
- log.warn(String.format("Error refreshing payment methods for accountId='%s', plugin='%s'", account.getId(), pluginName), e);
+ log.warn("Error refreshing payment methods for accountId='{}', plugin='{}'", account.getId(), pluginName, e);
throw new PaymentApiException(ErrorCode.PAYMENT_REFRESH_PAYMENT_METHOD, account.getId(), e.getErrorMessage());
}
@@ -541,7 +541,7 @@ public class PaymentMethodProcessor extends ProcessorBase {
try {
pluginApi.resetPaymentMethods(account.getId(), pluginPmsWithId, properties, callContext);
} catch (final PaymentPluginApiException e) {
- log.warn(String.format("Error resetting payment methods for accountId='%s', plugin='%s'", account.getId(), pluginName), e);
+ log.warn("Error resetting payment methods for accountId='{}', plugin='{}'", account.getId(), pluginName, e);
throw new PaymentApiException(ErrorCode.PAYMENT_REFRESH_PAYMENT_METHOD, account.getId(), e.getErrorMessage());
}
try {
diff --git a/payment/src/main/java/org/killbill/billing/payment/core/PluginControlPaymentProcessor.java b/payment/src/main/java/org/killbill/billing/payment/core/PluginControlPaymentProcessor.java
index 624907f..b70fe19 100644
--- a/payment/src/main/java/org/killbill/billing/payment/core/PluginControlPaymentProcessor.java
+++ b/payment/src/main/java/org/killbill/billing/payment/core/PluginControlPaymentProcessor.java
@@ -225,13 +225,13 @@ public class PluginControlPaymentProcessor extends ProcessorBase {
internalCallContext);
} catch (final AccountApiException e) {
- log.warn(String.format("Failed to retry attemptId='%s', paymentControlPlugins='%s'", attemptId, toPluginNamesOnError(paymentControlPluginNames)), e);
+ log.warn("Failed to retry attemptId='{}', paymentControlPlugins='{}'", attemptId, toPluginNamesOnError(paymentControlPluginNames), e);
} catch (final PaymentApiException e) {
- log.warn(String.format("Failed to retry attemptId='%s', paymentControlPlugins='%s'", attemptId, toPluginNamesOnError(paymentControlPluginNames)), e);
+ log.warn("Failed to retry attemptId='{}', paymentControlPlugins='{}'", attemptId, toPluginNamesOnError(paymentControlPluginNames), e);
} catch (final PluginPropertySerializerException e) {
- log.warn(String.format("Failed to retry attemptId='%s', paymentControlPlugins='%s'", attemptId, toPluginNamesOnError(paymentControlPluginNames)), e);
+ log.warn("Failed to retry attemptId='{}', paymentControlPlugins='{}'", attemptId, toPluginNamesOnError(paymentControlPluginNames), e);
} catch (final MissingEntryException e) {
- log.warn(String.format("Failed to retry attemptId='%s', paymentControlPlugins='%s'", attemptId, toPluginNamesOnError(paymentControlPluginNames)), e);
+ log.warn("Failed to retry attemptId='{}', paymentControlPlugins='{}'", attemptId, toPluginNamesOnError(paymentControlPluginNames), e);
}
}
diff --git a/payment/src/main/java/org/killbill/billing/payment/core/sm/control/ControlPluginRunner.java b/payment/src/main/java/org/killbill/billing/payment/core/sm/control/ControlPluginRunner.java
index be558eb..7f0ba27 100644
--- a/payment/src/main/java/org/killbill/billing/payment/core/sm/control/ControlPluginRunner.java
+++ b/payment/src/main/java/org/killbill/billing/payment/core/sm/control/ControlPluginRunner.java
@@ -187,9 +187,9 @@ public class ControlPluginRunner {
}
// Exceptions from the control plugins are ignored (and logged) because the semantics on what to do are undefined.
} catch (final PaymentControlApiException e) {
- log.warn(String.format("Error during onSuccessCall for plugin='%s', paymentExternalKey='%s'", pluginName, inputPaymentControlContext.getPaymentExternalKey()), e);
+ log.warn("Error during onSuccessCall for plugin='{}', paymentExternalKey='{}'", pluginName, inputPaymentControlContext.getPaymentExternalKey(), e);
} catch (final RuntimeException e) {
- log.warn(String.format("Error during onSuccessCall for plugin='%s', paymentExternalKey='%s'", pluginName, inputPaymentControlContext.getPaymentExternalKey()), e);
+ log.warn("Error during onSuccessCall for plugin='{}', paymentExternalKey='{}'", pluginName, inputPaymentControlContext.getPaymentExternalKey(), e);
}
}
}
@@ -247,7 +247,7 @@ public class ControlPluginRunner {
}
} catch (final PaymentControlApiException e) {
- log.warn(String.format("Error during onFailureCall for plugin='%s', paymentExternalKey='%s'", pluginName, inputPaymentControlContext.getPaymentExternalKey()), e);
+ log.warn("Error during onFailureCall for plugin='{}', paymentExternalKey='{}'", pluginName, inputPaymentControlContext.getPaymentExternalKey(), e);
return new DefaultFailureCallResult(candidate, inputPluginProperties);
}
}
diff --git a/payment/src/main/java/org/killbill/billing/payment/core/sm/control/OperationControlCallback.java b/payment/src/main/java/org/killbill/billing/payment/core/sm/control/OperationControlCallback.java
index 614e9df..6bcc469 100644
--- a/payment/src/main/java/org/killbill/billing/payment/core/sm/control/OperationControlCallback.java
+++ b/payment/src/main/java/org/killbill/billing/payment/core/sm/control/OperationControlCallback.java
@@ -165,7 +165,7 @@ public abstract class OperationControlCallback extends OperationCallbackBase<Pay
if (originalExceptionOrCause instanceof OperationException) {
return (OperationException) originalExceptionOrCause;
} else if (originalExceptionOrCause instanceof LockFailedException) {
- logger.warn(String.format("Failed to lock accountId='%s'", paymentStateContext.getAccount().getId()));
+ logger.warn("Failed to lock accountId='{}'", paymentStateContext.getAccount().getId());
} else if (originalExceptionOrCause instanceof TimeoutException) {
logger.warn("Call TIMEOUT for accountId='{}'", paymentStateContext.getAccount().getId());
} else if (originalExceptionOrCause instanceof InterruptedException) {
diff --git a/payment/src/main/java/org/killbill/billing/payment/core/sm/payments/PaymentEnteringStateCallback.java b/payment/src/main/java/org/killbill/billing/payment/core/sm/payments/PaymentEnteringStateCallback.java
index 9a487d5..d336109 100644
--- a/payment/src/main/java/org/killbill/billing/payment/core/sm/payments/PaymentEnteringStateCallback.java
+++ b/payment/src/main/java/org/killbill/billing/payment/core/sm/payments/PaymentEnteringStateCallback.java
@@ -76,7 +76,7 @@ public abstract class PaymentEnteringStateCallback implements EnteringStateCallb
try {
daoHelper.getEventBus().post(event);
} catch (EventBusException e) {
- logger.warn(String.format("Failed to post event %s", event), e);
+ logger.warn("Failed to post event {}", event, e);
}
}
}
diff --git a/payment/src/main/java/org/killbill/billing/payment/dispatcher/PaymentPluginDispatcher.java b/payment/src/main/java/org/killbill/billing/payment/dispatcher/PaymentPluginDispatcher.java
index 8b6dbb2..b44e06a 100644
--- a/payment/src/main/java/org/killbill/billing/payment/dispatcher/PaymentPluginDispatcher.java
+++ b/payment/src/main/java/org/killbill/billing/payment/dispatcher/PaymentPluginDispatcher.java
@@ -61,7 +61,7 @@ public class PaymentPluginDispatcher {
throw (PaymentApiException) e.getCause();
} else if (e.getCause() instanceof LockFailedException) {
final String format = String.format("Failed to lock accountExternalKey='%s'", accountExternalKey);
- log.error(format, e);
+ log.warn(format, e);
throw new PaymentApiException(ErrorCode.PAYMENT_INTERNAL_ERROR, format);
} else {
throw new PaymentApiException(e, ErrorCode.PAYMENT_INTERNAL_ERROR, MoreObjects.firstNonNull(e.getMessage(), ""));
diff --git a/payment/src/main/java/org/killbill/billing/payment/invoice/InvoicePaymentControlPluginApi.java b/payment/src/main/java/org/killbill/billing/payment/invoice/InvoicePaymentControlPluginApi.java
index 0d6c64f..159ee16 100644
--- a/payment/src/main/java/org/killbill/billing/payment/invoice/InvoicePaymentControlPluginApi.java
+++ b/payment/src/main/java/org/killbill/billing/payment/invoice/InvoicePaymentControlPluginApi.java
@@ -211,7 +211,7 @@ public final class InvoicePaymentControlPluginApi implements PaymentControlPlugi
throw new IllegalStateException("Unexpected transactionType " + transactionType);
}
} catch (final InvoiceApiException e) {
- log.error(String.format("onSuccessCall failed for attemptId='%s', transactionType='%s'", paymentControlContext.getAttemptPaymentId(), transactionType), e);
+ log.warn("onSuccessCall failed for attemptId='{}', transactionType='{}'", paymentControlContext.getAttemptPaymentId(), transactionType, e);
}
return new DefaultOnSuccessPaymentControlResult();
diff --git a/profiles/killbill/src/main/java/org/killbill/billing/server/notifications/PushNotificationListener.java b/profiles/killbill/src/main/java/org/killbill/billing/server/notifications/PushNotificationListener.java
index 8681047..7e3a993 100644
--- a/profiles/killbill/src/main/java/org/killbill/billing/server/notifications/PushNotificationListener.java
+++ b/profiles/killbill/src/main/java/org/killbill/billing/server/notifications/PushNotificationListener.java
@@ -113,7 +113,7 @@ public class PushNotificationListener {
});
response = futureStatus.get(timeoutSec, TimeUnit.SECONDS);
} catch (final Exception e) {
- log.warn(String.format("Failed to push notification url='%s', tenantId='%s'", url, tenantId), e);
+ log.warn("Failed to push notification url='{}', tenantId='{}'", url, tenantId, e);
return false;
}
return response.getStatusCode() >= 200 && response.getStatusCode() < 300;
diff --git a/subscription/src/main/java/org/killbill/billing/subscription/api/svcs/DefaultSubscriptionInternalApi.java b/subscription/src/main/java/org/killbill/billing/subscription/api/svcs/DefaultSubscriptionInternalApi.java
index 42889d1..278959e 100644
--- a/subscription/src/main/java/org/killbill/billing/subscription/api/svcs/DefaultSubscriptionInternalApi.java
+++ b/subscription/src/main/java/org/killbill/billing/subscription/api/svcs/DefaultSubscriptionInternalApi.java
@@ -315,7 +315,7 @@ public class DefaultSubscriptionInternalApi extends SubscriptionApiBase implemen
}
}
} catch (final CatalogApiException e) {
- log.warn(String.format("Failed to get subscriptions for bundleId='%s'", cur.getId()), e);
+ log.warn("Failed to get subscriptions for bundleId='{}'", cur.getId(), e);
return null;
}
}
diff --git a/subscription/src/main/java/org/killbill/billing/subscription/engine/core/DefaultSubscriptionBaseService.java b/subscription/src/main/java/org/killbill/billing/subscription/engine/core/DefaultSubscriptionBaseService.java
index 24e90c1..e5e84ab 100644
--- a/subscription/src/main/java/org/killbill/billing/subscription/engine/core/DefaultSubscriptionBaseService.java
+++ b/subscription/src/main/java/org/killbill/billing/subscription/engine/core/DefaultSubscriptionBaseService.java
@@ -176,9 +176,9 @@ public class DefaultSubscriptionBaseService implements EventListener, Subscripti
eventBus.post(busEvent);
}
} catch (final EventBusException e) {
- log.warn(String.format("Failed to post event %s", event), e);
+ log.warn("Failed to post event {}", event, e);
} catch (final CatalogApiException e) {
- log.warn(String.format("Failed to post event %s", event), e);
+ log.warn("Failed to post event {}", event, e);
}
}
@@ -195,7 +195,7 @@ public class DefaultSubscriptionBaseService implements EventListener, Subscripti
return true;
}
} catch (final SubscriptionBaseError e) {
- log.error(String.format("Error inserting next phase for subscriptionId='%s'", subscription.getId()), e);
+ log.warn("Error inserting next phase for subscriptionId='{}'", subscription.getId(), e);
}
return false;
diff --git a/subscription/src/main/java/org/killbill/billing/subscription/engine/dao/DefaultSubscriptionDao.java b/subscription/src/main/java/org/killbill/billing/subscription/engine/dao/DefaultSubscriptionDao.java
index 1f655bb..41c73a0 100644
--- a/subscription/src/main/java/org/killbill/billing/subscription/engine/dao/DefaultSubscriptionDao.java
+++ b/subscription/src/main/java/org/killbill/billing/subscription/engine/dao/DefaultSubscriptionDao.java
@@ -1082,7 +1082,7 @@ public class DefaultSubscriptionDao extends EntityDaoBase<SubscriptionBundleMode
final DefaultSubscriptionBase upToDateSubscription = createSubscriptionWithNewEvent(subscription, immediateEvent, context);
notifyBusOfEffectiveImmediateChange(entitySqlDaoWrapperFactory, upToDateSubscription, immediateEvent, seqId, context);
} catch (final CatalogApiException e) {
- log.warn(String.format("Failed to post effective event for subscriptionId='%s'", subscription.getId()), e);
+ log.warn("Failed to post effective event for subscriptionId='{}'", subscription.getId(), e);
}
}
@@ -1098,7 +1098,7 @@ public class DefaultSubscriptionDao extends EntityDaoBase<SubscriptionBundleMode
eventBus.postFromTransaction(busEvent, entitySqlDaoWrapperFactory.getHandle().getConnection());
} catch (final EventBusException e) {
- log.warn(String.format("Failed to post effective event for subscriptionId='%s'", subscription.getId()), e);
+ log.warn("Failed to post effective event for subscriptionId='{}'", subscription.getId(), e);
}
}
@@ -1107,7 +1107,7 @@ public class DefaultSubscriptionDao extends EntityDaoBase<SubscriptionBundleMode
try {
eventBus.postFromTransaction(new DefaultRequestedSubscriptionEvent(subscription, nextEvent, transitionType, context.getAccountRecordId(), context.getTenantRecordId(), context.getUserToken()), entitySqlDaoWrapperFactory.getHandle().getConnection());
} catch (final EventBusException e) {
- log.warn(String.format("Failed to post requested change event for subscriptionId='%s'", subscription.getId()), e);
+ log.warn("Failed to post requested change event for subscriptionId='{}'", subscription.getId(), e);
}
}
diff --git a/tenant/src/main/java/org/killbill/billing/tenant/api/TenantCacheInvalidation.java b/tenant/src/main/java/org/killbill/billing/tenant/api/TenantCacheInvalidation.java
index 752947a..da95a45 100644
--- a/tenant/src/main/java/org/killbill/billing/tenant/api/TenantCacheInvalidation.java
+++ b/tenant/src/main/java/org/killbill/billing/tenant/api/TenantCacheInvalidation.java
@@ -198,7 +198,7 @@ public class TenantCacheInvalidation {
try {
parent.getEventBus().post(event);
} catch (final EventBusException e) {
- logger.warn(String.format("Failed to post event %s", event), e);
+ logger.warn("Failed to post event {}", event, e);
}
}
} else {
diff --git a/util/src/main/java/org/killbill/billing/util/broadcast/DefaultBroadcastApi.java b/util/src/main/java/org/killbill/billing/util/broadcast/DefaultBroadcastApi.java
index 01be469..0a1a922 100644
--- a/util/src/main/java/org/killbill/billing/util/broadcast/DefaultBroadcastApi.java
+++ b/util/src/main/java/org/killbill/billing/util/broadcast/DefaultBroadcastApi.java
@@ -51,7 +51,7 @@ public class DefaultBroadcastApi implements BroadcastApi {
try {
eventBus.post(busEvent);
} catch (final EventBusException e) {
- logger.warn(String.format("Failed to post event %s", event), e);
+ logger.warn("Failed to post event {}", event, e);
}
} else {
final BroadcastModelDao modelDao = new BroadcastModelDao(serviceName, type, event, createdDate, createdBy);
diff --git a/util/src/main/java/org/killbill/billing/util/broadcast/DefaultBroadcastService.java b/util/src/main/java/org/killbill/billing/util/broadcast/DefaultBroadcastService.java
index 4dd7a6c..a569fff 100644
--- a/util/src/main/java/org/killbill/billing/util/broadcast/DefaultBroadcastService.java
+++ b/util/src/main/java/org/killbill/billing/util/broadcast/DefaultBroadcastService.java
@@ -143,7 +143,7 @@ public class DefaultBroadcastService implements BroadcastService {
try {
eventBus.post(event);
} catch (final EventBusException e) {
- logger.warn(String.format("Failed to post event %s", event), e);
+ logger.warn("Failed to post event {}", event, e);
} finally {
parent.setLatestRecordIdProcessed(cur.getRecordId());
}
diff --git a/util/src/main/java/org/killbill/billing/util/customfield/dao/DefaultCustomFieldDao.java b/util/src/main/java/org/killbill/billing/util/customfield/dao/DefaultCustomFieldDao.java
index e937b00..6561b8f 100644
--- a/util/src/main/java/org/killbill/billing/util/customfield/dao/DefaultCustomFieldDao.java
+++ b/util/src/main/java/org/killbill/billing/util/customfield/dao/DefaultCustomFieldDao.java
@@ -146,7 +146,7 @@ public class DefaultCustomFieldDao extends EntityDaoBase<CustomFieldModelDao, Cu
try {
bus.postFromTransaction(customFieldEvent, entitySqlDaoWrapperFactory.getHandle().getConnection());
} catch (final PersistentBus.EventBusException e) {
- log.warn(String.format("Failed to post tag event for customFieldId='%s'", customField.getId().toString()), e);
+ log.warn("Failed to post tag event for customFieldId='{}'", customField.getId().toString(), e);
}
}
diff --git a/util/src/main/java/org/killbill/billing/util/entity/dao/DefaultPaginationHelper.java b/util/src/main/java/org/killbill/billing/util/entity/dao/DefaultPaginationHelper.java
index 539f897..d3ffa24 100644
--- a/util/src/main/java/org/killbill/billing/util/entity/dao/DefaultPaginationHelper.java
+++ b/util/src/main/java/org/killbill/billing/util/entity/dao/DefaultPaginationHelper.java
@@ -74,7 +74,7 @@ public class DefaultPaginationHelper {
maxNbRecords = Math.max(maxNbRecords, pages.getMaxNbRecords());
}
} catch (final BillingExceptionBase e) {
- log.warn(String.format("Error while searching plugin='%s'", pluginName), e);
+ log.warn("Error while searching plugin='{}'", pluginName, e);
// Non-fatal, continue to search other plugins
}
}
diff --git a/util/src/main/java/org/killbill/billing/util/tag/dao/DefaultTagDao.java b/util/src/main/java/org/killbill/billing/util/tag/dao/DefaultTagDao.java
index 70e1a2f..ed2d38c 100644
--- a/util/src/main/java/org/killbill/billing/util/tag/dao/DefaultTagDao.java
+++ b/util/src/main/java/org/killbill/billing/util/tag/dao/DefaultTagDao.java
@@ -142,7 +142,7 @@ public class DefaultTagDao extends EntityDaoBase<TagModelDao, Tag, TagApiExcepti
try {
bus.postFromTransaction(tagEvent, entitySqlDaoWrapperFactory.getHandle().getConnection());
} catch (final PersistentBus.EventBusException e) {
- log.warn(String.format("Failed to post tag event for tagId='%s'", tag.getId().toString()), e);
+ log.warn("Failed to post tag event for tagId='{}'", tag.getId().toString(), e);
}
}
diff --git a/util/src/main/java/org/killbill/billing/util/tag/dao/DefaultTagDefinitionDao.java b/util/src/main/java/org/killbill/billing/util/tag/dao/DefaultTagDefinitionDao.java
index babe3e6..46128ce 100644
--- a/util/src/main/java/org/killbill/billing/util/tag/dao/DefaultTagDefinitionDao.java
+++ b/util/src/main/java/org/killbill/billing/util/tag/dao/DefaultTagDefinitionDao.java
@@ -184,7 +184,7 @@ public class DefaultTagDefinitionDao extends EntityDaoBase<TagDefinitionModelDao
try {
bus.postFromTransaction(tagDefinitionEvent, entitySqlDaoWrapperFactory.getHandle().getConnection());
} catch (final PersistentBus.EventBusException e) {
- log.warn(String.format("Failed to post tag definition creation event for tagDefinitionId='%s'", tagDefinition.getId()), e);
+ log.warn("Failed to post tag definition creation event for tagDefinitionId='{}'", tagDefinition.getId(), e);
}
return tagDefinition;
@@ -263,7 +263,7 @@ public class DefaultTagDefinitionDao extends EntityDaoBase<TagDefinitionModelDao
try {
bus.postFromTransaction(tagDefinitionEvent, entitySqlDaoWrapperFactory.getHandle().getConnection());
} catch (final PersistentBus.EventBusException e) {
- log.warn(String.format("Failed to post tag definition event for tagDefinitionId='%s'", tagDefinition.getId().toString()), e);
+ log.warn("Failed to post tag definition event for tagDefinitionId='{}'", tagDefinition.getId().toString(), e);
}
}