killbill-memoizeit

Details

diff --git a/catalog/src/test/resources/UsageExperimental.xml b/catalog/src/test/resources/UsageExperimental.xml
index ecba573..d188bc6 100644
--- a/catalog/src/test/resources/UsageExperimental.xml
+++ b/catalog/src/test/resources/UsageExperimental.xml
@@ -68,9 +68,11 @@
                         </price>
                     </recurringPrice>
                 </recurring>
-                <usage billingMode="IN_ADVANCE" type="CONSUMABLE">
-                    <!-- ... -->
-                </usage>
+                <usages>
+                    <usage billingMode="IN_ADVANCE" type="CONSUMABLE">
+                        <!-- ... -->
+                    </usage>
+                </usages>
             </finalPhase>
         </plan>
 
@@ -84,23 +86,25 @@
                     <unit>UNLIMITED</unit>
                 </duration>
 
-                <usage billingMode="IN_ADVANCE" type="CAPACITY">
-                    <billingPeriod>MONTHLY</billingPeriod>
-                    <limits>
-                        <limit>
-                            <unit>members</unit>
-                            <max>100</max>
-                        </limit>
-                    </limits>
-                    <prices>
-                        <recurringPrice>
-                            <price>
-                                <currency>BTC</currency>
-                                <value>100.00</value>
-                            </price>
-                        </recurringPrice>
-                    </prices>
-                </usage>
+                <usages>
+                    <usage billingMode="IN_ADVANCE" type="CAPACITY">
+                        <billingPeriod>MONTHLY</billingPeriod>
+                        <limits>
+                            <limit>
+                                <unit>members</unit>
+                                <max>100</max>
+                            </limit>
+                        </limits>
+                        <prices>
+                            <recurringPrice>
+                                <price>
+                                    <currency>BTC</currency>
+                                    <value>100.00</value>
+                                </price>
+                            </recurringPrice>
+                        </prices>
+                    </usage>
+                </usages>
             </finalPhase>
         </plan>
 
@@ -122,19 +126,21 @@
                         </price>
                     </recurringPrice>
                 </recurring>
-                <usage billingMode="IN_ADVANCE" type="CONSUMABLE">
-                    <billingPeriod>MONTHLY</billingPeriod>
-                    <limits>
-                        <limit>
-                            <unit>minutes</unit>
-                            <increment>1000</increment>
-                            <price>
-                                <currency>BTC</currency>
-                                <value>0.01</value>
-                            </price>
-                        </limit>
-                    </limits>
-                </usage>
+                <usages>
+                    <usage billingMode="IN_ADVANCE" type="CONSUMABLE">
+                        <billingPeriod>MONTHLY</billingPeriod>
+                        <limits>
+                            <limit>
+                                <unit>minutes</unit>
+                                <increment>1000</increment>
+                                <price>
+                                    <currency>BTC</currency>
+                                    <value>0.01</value>
+                                </price>
+                            </limit>
+                        </limits>
+                    </usage>
+                </usages>
             </finalPhase>
         </plan>
 
@@ -148,21 +154,23 @@
                     <unit>UNLIMITED</unit>
                 </duration>
 
-                <usage billingMode="IN_ADVANCE" type="CONSUMABLE">
-                    <billingPeriod>NO_BILLING_PERIOD</billingPeriod>
-                    <limits>
-                        <limit>
-                            <unit>fasttrack_tokens</unit>
-                            <min>5</min>
-                            <increment>10</increment>
-                            <price>
-                                <currency>BTC</currency>
-                                <value>0.5</value>
-                            </price>
-
-                        </limit>
-                    </limits>
-                </usage>
+                <usages>
+                    <usage billingMode="IN_ADVANCE" type="CONSUMABLE">
+                        <billingPeriod>NO_BILLING_PERIOD</billingPeriod>
+                        <limits>
+                            <limit>
+                                <unit>fasttrack_tokens</unit>
+                                <min>5</min>
+                                <increment>10</increment>
+                                <price>
+                                    <currency>BTC</currency>
+                                    <value>0.5</value>
+                                </price>
+
+                            </limit>
+                        </limits>
+                    </usage>
+                </usages>
             </finalPhase>
         </plan>
 
@@ -176,30 +184,32 @@
                     <unit>UNLIMITED</unit>
                 </duration>
 
-                <usage billingMode="IN_ARREAR" type="CAPACITY">
-                    <billingPeriod>MONTHLY</billingPeriod>
-                    <limits>
-                        <limit>
-                            <unit>bandwith (Meg/sec)</unit>
-                            <tiers>
-                                <tier>
-                                    <max>10</max>
-                                    <price>
-                                        <currency>BTC</currency>
-                                        <value>0.5</value>
-                                    </price>
-                                </tier>
-                                <tier>
-                                    <max>20</max>
-                                    <price>
-                                        <currency>BTC</currency>
-                                        <value>1.0</value>
-                                    </price>
-                                </tier>
-                            </tiers>
-                        </limit>
-                    </limits>
-                </usage>
+                <usages>
+                    <usage billingMode="IN_ARREAR" type="CAPACITY">
+                        <billingPeriod>MONTHLY</billingPeriod>
+                        <limits>
+                            <limit>
+                                <unit>bandwith (Meg/sec)</unit>
+                                <tiers>
+                                    <tier>
+                                        <max>10</max>
+                                        <price>
+                                            <currency>BTC</currency>
+                                            <value>0.5</value>
+                                        </price>
+                                    </tier>
+                                    <tier>
+                                        <max>20</max>
+                                        <price>
+                                            <currency>BTC</currency>
+                                            <value>1.0</value>
+                                        </price>
+                                    </tier>
+                                </tiers>
+                            </limit>
+                        </limits>
+                    </usage>
+                </usages>
             </finalPhase>
         </plan>
 
@@ -212,31 +222,33 @@
                 <duration>
                     <unit>UNLIMITED</unit>
                 </duration>
-                <usage billingMode="IN_ARREAR" type="CONSUMABLE">
-                    <billingPeriod>MONTHLY</billingPeriod>
-                    <tiers>
-                        <tier>
-                            <limits>
-                                <limit>
-                                    <unit>minutes</unit>
-                                    <max>1000</max>
-                                    <price>
-                                        <currency>BTC</currency>
-                                        <value>0.5</value>
-                                    </price>
-                                </limit>
-                                <limit>
-                                    <unit>Mbytes</unit>
-                                    <max>512</max>
-                                    <price>
-                                        <currency>BTC</currency>
-                                        <value>1.0</value>
-                                    </price>
-                                </limit>
-                            </limits>
-                        </tier>
-                    </tiers>
-                </usage>
+                <usages>
+                    <usage billingMode="IN_ARREAR" type="CONSUMABLE">
+                        <billingPeriod>MONTHLY</billingPeriod>
+                        <tiers>
+                            <tier>
+                                <limits>
+                                    <limit>
+                                        <unit>minutes</unit>
+                                        <max>1000</max>
+                                        <price>
+                                            <currency>BTC</currency>
+                                            <value>0.5</value>
+                                        </price>
+                                    </limit>
+                                    <limit>
+                                        <unit>Mbytes</unit>
+                                        <max>512</max>
+                                        <price>
+                                            <currency>BTC</currency>
+                                            <value>1.0</value>
+                                        </price>
+                                    </limit>
+                                </limits>
+                            </tier>
+                        </tiers>
+                    </usage>
+                </usages>
             </finalPhase>
         </plan>