killbill-memoizeit

diff --git a/invoice/src/main/java/org/killbill/billing/invoice/usage/ContiguousIntervalConsumableInArrear.java b/invoice/src/main/java/org/killbill/billing/invoice/usage/ContiguousIntervalConsumableInArrear.java
index 2b6349b..bbb6de7 100644
--- a/invoice/src/main/java/org/killbill/billing/invoice/usage/ContiguousIntervalConsumableInArrear.java
+++ b/invoice/src/main/java/org/killbill/billing/invoice/usage/ContiguousIntervalConsumableInArrear.java
@@ -141,7 +141,7 @@ public class ContiguousIntervalConsumableInArrear {
 
             // Compute total price amount that should be billed for that period of time (and usage section) across unitTypes.
             BigDecimal toBeBilledUsage = BigDecimal.ZERO;
-            for (final RolledUpUnit cur : ru.getRolledUpUnit()) {
+            for (final RolledUpUnit cur : ru.getRolledUpUnits()) {
                 if (!unitTypes.contains(cur.getUnitType())) {
                     log.warn("ContiguousIntervalConsumableInArrear is skipping unitType " + cur.getUnitType());
                     continue;

diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/RolledUpUsageJson.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/RolledUpUsageJson.java
index 98f6812..0cc9bc6 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/RolledUpUsageJson.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/RolledUpUsageJson.java
@@ -18,13 +18,10 @@ package org.killbill.billing.jaxrs.json;
 
 import java.util.List;
 
-import javax.annotation.Nullable;
-
 import org.joda.time.LocalDate;
 import org.killbill.billing.usage.api.RolledUpUnit;
 import org.killbill.billing.usage.api.RolledUpUsage;
 
-import com.apple.jobjc.Invoke.FunCall;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Function;
@@ -42,7 +39,7 @@ public class RolledUpUsageJson {
     public RolledUpUsageJson(@JsonProperty("subscriptionId") final String subscriptionId,
                              @JsonProperty("startDate") final LocalDate startDate,
                              @JsonProperty("endDate") final LocalDate endDate,
-                             @JsonProperty("rolledUpUnit") final List<RolledUpUnitJson> rolledUpUnits) {
+                             @JsonProperty("rolledUpUnits") final List<RolledUpUnitJson> rolledUpUnits) {
         this.subscriptionId = subscriptionId;
         this.startDate = startDate;
         this.endDate = endDate;
@@ -50,7 +47,7 @@ public class RolledUpUsageJson {
     }
 
     public RolledUpUsageJson(final RolledUpUsage input) {
-        this(input.getSubscriptionId().toString(), input.getStart(), input.getEnd(), ImmutableList.copyOf(Iterables.transform(input.getRolledUpUnit(), new Function<RolledUpUnit, RolledUpUnitJson>() {
+        this(input.getSubscriptionId().toString(), input.getStart(), input.getEnd(), ImmutableList.copyOf(Iterables.transform(input.getRolledUpUnits(), new Function<RolledUpUnit, RolledUpUnitJson>() {
             @Override
             public RolledUpUnitJson apply(final RolledUpUnit input) {
                 return new RolledUpUnitJson(input);

diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/SubscriptionUsageRecordJson.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/SubscriptionUsageRecordJson.java
index a7c5cd3..06caa2d 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/SubscriptionUsageRecordJson.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/SubscriptionUsageRecordJson.java
@@ -17,12 +17,9 @@
 
 package org.killbill.billing.jaxrs.json;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 
-import javax.annotation.Nullable;
-
 import org.joda.time.LocalDate;
 import org.killbill.billing.usage.api.SubscriptionUsageRecord;
 import org.killbill.billing.usage.api.UnitUsageRecord;
@@ -41,7 +38,7 @@ public class SubscriptionUsageRecordJson {
 
     @JsonCreator
     public SubscriptionUsageRecordJson(@JsonProperty("subscriptionId") final String subscriptionId,
-                                   @JsonProperty("unitUsageRecords") final List<UnitUsageRecordJson> unitUsageRecords) {
+                                       @JsonProperty("unitUsageRecords") final List<UnitUsageRecordJson> unitUsageRecords) {
         this.subscriptionId = subscriptionId;
         this.unitUsageRecords = unitUsageRecords;
     }
@@ -61,7 +58,7 @@ public class SubscriptionUsageRecordJson {
 
         @JsonCreator
         public UnitUsageRecordJson(@JsonProperty("unitType") final String unitType,
-                                    @JsonProperty("usageRecords") final List<UsageRecordJson> usageRecords) {
+                                   @JsonProperty("usageRecords") final List<UsageRecordJson> usageRecords) {
             this.unitType = unitType;
             this.usageRecords = usageRecords;
         }

diff --git a/usage/src/main/java/org/killbill/billing/usage/api/user/DefaultRolledUpUsage.java b/usage/src/main/java/org/killbill/billing/usage/api/user/DefaultRolledUpUsage.java
index d28244c..c56a32a 100644
--- a/usage/src/main/java/org/killbill/billing/usage/api/user/DefaultRolledUpUsage.java
+++ b/usage/src/main/java/org/killbill/billing/usage/api/user/DefaultRolledUpUsage.java
@@ -53,7 +53,7 @@ public class DefaultRolledUpUsage implements RolledUpUsage {
     }
 
     @Override
-    public List<RolledUpUnit> getRolledUpUnit() {
+    public List<RolledUpUnit> getRolledUpUnits() {
         return rolledUpUnits;
     }
 }

diff --git a/usage/src/main/java/org/killbill/billing/usage/api/user/DefaultUsageUserApi.java b/usage/src/main/java/org/killbill/billing/usage/api/user/DefaultUsageUserApi.java
index e1020f5..1feb447 100644
--- a/usage/src/main/java/org/killbill/billing/usage/api/user/DefaultUsageUserApi.java
+++ b/usage/src/main/java/org/killbill/billing/usage/api/user/DefaultUsageUserApi.java
@@ -55,7 +55,7 @@ public class DefaultUsageUserApi implements UsageUserApi {
     @Override
     public void recordRolledUpUsage(final SubscriptionUsageRecord record, final CallContext callContext) {
         final InternalCallContext internalCallContext = internalCallContextFactory.createInternalCallContext(record.getSubscriptionId(), ObjectType.SUBSCRIPTION, callContext);
-        for (UnitUsageRecord unitUsageRecord : record.getPerUnitUsage()) {
+        for (UnitUsageRecord unitUsageRecord : record.getUnitUsageRecord()) {
             for (UsageRecord usageRecord : unitUsageRecord.getDailyAmount()) {
                 rolledUpUsageDao.record(record.getSubscriptionId(), unitUsageRecord.getUnitType(), usageRecord.getDate(), usageRecord.getAmount(), internalCallContext);
             }