killbill-memoizeit

diff --git a/api/src/main/java/org/killbill/billing/tenant/api/TenantInternalApi.java b/api/src/main/java/org/killbill/billing/tenant/api/TenantInternalApi.java
index a0bb81a..cf29529 100644
--- a/api/src/main/java/org/killbill/billing/tenant/api/TenantInternalApi.java
+++ b/api/src/main/java/org/killbill/billing/tenant/api/TenantInternalApi.java
@@ -52,5 +52,5 @@ public interface TenantInternalApi {
 
     public String getPluginConfig(String pluginName, InternalTenantContext tenantContext);
 
-    public List<String> getTenantValueForKey(final String key, final InternalTenantContext tenantContext);
+    public List<String> getTenantValuesForKey(final String key, final InternalTenantContext tenantContext);
 }

diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/InvoiceResource.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/InvoiceResource.java
index 09e03db..4411446 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/InvoiceResource.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/InvoiceResource.java
@@ -756,7 +756,7 @@ public class InvoiceResource extends JaxRsResourceBase {
 
         final CallContext callContext = context.createContext(createdBy, reason, comment, request);
 
-        if (!tenantApi.getTenantValueForKey(tenantKeyStr, callContext).isEmpty()) {
+        if (!tenantApi.getTenantValuesForKey(tenantKeyStr, callContext).isEmpty()) {
             if (deleteIfExists) {
                 tenantApi.deleteTenantKey(tenantKeyStr, callContext);
             } else {
@@ -774,7 +774,7 @@ public class InvoiceResource extends JaxRsResourceBase {
         final String tenantKeyStr = localeStr != null ?
                                     LocaleUtils.localeString(LocaleUtils.toLocale(localeStr), tenantKey.toString()) :
                                     tenantKey.toString();
-        final List<String> result = tenantApi.getTenantValueForKey(tenantKeyStr, tenantContext);
+        final List<String> result = tenantApi.getTenantValuesForKey(tenantKeyStr, tenantContext);
         return result.isEmpty() ? Response.status(Status.NOT_FOUND).build() : Response.status(Status.OK).entity(result.get(0)).build();
     }
 

diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/TenantResource.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/TenantResource.java
index af66b29..977537d 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/TenantResource.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/TenantResource.java
@@ -232,7 +232,7 @@ public class TenantResource extends JaxRsResourceBase {
                                   final HttpServletRequest request) throws TenantApiException {
         final TenantContext tenantContext = context.createContext(request);
         final String tenantKey = keyPostfix != null ? key.toString() + keyPostfix : key.toString();
-        final List<String> values = tenantApi.getTenantValueForKey(tenantKey, tenantContext);
+        final List<String> values = tenantApi.getTenantValuesForKey(tenantKey, tenantContext);
         final TenantKeyJson result = new TenantKeyJson(tenantKey, values);
         return Response.status(Status.OK).entity(result).build();
     }

diff --git a/overdue/src/main/java/org/killbill/billing/overdue/api/DefaultOverdueApi.java b/overdue/src/main/java/org/killbill/billing/overdue/api/DefaultOverdueApi.java
index 28b8899..a0294f3 100644
--- a/overdue/src/main/java/org/killbill/billing/overdue/api/DefaultOverdueApi.java
+++ b/overdue/src/main/java/org/killbill/billing/overdue/api/DefaultOverdueApi.java
@@ -54,7 +54,7 @@ public class DefaultOverdueApi implements OverdueApi {
         try {
             final InternalTenantContext internalTenantContext = createInternalTenantContext(callContext);
             final String tenantKey = TenantKey.OVERDUE_CONFIG.toString();
-            if (!tenantApi.getTenantValueForKey(tenantKey, callContext).isEmpty()) {
+            if (!tenantApi.getTenantValuesForKey(tenantKey, callContext).isEmpty()) {
                 tenantApi.deleteTenantKey(tenantKey, callContext);
             }
             tenantApi.addTenantKeyValue(tenantKey, overdueXML, callContext);

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 f7342cd..9999351 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
@@ -109,6 +109,6 @@ public class PushNotificationListener {
     }
 
     private List<String> getCallbacksForTenant(final TenantContext context) throws TenantApiException {
-        return tenantApi.getTenantValueForKey(TenantKey.PUSH_NOTIFICATION_CB.toString(), context);
+        return tenantApi.getTenantValuesForKey(TenantKey.PUSH_NOTIFICATION_CB.toString(), context);
     }
 }

diff --git a/tenant/src/main/java/org/killbill/billing/tenant/api/DefaultTenantInternalApi.java b/tenant/src/main/java/org/killbill/billing/tenant/api/DefaultTenantInternalApi.java
index ebfa5fd..9b12658 100644
--- a/tenant/src/main/java/org/killbill/billing/tenant/api/DefaultTenantInternalApi.java
+++ b/tenant/src/main/java/org/killbill/billing/tenant/api/DefaultTenantInternalApi.java
@@ -101,7 +101,7 @@ public class DefaultTenantInternalApi implements TenantInternalApi {
     }
 
     @Override
-    public List<String> getTenantValueForKey(final String key, final InternalTenantContext tenantContext) {
+    public List<String> getTenantValuesForKey(final String key, final InternalTenantContext tenantContext) {
         return tenantDao.getTenantValueForKey(key, tenantContext);
     }
 

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 d4728f1..d7417e6 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
@@ -107,7 +107,7 @@ public class DefaultTenantUserApi implements TenantUserApi {
     }
 
     @Override
-    public List<String> getTenantValueForKey(final String key, final TenantContext context)
+    public List<String> getTenantValuesForKey(final String key, final TenantContext context)
             throws TenantApiException {
 
         final InternalTenantContext internalContext = internalCallContextFactory.createInternalTenantContext(context);
@@ -121,12 +121,6 @@ public class DefaultTenantUserApi implements TenantUserApi {
     @Override
     public void addTenantKeyValue(final String key, final String value, final CallContext context)
             throws TenantApiException {
-        /*
-        final Tenant tenant = tenantDao.getById(tenantId, new InternalTenantContext(null, null));
-        if (tenant == null) {
-            throw new TenantApiException(ErrorCode.TENANT_DOES_NOT_EXIST_FOR_ID, tenantId);
-        }
-        */
 
         final InternalCallContext internalContext = internalCallContextFactory.createInternalCallContext(context);
         final String tenantKey = getCacheKeyName(key, internalContext);
@@ -138,12 +132,6 @@ public class DefaultTenantUserApi implements TenantUserApi {
     @Override
     public void deleteTenantKey(final String key, final CallContext context)
             throws TenantApiException {
-        /*
-        final Tenant tenant = tenantDao.getById(tenantId, new InternalTenantContext(null, null));
-        if (tenant == null) {
-            throw new TenantApiException(ErrorCode.TENANT_DOES_NOT_EXIST_FOR_ID, tenantId);
-        }
-        */
 
         // Invalidate tenantKVCache before we store. Multi-node invalidation will follow the TenantBroadcast pattern
         final InternalCallContext internalContext = internalCallContextFactory.createInternalCallContext(context);

diff --git a/tenant/src/main/java/org/killbill/billing/tenant/dao/DefaultTenantDao.java b/tenant/src/main/java/org/killbill/billing/tenant/dao/DefaultTenantDao.java
index 2b5b55a..97d7721 100644
--- a/tenant/src/main/java/org/killbill/billing/tenant/dao/DefaultTenantDao.java
+++ b/tenant/src/main/java/org/killbill/billing/tenant/dao/DefaultTenantDao.java
@@ -138,7 +138,7 @@ public class DefaultTenantDao extends EntityDaoBase<TenantModelDao, Tenant, Tena
                     deleteFromTransaction(key, entitySqlDaoWrapperFactory, context);
                 }
                 tenantKVSqlDao.create(tenantKVModelDao, context);
-                broadcastConfigurationChangeFromTransaction(entitySqlDaoWrapperFactory, key, context);
+                broadcastConfigurationChangeFromTransaction(key, entitySqlDaoWrapperFactory, context);
                 return null;
             }
         });
@@ -150,10 +150,10 @@ public class DefaultTenantDao extends EntityDaoBase<TenantModelDao, Tenant, Tena
         transactionalSqlDao.execute(new EntitySqlDaoTransactionWrapper<Void>() {
             @Override
             public Void inTransaction(final EntitySqlDaoWrapperFactory entitySqlDaoWrapperFactory) throws Exception {
-                broadcastConfigurationChangeFromTransaction(entitySqlDaoWrapperFactory, key, context);
-                return deleteFromTransaction(key, entitySqlDaoWrapperFactory, context);
+                deleteFromTransaction(key, entitySqlDaoWrapperFactory, context);
+                broadcastConfigurationChangeFromTransaction(key, entitySqlDaoWrapperFactory, context);
+                return null;
             }
-
         });
     }
 
@@ -167,8 +167,8 @@ public class DefaultTenantDao extends EntityDaoBase<TenantModelDao, Tenant, Tena
         return null;
     }
 
-    private void broadcastConfigurationChangeFromTransaction(final EntitySqlDaoWrapperFactory entitySqlDaoWrapperFactory,
-                                                             final String key, final InternalCallContext context) throws EntityPersistenceException {
+    private void broadcastConfigurationChangeFromTransaction(final String key, final EntitySqlDaoWrapperFactory entitySqlDaoWrapperFactory,
+                                                             final InternalCallContext context) throws EntityPersistenceException {
         if (isSystemKey(key)) {
             final TenantBroadcastModelDao broadcast = new TenantBroadcastModelDao(key);
             entitySqlDaoWrapperFactory.become(TenantBroadcastSqlDao.class).create(broadcast, context);

diff --git a/tenant/src/test/java/org/killbill/billing/tenant/api/user/TestDefaultTenantUserApi.java b/tenant/src/test/java/org/killbill/billing/tenant/api/user/TestDefaultTenantUserApi.java
index dfb73f7..8903d88 100644
--- a/tenant/src/test/java/org/killbill/billing/tenant/api/user/TestDefaultTenantUserApi.java
+++ b/tenant/src/test/java/org/killbill/billing/tenant/api/user/TestDefaultTenantUserApi.java
@@ -30,19 +30,19 @@ public class TestDefaultTenantUserApi extends TenantTestSuiteWithEmbeddedDb {
     public void testUserKey() throws Exception {
         tenantUserApi.addTenantKeyValue("THE_KEY", "TheValue", callContext);
 
-        List<String> value = tenantUserApi.getTenantValueForKey("THE_KEY", callContext);
+        List<String> value = tenantUserApi.getTenantValuesForKey("THE_KEY", callContext);
         Assert.assertEquals(value.size(), 1);
         Assert.assertEquals(value.get(0), "TheValue");
 
         tenantUserApi.addTenantKeyValue("THE_KEY", "TheSecondValue", callContext);
-        value = tenantUserApi.getTenantValueForKey("THE_KEY", callContext);
+        value = tenantUserApi.getTenantValuesForKey("THE_KEY", callContext);
         Assert.assertEquals(value.size(), 2);
 
-        value = tenantUserApi.getTenantValueForKey("THE_KEY", callContext);
+        value = tenantUserApi.getTenantValuesForKey("THE_KEY", callContext);
         Assert.assertEquals(value.size(), 2);
 
         tenantUserApi.deleteTenantKey("THE_KEY", callContext);
-        value = tenantUserApi.getTenantValueForKey("THE_KEY", callContext);
+        value = tenantUserApi.getTenantValuesForKey("THE_KEY", callContext);
         Assert.assertEquals(value.size(), 0);
     }
 
@@ -53,27 +53,27 @@ public class TestDefaultTenantUserApi extends TenantTestSuiteWithEmbeddedDb {
 
         tenantUserApi.addTenantKeyValue(tenantKey, "TheValue", callContext);
 
-        List<String> value = tenantUserApi.getTenantValueForKey(tenantKey, callContext);
+        List<String> value = tenantUserApi.getTenantValuesForKey(tenantKey, callContext);
         Assert.assertEquals(value.size(), 1);
         Assert.assertEquals(value.get(0), "TheValue");
 
         // Warm cache
-        value = tenantUserApi.getTenantValueForKey(tenantKey, callContext);
+        value = tenantUserApi.getTenantValuesForKey(tenantKey, callContext);
         Assert.assertEquals(value.size(), 1);
         Assert.assertEquals(value.get(0), "TheValue");
 
         tenantUserApi.addTenantKeyValue(tenantKey, "TheSecondValue", callContext);
-        value = tenantUserApi.getTenantValueForKey(tenantKey, callContext);
+        value = tenantUserApi.getTenantValuesForKey(tenantKey, callContext);
         Assert.assertEquals(value.size(), 1);
         Assert.assertEquals(value.get(0), "TheSecondValue");
 
         // Warm cache
-        value = tenantUserApi.getTenantValueForKey(tenantKey, callContext);
+        value = tenantUserApi.getTenantValuesForKey(tenantKey, callContext);
         Assert.assertEquals(value.size(), 1);
         Assert.assertEquals(value.get(0), "TheSecondValue");
 
         tenantUserApi.deleteTenantKey(tenantKey, callContext);
-        value = tenantUserApi.getTenantValueForKey(tenantKey, callContext);
+        value = tenantUserApi.getTenantValuesForKey(tenantKey, callContext);
         Assert.assertEquals(value.size(), 0);
     }
 
@@ -84,16 +84,16 @@ public class TestDefaultTenantUserApi extends TenantTestSuiteWithEmbeddedDb {
 
         tenantUserApi.addTenantKeyValue(tenantKey, "TheValue", callContext);
 
-        List<String> value = tenantUserApi.getTenantValueForKey(tenantKey, callContext);
+        List<String> value = tenantUserApi.getTenantValuesForKey(tenantKey, callContext);
         Assert.assertEquals(value.size(), 1);
         Assert.assertEquals(value.get(0), "TheValue");
 
         tenantUserApi.addTenantKeyValue(tenantKey, "TheSecondValue", callContext);
-        value = tenantUserApi.getTenantValueForKey(tenantKey, callContext);
+        value = tenantUserApi.getTenantValuesForKey(tenantKey, callContext);
         Assert.assertEquals(value.size(), 2);
 
         tenantUserApi.deleteTenantKey(tenantKey, callContext);
-        value = tenantUserApi.getTenantValueForKey(tenantKey, callContext);
+        value = tenantUserApi.getTenantValuesForKey(tenantKey, callContext);
         Assert.assertEquals(value.size(), 0);
     }
 

diff --git a/util/src/main/java/org/killbill/billing/util/cache/TenantKVCacheLoader.java b/util/src/main/java/org/killbill/billing/util/cache/TenantKVCacheLoader.java
index 1e6cea2..706d451 100644
--- a/util/src/main/java/org/killbill/billing/util/cache/TenantKVCacheLoader.java
+++ b/util/src/main/java/org/killbill/billing/util/cache/TenantKVCacheLoader.java
@@ -61,7 +61,7 @@ public class TenantKVCacheLoader extends BaseCacheLoader {
         final String tenantRecordId = parts[1];
 
         final InternalTenantContext internalTenantContext = new InternalTenantContext(Long.valueOf(tenantRecordId));
-        final List<String> valuesForKey = tenantApi.getTenantValueForKey(rawKey, internalTenantContext);
+        final List<String> valuesForKey = tenantApi.getTenantValuesForKey(rawKey, internalTenantContext);
         if (valuesForKey == null || valuesForKey.size() == 0) {
             return null;
         }