killbill-developers

diff --git a/catalog/src/main/java/org/killbill/billing/catalog/caching/DefaultCatalogCache.java b/catalog/src/main/java/org/killbill/billing/catalog/caching/DefaultCatalogCache.java
index ba54bf7..6d24640 100644
--- a/catalog/src/main/java/org/killbill/billing/catalog/caching/DefaultCatalogCache.java
+++ b/catalog/src/main/java/org/killbill/billing/catalog/caching/DefaultCatalogCache.java
@@ -58,7 +58,7 @@ public class DefaultCatalogCache implements CatalogCache {
 
     private final Logger logger = LoggerFactory.getLogger(DefaultCatalogCache.class);
 
-public static MultiCache<Long, DefaultVersionedCatalog> cacheController = new MultiCache<>("DefaultCatalogCache.cacheController");
+public static MultiCache<Long, DefaultVersionedCatalog> cacheController = new MultiCache<>("static-multi:DefaultCatalogCache.cacheController");
 
     // private final CacheController<Long, DefaultVersionedCatalog> cacheController;
     private final VersionedCatalogLoader loader;

diff --git a/catalog/src/main/java/org/killbill/billing/catalog/caching/DefaultOverriddenPlanCache.java b/catalog/src/main/java/org/killbill/billing/catalog/caching/DefaultOverriddenPlanCache.java
index 9888f3c..b9032e5 100644
--- a/catalog/src/main/java/org/killbill/billing/catalog/caching/DefaultOverriddenPlanCache.java
+++ b/catalog/src/main/java/org/killbill/billing/catalog/caching/DefaultOverriddenPlanCache.java
@@ -63,7 +63,7 @@ import com.google.common.collect.Iterables;
 
 public class DefaultOverriddenPlanCache implements OverriddenPlanCache {
 
-public static MultiCache<String, Plan> cacheController = new MultiCache<>("DefaultOverriddenPlanCache.cacheController");
+public static MultiCache<String, Plan> cacheController = new MultiCache<>("static-multi:DefaultOverriddenPlanCache.cacheController");
 
     // private final CacheController<String, Plan> cacheController;
     // private final LoaderCallback loaderCallback;

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 2d442dc..740f830 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
@@ -203,7 +203,7 @@ public abstract class JaxRsResourceBase implements JaxrsResource {
     protected Response createTagResponse(final UUID accountId, final List<Tag> tags, final AuditMode auditMode, final TenantContext context) throws TagDefinitionApiException {
         final AccountAuditLogsForObjectType tagsAuditLogs = auditUserApi.getAccountAuditLogs(accountId, ObjectType.TAG, auditMode.getLevel(), context);
 
-MultiCache<UUID, TagDefinition> createTagResponse = new MultiCache<>("JaxRsResourceBase.createTagResponse");
+MultiCache<UUID, TagDefinition> createTagResponse = new MultiCache<>("instance-multi:JaxRsResourceBase.createTagResponse");
 
         // final Map<UUID, TagDefinition> tagDefinitionsCache = new HashMap<UUID, TagDefinition>();
         final Collection<TagJson> result = new LinkedList<TagJson>();

diff --git a/overdue/src/main/java/org/killbill/billing/overdue/caching/DefaultOverdueConfigCache.java b/overdue/src/main/java/org/killbill/billing/overdue/caching/DefaultOverdueConfigCache.java
index f4d4b7d..9754cd7 100644
--- a/overdue/src/main/java/org/killbill/billing/overdue/caching/DefaultOverdueConfigCache.java
+++ b/overdue/src/main/java/org/killbill/billing/overdue/caching/DefaultOverdueConfigCache.java
@@ -48,7 +48,7 @@ public class DefaultOverdueConfigCache implements OverdueConfigCache {
 
     private static final Logger log = LoggerFactory.getLogger(DefaultOverdueConfigCache.class);
 
-public static MultiCache<Long, OverdueConfig> cacheController = new MultiCache<>("DefaultOverdueConfig.cacheController");
+public static MultiCache<Long, OverdueConfig> cacheController = new MultiCache<>("static-multi:DefaultOverdueConfig.cacheController");
 
     // private final CacheController<Long, OverdueConfig> cacheController;
     // private final CacheLoaderArgument cacheLoaderArgument;

diff --git a/payment/src/main/java/org/killbill/billing/payment/caching/DefaultStateMachineConfigCache.java b/payment/src/main/java/org/killbill/billing/payment/caching/DefaultStateMachineConfigCache.java
index 0215d08..aa44eb1 100644
--- a/payment/src/main/java/org/killbill/billing/payment/caching/DefaultStateMachineConfigCache.java
+++ b/payment/src/main/java/org/killbill/billing/payment/caching/DefaultStateMachineConfigCache.java
@@ -51,7 +51,7 @@ public class DefaultStateMachineConfigCache implements StateMachineConfigCache {
 
     private static final Logger logger = LoggerFactory.getLogger(DefaultStateMachineConfigCache.class);
 
-public static MultiCache<String, StateMachineConfig> cacheController = new MultiCache<>("DefaultStateMachineConfigCache.cacheController");
+public static MultiCache<String, StateMachineConfig> cacheController = new MultiCache<>("static-multi:DefaultStateMachineConfigCache.cacheController");
 
     // private final CacheController<String, StateMachineConfig> cacheController;
     // private final LoaderCallback loaderCallback;

diff --git a/profiles/killbill/src/main/java/org/killbill/billing/server/security/KillbillJdbcTenantRealm.java b/profiles/killbill/src/main/java/org/killbill/billing/server/security/KillbillJdbcTenantRealm.java
index 5cf6470..df92bb4 100644
--- a/profiles/killbill/src/main/java/org/killbill/billing/server/security/KillbillJdbcTenantRealm.java
+++ b/profiles/killbill/src/main/java/org/killbill/billing/server/security/KillbillJdbcTenantRealm.java
@@ -96,8 +96,8 @@ public class KillbillJdbcTenantRealm extends JdbcRealm {
         private byte[] bytes;
         // private String cachedHex;
         // private String cachedBase64;
-private GetterCache<String> cachedHex = new GetterCache<>("KillbillJdbcTenantRealm.cachedHex");
-private GetterCache<String> cachedBase64 = new GetterCache<>("KillbillJdbcTenantRealm.cachedBase64");
+private GetterCache<String> cachedHex = new GetterCache<>("instance-getter:KillbillJdbcTenantRealm.cachedHex");
+private GetterCache<String> cachedBase64 = new GetterCache<>("instance-getter:KillbillJdbcTenantRealm.cachedBase64");
 
 
         // For deserialization

diff --git a/subscription/src/main/java/org/killbill/billing/subscription/api/SubscriptionApiBase.java b/subscription/src/main/java/org/killbill/billing/subscription/api/SubscriptionApiBase.java
index c543078..a087e3f 100644
--- a/subscription/src/main/java/org/killbill/billing/subscription/api/SubscriptionApiBase.java
+++ b/subscription/src/main/java/org/killbill/billing/subscription/api/SubscriptionApiBase.java
@@ -262,7 +262,7 @@ public class SubscriptionApiBase {
     }
 
 
-public static MultiCache<UUID, UUID> accountIdCacheController = new MultiCache<>("SubscriptionApiBase.accountIdCacheController");
+public static MultiCache<UUID, UUID> accountIdCacheController = new MultiCache<>("static-multi:SubscriptionApiBase.accountIdCacheController");
 
     protected SubscriptionBaseBundle createBundleForAccount(final UUID accountId,
                                                             final String bundleKey,

diff --git a/subscription/src/main/java/org/killbill/billing/subscription/api/svcs/DefaultSubscriptionBaseCreateApi.java b/subscription/src/main/java/org/killbill/billing/subscription/api/svcs/DefaultSubscriptionBaseCreateApi.java
index 39b8eb3..3785209 100644
--- a/subscription/src/main/java/org/killbill/billing/subscription/api/svcs/DefaultSubscriptionBaseCreateApi.java
+++ b/subscription/src/main/java/org/killbill/billing/subscription/api/svcs/DefaultSubscriptionBaseCreateApi.java
@@ -63,7 +63,7 @@ public class DefaultSubscriptionBaseCreateApi extends SubscriptionApiBase {
 
     private static final Logger log = LoggerFactory.getLogger(DefaultSubscriptionBaseCreateApi.class);
 
-public static MultiCache<UUID, UUID> bundleIdCacheController = new MultiCache<>("DefaultSubscriptionBaseCreateApi.bundleIdCacheController");
+public static MultiCache<UUID, UUID> bundleIdCacheController = new MultiCache<>("static-multi:DefaultSubscriptionBaseCreateApi.bundleIdCacheController");
 
     DefaultSubscriptionBaseCreateApi(final SubscriptionDao dao, final SubscriptionBaseApiService apiService, final Clock clock) {
         super(dao, apiService, clock);

diff --git a/tenant/src/main/java/org/killbill/billing/tenant/api/user/DefaultTenantUserApi.java b/tenant/src/main/java/org/killbill/billing/tenant/api/user/DefaultTenantUserApi.java
index b393344..7f98178 100644
--- a/tenant/src/main/java/org/killbill/billing/tenant/api/user/DefaultTenantUserApi.java
+++ b/tenant/src/main/java/org/killbill/billing/tenant/api/user/DefaultTenantUserApi.java
@@ -75,9 +75,9 @@ public class DefaultTenantUserApi implements TenantUserApi {
 
     private final TenantDao tenantDao;
     private final InternalCallContextFactory internalCallContextFactory;
-public static MultiCache<String, List<String>> tenantKVCache = new MultiCache<>("DefaultTenantUserApi.tenantKVCache");
+public static MultiCache<String, List<String>> tenantKVCache = new MultiCache<>("static-multi:DefaultTenantUserApi.tenantKVCache");
     // private final CacheController<String, String> tenantKVCache;
-public static MultiCache<String, Tenant> tenantCache = new MultiCache<>("DefaultTenantUserApi.tenantCache");
+public static MultiCache<String, Tenant> tenantCache = new MultiCache<>("static-multi:DefaultTenantUserApi.tenantCache");
     // private final CacheController<String, Tenant> tenantCache;
     private final TenantInternalApi tenantApi;
 

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 99e369a..fde15c8 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
@@ -113,8 +113,8 @@ public class DefaultAuditDao implements AuditDao {
 
     private Iterator<AuditLog> buildAuditLogsFromModelDao(final Iterator<AuditLogModelDao> auditLogsForAccountRecordId, final InternalTenantContext tenantContext) {
 
-MultiCache<TableName, Map<Long, UUID>> recordIdIdsCache = new MultiCache<>("DefaultAuditDao.recordIdIdsCache");
-MultiCache<TableName, Map<Long, UUID>> historyRecordIdIdsCache = new MultiCache<>("DefaultAuditDao.historyRecordIdIdsCache");
+MultiCache<TableName, Map<Long, UUID>> recordIdIdsCache = new MultiCache<>("instance-multi:DefaultAuditDao.recordIdIdsCache");
+MultiCache<TableName, Map<Long, UUID>> historyRecordIdIdsCache = new MultiCache<>("instance-multi:DefaultAuditDao.historyRecordIdIdsCache");
 
         // final Map<TableName, Map<Long, UUID>> recordIdIdsCache = new HashMap<TableName, Map<Long, UUID>>();
         // final Map<TableName, Map<Long, UUID>> historyRecordIdIdsCache = new HashMap<TableName, Map<Long, UUID>>();
@@ -197,7 +197,7 @@ try{
         }
     }
 
-public static MultiCache<Parameters, List<AuditLogWithHistory>> getAuditLogsWithHistoryForId = new MultiCache<>("DefaultAuditDao.getAuditLogsWithHistoryForId");
+public static MultiCache<Parameters, List<AuditLogWithHistory>> getAuditLogsWithHistoryForId = new MultiCache<>("static-multi:DefaultAuditDao.getAuditLogsWithHistoryForId");
 
     @Override
     public List<AuditLogWithHistory> getAuditLogsWithHistoryForId(final HistorySqlDao transactional, final TableName tableName, final UUID objectId, final AuditLevel auditLevel, final InternalTenantContext context) {
@@ -248,7 +248,7 @@ public static MultiCache<Parameters, List<AuditLogWithHistory>> getAuditLogsWith
         }
     }
 
-public static MultiCache<Parameters, List<AuditLogModelDao>> getAuditLogsViaHistoryForTargetRecordId = new MultiCache<>("DefaultAuditDao.getAuditLogsViaHistoryForTargetRecordId");
+public static MultiCache<Parameters, List<AuditLogModelDao>> getAuditLogsViaHistoryForTargetRecordId = new MultiCache<>("static-multi:DefaultAuditDao.getAuditLogsViaHistoryForTargetRecordId");
 
     private List<AuditLog> doGetAuditLogsViaHistoryForId(final TableName tableName, final UUID objectId, final AuditLevel auditLevel, final InternalTenantContext context) {
         final TableName historyTableName = tableName.getHistoryTableName();
@@ -274,7 +274,7 @@ public static MultiCache<Parameters, List<AuditLogModelDao>> getAuditLogsViaHist
         return filterAuditLogs(auditLevel, allAuditLogs);
     }
 
-public static MultiCache<Parameters, List<AuditLogModelDao>> getAuditLogsForTargetRecordId = new MultiCache<>("DefaultAuditDao.getAuditLogsForTargetRecordId");
+public static MultiCache<Parameters, List<AuditLogModelDao>> getAuditLogsForTargetRecordId = new MultiCache<>("static-multi:DefaultAuditDao.getAuditLogsForTargetRecordId");
 
     private List<AuditLog> getAuditLogsForRecordId(final TableName tableName, final UUID auditedEntityId, final Long targetRecordId, final AuditLevel auditLevel, final InternalTenantContext context) {
         final List<AuditLog> allAuditLogs = transactionalSqlDao.execute(true, new EntitySqlDaoTransactionWrapper<List<AuditLog>>() {

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 0d34afe..a8e61b8 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
@@ -38,7 +38,7 @@ public class DefaultAccountAuditLogs implements AccountAuditLogs {
     private final AuditLevel auditLevel;
     private final List<AuditLog> accountAuditLogs;
 
-private MultiCache<ObjectType, DefaultAccountAuditLogsForObjectType> auditLogsCache = new MultiCache<>("DefaultAccountAuditLogs.auditLogsCache");
+private MultiCache<ObjectType, DefaultAccountAuditLogsForObjectType> auditLogsCache = new MultiCache<>("instance-multi:DefaultAccountAuditLogs.auditLogsCache");
     // private final Map<ObjectType, DefaultAccountAuditLogsForObjectType> auditLogsCache = new HashMap<ObjectType, DefaultAccountAuditLogsForObjectType>();
 
     public DefaultAccountAuditLogs(final UUID accountId) {

diff --git a/util/src/main/java/org/killbill/billing/util/cache/CacheControllerDispatcher.java b/util/src/main/java/org/killbill/billing/util/cache/CacheControllerDispatcher.java
index 8ca96f8..e6c804e 100644
--- a/util/src/main/java/org/killbill/billing/util/cache/CacheControllerDispatcher.java
+++ b/util/src/main/java/org/killbill/billing/util/cache/CacheControllerDispatcher.java
@@ -37,17 +37,17 @@ public class CacheControllerDispatcher {
 
     public static final String CACHE_KEY_SEPARATOR = "::";
 
-public static MultiCache<String, Long> accountRecordIdCacheController = new MultiCache<>("CacheControllerDispatcher.accountRecordIdCacheController");
-public static MultiCache<String, Long> tenantRecordIdCacheController = new MultiCache<>("CacheControllerDispatcher.tenantRecordIdCacheController");
-public static MultiCache<String, Long> recordIdCacheController = new MultiCache<>("CacheControllerDispatcher.recordIdCacheController");
-public static MultiCache<String, List> auditLogViaHistory = new MultiCache<>("CacheControllerDispatcher.auditLogViaHistory");
-public static MultiCache<String, UUID> objectIdCacheController = new MultiCache<>("CacheControllerDispatcher.objectIdCacheController");
-public static MultiCache<String, List> auditLog = new MultiCache<>("CacheControllerDispatcher.auditLog");
-public static MultiCache<UUID, Integer> bcdCacheController = new MultiCache<>("CacheControllerDispatcher.bcdCacheController");
-public static MultiCache<Long, ImmutableAccountData> accountCacheController = new MultiCache<>("CacheControllerDispatcher.accountCacheController");
-public static MultiCache<Long, ImmutableAccountData> accountImmutableCacheController = new MultiCache<>("CacheControllerDispatcher.accountImmutableCacheController");
-public static MultiCache<UUID, UUID> accountIdCacheController = new MultiCache<>("CacheControllerDispatcher.accountIdCacheController");
-public static MultiCache<UUID, UUID> bundleIdCacheController = new MultiCache<>("CacheControllerDispatcher.bundleIdCacheController");
+public static MultiCache<String, Long> accountRecordIdCacheController = new MultiCache<>("static-multi:CacheControllerDispatcher.accountRecordIdCacheController");
+public static MultiCache<String, Long> tenantRecordIdCacheController = new MultiCache<>("static-multi:CacheControllerDispatcher.tenantRecordIdCacheController");
+public static MultiCache<String, Long> recordIdCacheController = new MultiCache<>("static-multi:CacheControllerDispatcher.recordIdCacheController");
+public static MultiCache<String, List> auditLogViaHistory = new MultiCache<>("static-multi:CacheControllerDispatcher.auditLogViaHistory");
+public static MultiCache<String, UUID> objectIdCacheController = new MultiCache<>("static-multi:CacheControllerDispatcher.objectIdCacheController");
+public static MultiCache<String, List> auditLog = new MultiCache<>("static-multi:CacheControllerDispatcher.auditLog");
+public static MultiCache<UUID, Integer> bcdCacheController = new MultiCache<>("static-multi:CacheControllerDispatcher.bcdCacheController");
+public static MultiCache<Long, ImmutableAccountData> accountCacheController = new MultiCache<>("static-multi:CacheControllerDispatcher.accountCacheController");
+public static MultiCache<Long, ImmutableAccountData> accountImmutableCacheController = new MultiCache<>("static-multi:CacheControllerDispatcher.accountImmutableCacheController");
+public static MultiCache<UUID, UUID> accountIdCacheController = new MultiCache<>("static-multi:CacheControllerDispatcher.accountIdCacheController");
+public static MultiCache<UUID, UUID> bundleIdCacheController = new MultiCache<>("static-multi:CacheControllerDispatcher.bundleIdCacheController");
 
 //     private final Map<CacheType, CacheController<Object, Object>> caches;
 

diff --git a/util/src/main/java/org/killbill/billing/util/config/tenant/MultiTenantConfigBase.java b/util/src/main/java/org/killbill/billing/util/config/tenant/MultiTenantConfigBase.java
index 8fd9b7a..614248f 100644
--- a/util/src/main/java/org/killbill/billing/util/config/tenant/MultiTenantConfigBase.java
+++ b/util/src/main/java/org/killbill/billing/util/config/tenant/MultiTenantConfigBase.java
@@ -36,7 +36,7 @@ import br.ufrgs.inf.prosoft.cache.*;
 
 public abstract class MultiTenantConfigBase {
 
-MultiCache<String, Method> methodsCache = new MultiCache<>("MultiTenantConfigBase.methodsCache");
+MultiCache<String, Method> methodsCache = new MultiCache<>("instance-multi:MultiTenantConfigBase.methodsCache");
 
     // private final Map<String, Method> methodsCache = new HashMap<String, Method>();
     // protected final CacheConfig cacheConfig;

diff --git a/util/src/main/java/org/killbill/billing/util/security/AnnotationHierarchicalResolver.java b/util/src/main/java/org/killbill/billing/util/security/AnnotationHierarchicalResolver.java
index a72d353..3bccb32 100644
--- a/util/src/main/java/org/killbill/billing/util/security/AnnotationHierarchicalResolver.java
+++ b/util/src/main/java/org/killbill/billing/util/security/AnnotationHierarchicalResolver.java
@@ -125,7 +125,7 @@ public class AnnotationHierarchicalResolver implements AnnotationResolver {
     }
 
 
-public static MultiCache<Class<?>, Boolean> isInterfaceWithAnnotatedMethods = new MultiCache<>("AnnotationHierarchicalResolver.isInterfaceWithAnnotatedMethods");
+public static MultiCache<Class<?>, Boolean> isInterfaceWithAnnotatedMethods = new MultiCache<>("static-multi:AnnotationHierarchicalResolver.isInterfaceWithAnnotatedMethods");
     // private static final Map<Class<?>, Boolean> annotatedInterfaceCache = new WeakHashMap<Class<?>, Boolean>();
 
     private static boolean isInterfaceWithAnnotatedMethods(final Class<?> iface) {