2/5/2015 6:52:52 PM
Meyer <pierre@mouraf.org>
|
2/5/2015 4:09:52 PM
ITEM_ADJ and TAX items from plugins
* Allow only EXTERNAL_CHARGE, FIXED, RECURRING, TAX and USAGE items to be adjusted
Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>
|
2/4/2015 11:02:59 PM
blocking states
Update DefaultBlockingState to use the record_id (a.k.a totalOrdering) to break ties
in compareTo. For consistency, the Ordering DefaultBlockingStateDao#BLOCKING_STATE_MODEL_DAO_ORDERING
for BlockingStateModelDao has been updated to do the same.
Simplify ProxyBlockingStateDao and get rid of the custom Ordering BLOCKING_STATE_ORDERING_WITH_TIES_UNHANDLED:
initial sorting now simply uses the natural compareTo method.
Remove the custom and unnecessary re-ordering in DefaultSubscriptionBundleTimeline. This also fixes the arbitrary
ordering that was done using the Enum ordinal for events in the same day: the implementation now imposes
conventions (such as START_ENTITLEMENT always being first) but otherwise keeps the ordering returned by the
lower layers. This makes sure multiple PAUSE/RESUME events in the same day are correctly ordered
for instance.
Additionally, the implementation of DefaultBlockingState#equals and DefaultBlockingState#hashCode has been fixed:
the latter was causing look-alike events to be dropped in sets.
This fixes https://github.com/killbill/killbill/issues/258.
Integration test: https://github.com/killbill/killbill-integration-tests/commit/1bfa8b23fc2d591db0986a82669d0e631a1ca53b.
Note: TestDefaultSubscriptionBundleTimeline#testWithOverdueOffline has been temporarily disabled. The changes modified the
output of the test (SERVICE_STATE_CHANGE is now PAUSE_ENTITLEMENT) and I'm not quite sure what we want.
Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>
|
2/4/2015 8:55:35 PM
Meyer <pierre@mouraf.org>
|
2/4/2015 1:56:32 PM
item adjustments can be applied to TAX items for instance,
without corrupting the AccountItemTree.
Corresponding integration test:
https://github.com/killbill/killbill-integration-tests/commit/8490fab5ce48e7b493f782c50553b5ea7a55d3a4
Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>
|
2/4/2015 1:55:08 PM
Meyer <pierre@mouraf.org>
|
2/4/2015 1:53:36 PM
can be null when playing with the clock.
See https://github.com/killbill/killbill/issues/214.
Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>
|
2/4/2015 1:51:14 PM
Pierre-Alexandre Meyer <pierre@mouraf.org>
|
2/1/2015 8:11:20 PM
Pierre-Alexandre Meyer <pierre@mouraf.org>
|
1/30/2015 9:42:56 PM
Pierre-Alexandre Meyer <pierre@mouraf.org>
|
