killbill-memoizeit

Merge remote-tracking branch 'origin/work-for-release-0.19.x'

4/10/2018 9:10:32 AM

Details

diff --git a/catalog/src/main/java/org/killbill/billing/catalog/VersionedCatalog.java b/catalog/src/main/java/org/killbill/billing/catalog/VersionedCatalog.java
index 73dfb28..32018fd 100644
--- a/catalog/src/main/java/org/killbill/billing/catalog/VersionedCatalog.java
+++ b/catalog/src/main/java/org/killbill/billing/catalog/VersionedCatalog.java
@@ -278,6 +278,7 @@ public class VersionedCatalog extends ValidatingConfig<VersionedCatalog> impleme
         return versionForDate(requestedDate).getCurrentSupportedCurrencies();
     }
 
+    @Override
     public Unit[] getUnits(final DateTime requestedDate) throws CatalogApiException {
         return versionForDate(requestedDate).getCurrentUnits();
     }
diff --git a/catalog/src/test/java/org/killbill/billing/catalog/MockCatalog.java b/catalog/src/test/java/org/killbill/billing/catalog/MockCatalog.java
index 5c788a0..1744d0d 100644
--- a/catalog/src/test/java/org/killbill/billing/catalog/MockCatalog.java
+++ b/catalog/src/test/java/org/killbill/billing/catalog/MockCatalog.java
@@ -41,6 +41,7 @@ import org.killbill.billing.catalog.api.PlanSpecifier;
 import org.killbill.billing.catalog.api.PriceList;
 import org.killbill.billing.catalog.api.PriceListSet;
 import org.killbill.billing.catalog.api.Product;
+import org.killbill.billing.catalog.api.Unit;
 import org.killbill.billing.catalog.rules.DefaultCaseCancelPolicy;
 import org.killbill.billing.catalog.rules.DefaultCaseChangePlanAlignment;
 import org.killbill.billing.catalog.rules.DefaultCaseChangePlanPolicy;
@@ -110,6 +111,11 @@ public class MockCatalog extends StandaloneCatalog implements Catalog {
     }
 
     @Override
+    public Unit[] getUnits(final DateTime requestedDate) throws CatalogApiException {
+        return getCurrentUnits();
+    }
+
+    @Override
     public Collection<Product> getProducts(final DateTime requestedDate) throws CatalogApiException {
         return getCurrentProducts();
     }

pom.xml 2(+1 -1)

diff --git a/pom.xml b/pom.xml
index f095047..f2bbd41 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>killbill-oss-parent</artifactId>
         <groupId>org.kill-bill.billing</groupId>
-        <version>0.141.51</version>
+        <version>0.141.54</version>
     </parent>
     <artifactId>killbill</artifactId>
     <version>0.19.9-SNAPSHOT</version>