Details
diff --git a/account/src/main/java/org/killbill/billing/account/api/svcs/DefaultImmutableAccountInternalApi.java b/account/src/main/java/org/killbill/billing/account/api/svcs/DefaultImmutableAccountInternalApi.java
index 60060f5..05777c4 100644
--- a/account/src/main/java/org/killbill/billing/account/api/svcs/DefaultImmutableAccountInternalApi.java
+++ b/account/src/main/java/org/killbill/billing/account/api/svcs/DefaultImmutableAccountInternalApi.java
@@ -98,7 +98,7 @@ public class DefaultImmutableAccountInternalApi implements ImmutableAccountInter
// return new CacheLoaderArgument(null, args, context);
// }
-public static APLCache<AccountModelDao> inTransactionCache = new APLCache<>("static-multi:DefaultImmutableAccountInternalApi.inTransaction");
+public static APLCache<AccountModelDao> inTransactionCache = new APLCache<>("static-multi:DefaultImmutableAccountInternalApi.inTransaction", 20000);
private Account getAccountByRecordIdInternal(final Long recordId, final InternalTenantContext context) {
final AccountModelDao accountModelDao = transactionalSqlDao.execute(true, new EntitySqlDaoTransactionWrapper<AccountModelDao>() {
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 8530faa..e1b40bd 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
@@ -196,7 +196,7 @@ public class DefaultInvoiceUserApi implements InvoiceUserApi {
);
}
-public static APLCache<BigDecimal> getAccountBalanceCache = new APLCache<>("static-multi:DefaultInvoiceUserApi.getAccountBalance");
+public static APLCache<BigDecimal> getAccountBalanceCache = new APLCache<>("static-multi:DefaultInvoiceUserApi.getAccountBalance", 20000);
@Override
public BigDecimal getAccountBalance(final UUID accountId, final TenantContext context) {
@@ -206,7 +206,7 @@ return getAccountBalanceCache.computeIfAbsent(Thread.currentThread(), new Object
}, 20000);
}
-public static APLCache<BigDecimal> getAccountCBACache = new APLCache<>("static-multi:DefaultInvoiceUserApi.getAccountCBA");
+public static APLCache<BigDecimal> getAccountCBACache = new APLCache<>("static-multi:DefaultInvoiceUserApi.getAccountCBA", 20000);
@Override
public BigDecimal getAccountCBA(final UUID accountId, final TenantContext context) {
diff --git a/invoice/src/main/java/org/killbill/billing/invoice/dao/CBADao.java b/invoice/src/main/java/org/killbill/billing/invoice/dao/CBADao.java
index 6a3c74b..3bff089 100644
--- a/invoice/src/main/java/org/killbill/billing/invoice/dao/CBADao.java
+++ b/invoice/src/main/java/org/killbill/billing/invoice/dao/CBADao.java
@@ -50,7 +50,7 @@ public class CBADao {
this.invoiceDaoHelper = invoiceDaoHelper;
}
-public static APLCache<BigDecimal> getAccountCBAFromTransactionCache = new APLCache<>("static-multi:CBADao.getAccountCBAFromTransaction");
+public static APLCache<BigDecimal> getAccountCBAFromTransactionCache = new APLCache<>("static-multi:CBADao.getAccountCBAFromTransaction", 20000);
// PERF: Compute the CBA directly in the database (faster than re-constructing all invoices)
public BigDecimal getAccountCBAFromTransaction(final EntitySqlDaoWrapperFactory entitySqlDaoWrapperFactory, final InternalTenantContext context) {
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 0f187eb..becfac5 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
@@ -487,7 +487,7 @@ public class DefaultInvoiceDao extends EntityDaoBase<InvoiceModelDao, Invoice, I
}
-public static APLCache<BigDecimal> getAccountBalanceCache = new APLCache<>("static-multi:DefaultInvoiceDao.getAccountBalance");
+public static APLCache<BigDecimal> getAccountBalanceCache = new APLCache<>("static-multi:DefaultInvoiceDao.getAccountBalance", 20000);
@Override
public BigDecimal getAccountBalance(final UUID accountId, final InternalTenantContext context) {
@@ -525,7 +525,7 @@ return getAccountBalanceCache.computeIfAbsent(Thread.currentThread(), new Object
}, 20000);
}
-public static APLCache<BigDecimal> getAccountCBA = new APLCache<>("static-multi:DefaultInvoiceDao.getAccountCBA");
+public static APLCache<BigDecimal> getAccountCBA = new APLCache<>("static-multi:DefaultInvoiceDao.getAccountCBA", 20000);
@Override
public BigDecimal getAccountCBA(final UUID accountId, final InternalTenantContext context) {
@@ -551,7 +551,7 @@ return getAccountCBA.computeIfAbsent(Thread.currentThread(), new Object[]{accoun
});
}
-public static APLCache<UUID> inTransaction13 = new APLCache<>("static-multi:DefaultInvoiceDao.inTransaction13");
+public static APLCache<UUID> inTransaction13 = new APLCache<>("static-multi:DefaultInvoiceDao.inTransaction13", 20000);
@Override
public UUID getInvoiceIdByPaymentId(final UUID paymentId, final InternalTenantContext context) {
return transactionalSqlDao.execute(true, new EntitySqlDaoTransactionWrapper<UUID>() {
@@ -564,7 +564,7 @@ return inTransaction13.computeIfAbsent(Thread.currentThread(), new Object[]{enti
});
}
-public static APLCache<List<InvoicePaymentModelDao>> inTransaction14 = new APLCache<>("static-multi:DefaultInvoiceDao.inTransaction14");
+public static APLCache<List<InvoicePaymentModelDao>> inTransaction14 = new APLCache<>("static-multi:DefaultInvoiceDao.inTransaction14", 20000);
@Override
public List<InvoicePaymentModelDao> getInvoicePaymentsByPaymentId(final UUID paymentId, final InternalTenantContext context) {
@@ -1399,7 +1399,7 @@ return inTransaction14.computeIfAbsent(Thread.currentThread(), new Object[]{enti
});
}
-public static APLCache<List<Tag>> getInvoicesTags = new APLCache<>("static-multi:DefaultInvoiceDao.getInvoicesTags");
+public static APLCache<List<Tag>> getInvoicesTags = new APLCache<>("static-multi:DefaultInvoiceDao.getInvoicesTags", 20000);
// PERF: fetch tags once. See also https://github.com/killbill/killbill/issues/720.
private List<Tag> getInvoicesTags(final InternalTenantContext context) {
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 8228d19..359ad3f 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
@@ -220,7 +220,7 @@ public class AccountResource extends JaxRsResourceBase {
return Response.status(Status.OK).entity(accountJson).build();
}
-public static APLCache<AccountJson> apply = new APLCache<>("static-multi:AccountResource.apply");
+public static APLCache<AccountJson> apply = new APLCache<>("static-multi:AccountResource.apply", 20000);
@TimedResource
@GET
@@ -351,7 +351,7 @@ public static APLCache<AccountJson> apply = new APLCache<>("static-multi:Account
return Response.status(Status.OK).entity(accountJson).build();
}
-public static APLCache<AccountJson> getAccount = new APLCache<>("static-multi:AccountResource.getAccount");
+public static APLCache<AccountJson> getAccount = new APLCache<>("static-multi:AccountResource.getAccount", 20000);
private AccountJson getAccount(final Account account, final Boolean accountWithBalance, final Boolean accountWithBalanceAndCBA,
final AccountAuditLogs auditLogs, final TenantContext tenantContext) {
diff --git a/util/src/main/java/org/killbill/billing/util/audit/dao/DefaultAuditDao.java b/util/src/main/java/org/killbill/billing/util/audit/dao/DefaultAuditDao.java
index d2afcc0..7f06b77 100644
--- a/util/src/main/java/org/killbill/billing/util/audit/dao/DefaultAuditDao.java
+++ b/util/src/main/java/org/killbill/billing/util/audit/dao/DefaultAuditDao.java
@@ -112,7 +112,7 @@ public class DefaultAuditDao implements AuditDao {
}
-public static APLCache<AuditLog> apply = new APLCache<>("static-multi:DefaultAuditDao.apply");
+public static APLCache<AuditLog> apply = new APLCache<>("static-multi:DefaultAuditDao.apply", 20000);
private Iterator<AuditLog> buildAuditLogsFromModelDao(final Iterator<AuditLogModelDao> auditLogsForAccountRecordId, final InternalTenantContext tenantContext) {
// final Map<TableName, Map<Long, UUID>> recordIdIdsCache = new HashMap<TableName, Map<Long, UUID>>();
diff --git a/util/src/main/java/org/killbill/billing/util/callcontext/InternalCallContextFactory.java b/util/src/main/java/org/killbill/billing/util/callcontext/InternalCallContextFactory.java
index 7ba1e3e..f11ef5e 100644
--- a/util/src/main/java/org/killbill/billing/util/callcontext/InternalCallContextFactory.java
+++ b/util/src/main/java/org/killbill/billing/util/callcontext/InternalCallContextFactory.java
@@ -387,7 +387,7 @@ public class InternalCallContextFactory {
}
}
-public static APLCache<Long> getTenantRecordIdSafe = new APLCache<>("static-multi:InternalCallContextFactory.getTenantRecordIdSafe");
+public static APLCache<Long> getTenantRecordIdSafe = new APLCache<>("static-multi:InternalCallContextFactory.getTenantRecordIdSafe", 20000);
private Long getTenantRecordIdSafe(final TenantContext context) {
return getTenantRecordIdSafe.computeIfAbsent(Thread.currentThread(), new Object[]{context}, () -> {
@@ -414,7 +414,7 @@ return getTenantRecordIdSafe.computeIfAbsent(Thread.currentThread(), new Object[
// In-code tenant checkers
//
-public static APLCache<Boolean> objectBelongsToTheRightTenant1 = new APLCache<>("static-multi:Parser.objectBelongsToTheRightTenant1");
+public static APLCache<Boolean> objectBelongsToTheRightTenant1 = new APLCache<>("static-multi:Parser.objectBelongsToTheRightTenant1", 20000);
private boolean objectBelongsToTheRightTenant(final UUID objectId, final ObjectType objectType, final TenantContext context) throws ObjectDoesNotExist {
return objectBelongsToTheRightTenant1.computeIfAbsent(Thread.currentThread(), new Object[]{objectId, objectType, context}, () -> {
@@ -426,7 +426,7 @@ return objectBelongsToTheRightTenant1.computeIfAbsent(Thread.currentThread(), ne
}, 20000);
}
-public static APLCache<Boolean> objectBelongsToTheRightTenant2 = new APLCache<>("static-multi:Parser.objectBelongsToTheRightTenant2");
+public static APLCache<Boolean> objectBelongsToTheRightTenant2 = new APLCache<>("static-multi:Parser.objectBelongsToTheRightTenant2", 20000);
private boolean objectBelongsToTheRightTenant(final UUID objectId, final ObjectType objectType, final Long realTenantRecordId) throws ObjectDoesNotExist {
return objectBelongsToTheRightTenant2.computeIfAbsent(Thread.currentThread(), new Object[]{objectId, objectType, realTenantRecordId}, () -> {
@@ -446,7 +446,7 @@ return objectBelongsToTheRightTenant2.computeIfAbsent(Thread.currentThread(), ne
return nonEntityDao.retrieveAccountRecordIdFromObject(objectId, objectType, null);
}
-public static APLCache<Long> getTenantRecordIdUnsafe = new APLCache<>("static-multi:InternalCallContextFactory.getTenantRecordIdUnsafe");
+public static APLCache<Long> getTenantRecordIdUnsafe = new APLCache<>("static-multi:InternalCallContextFactory.getTenantRecordIdUnsafe", 20000);
private Long getTenantRecordIdUnsafe(final UUID objectId, final ObjectType objectType) {
return getTenantRecordIdUnsafe.computeIfAbsent(Thread.currentThread(), new Object[]{objectId, objectType}, () -> {
diff --git a/util/src/main/java/org/killbill/billing/util/dao/DefaultNonEntityDao.java b/util/src/main/java/org/killbill/billing/util/dao/DefaultNonEntityDao.java
index 80b18e7..9a11641 100644
--- a/util/src/main/java/org/killbill/billing/util/dao/DefaultNonEntityDao.java
+++ b/util/src/main/java/org/killbill/billing/util/dao/DefaultNonEntityDao.java
@@ -110,7 +110,7 @@ public class DefaultNonEntityDao implements NonEntityDao {
}, objectIdOrNull, objectType, tableName, cache);
}
-public static APLCache<Long> retrieveTenantRecordIdFromObject = new APLCache<>("static-multi:DefaultNonEntityDao.retrieveTenantRecordIdFromObject");
+public static APLCache<Long> retrieveTenantRecordIdFromObject = new APLCache<>("static-multi:DefaultNonEntityDao.retrieveTenantRecordIdFromObject", 20000);
@Override
public Long retrieveTenantRecordIdFromObject(@Nullable final UUID objectId, final ObjectType objectType, @Nullable final Object cache) {
@@ -119,8 +119,8 @@ return retrieveTenantRecordIdFromObject.computeIfAbsent(Thread.currentThread(),
}, 20000);
}
-public static APLCache<Long> doRetrieve = new APLCache<>("static-multi:DefaultNonEntityDao.doRetrieve");
-public static APLCache<Long> retrieveTenantRecordIdFromObjectInTransaction = new APLCache<>("static-multi:DefaultNonEntityDao.retrieveTenantRecordIdFromObjectInTransaction");
+public static APLCache<Long> doRetrieve = new APLCache<>("static-multi:DefaultNonEntityDao.doRetrieve", 20000);
+public static APLCache<Long> retrieveTenantRecordIdFromObjectInTransaction = new APLCache<>("static-multi:DefaultNonEntityDao.retrieveTenantRecordIdFromObjectInTransaction", 20000);
@Override
public Long retrieveTenantRecordIdFromObjectInTransaction(@Nullable final UUID objectId, final ObjectType objectType, @Nullable final Object cache, @Nullable final Handle handle) {
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 038d8e7..e118ba0 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
@@ -101,7 +101,7 @@ public class DefaultTagDao extends EntityDaoBase<TagModelDao, Tag, TagApiExcepti
});
}
-public static APLCache<List<TagModelDao>> getTagsForAccountType = new APLCache<>("static-multi:DefaultTagDao.getTagsForAccountType");
+public static APLCache<List<TagModelDao>> getTagsForAccountType = new APLCache<>("static-multi:DefaultTagDao.getTagsForAccountType", 20000);
@Override
public List<TagModelDao> getTagsForAccountType(final ObjectType objectType, final boolean includedDeleted, final InternalTenantContext internalTenantContext) {
diff --git a/util/src/main/java/org/killbill/billing/util/tag/DefaultTagInternalApi.java b/util/src/main/java/org/killbill/billing/util/tag/DefaultTagInternalApi.java
index ccde6ab..cad91c7 100644
--- a/util/src/main/java/org/killbill/billing/util/tag/DefaultTagInternalApi.java
+++ b/util/src/main/java/org/killbill/billing/util/tag/DefaultTagInternalApi.java
@@ -73,7 +73,7 @@ public class DefaultTagInternalApi implements TagInternalApi {
return toTagList(tagDao.getTagsForAccount(includedDeleted, context));
}
-public static APLCache<List<Tag>> getTagsForAccountType = new APLCache<>("static-multi:DefaultTagInternalApi.getTagsForAccountType");
+public static APLCache<List<Tag>> getTagsForAccountType = new APLCache<>("static-multi:DefaultTagInternalApi.getTagsForAccountType", 20000);
@Override
public List<Tag> getTagsForAccountType(final ObjectType objectType, final boolean includedDeleted, final InternalTenantContext internalTenantContext) {
