killbill-memoizeit
Changes
NEWS 5(+4 -1)
Details
NEWS 5(+4 -1)
diff --git a/NEWS b/NEWS
index c47700d..2874ecc 100644
--- a/NEWS
+++ b/NEWS
@@ -76,7 +76,7 @@
Fix JDBC connection leak in pagination API. Fixes #853
Fix limitation where catalog plan name cannot end with an number. Fixes #842
Reduce log level of InvoiceItemGeneratorLogger. Fixes #851
- Usage detail/aggregate mode. Fixes #839
+ Usage detail/aggregate mode. Fixes #839
Add metadata detail field to external charges. Fixes #843
Add ability to void invoices. Fixes #833
@@ -94,6 +94,9 @@
0.19.0
Initial dev release
+0.18.22
+ See https://github.com/killbill/killbill/releases/tag/killbill-0.18.22
+
0.18.21
Fix for NPE if the only available usage is before the first transition date
https://github.com/killbill/killbill/releases/tag/killbill-0.18.21
diff --git a/payment/src/main/java/org/killbill/billing/payment/core/PaymentRefresher.java b/payment/src/main/java/org/killbill/billing/payment/core/PaymentRefresher.java
index d3e8d4c..29d3c60 100644
--- a/payment/src/main/java/org/killbill/billing/payment/core/PaymentRefresher.java
+++ b/payment/src/main/java/org/killbill/billing/payment/core/PaymentRefresher.java
@@ -349,7 +349,12 @@ public class PaymentRefresher extends ProcessorBase {
// Cannot easily stream here unfortunately, since we need to merge PaymentTransactionInfoPlugin into Payment (no order assumed)
final Multimap<UUID, PaymentTransactionInfoPlugin> payments = HashMultimap.<UUID, PaymentTransactionInfoPlugin>create();
for (final PaymentTransactionInfoPlugin paymentTransactionInfoPlugin : paymentTransactionInfoPlugins) {
- payments.put(paymentTransactionInfoPlugin.getKbPaymentId(), paymentTransactionInfoPlugin);
+ if (paymentTransactionInfoPlugin.getKbPaymentId() == null) {
+ // Garbage from the plugin?
+ log.debug("Plugin {} returned a payment without a kbPaymentId for searchKey {}", pluginName, searchKey);
+ } else {
+ payments.put(paymentTransactionInfoPlugin.getKbPaymentId(), paymentTransactionInfoPlugin);
+ }
}
final Collection<Payment> results = new LinkedList<Payment>();
diff --git a/profiles/killbill/src/main/resources/update-checker/killbill-server-update-list.properties b/profiles/killbill/src/main/resources/update-checker/killbill-server-update-list.properties
index a9b4e83..abbeecd 100644
--- a/profiles/killbill/src/main/resources/update-checker/killbill-server-update-list.properties
+++ b/profiles/killbill/src/main/resources/update-checker/killbill-server-update-list.properties
@@ -100,121 +100,126 @@
### 0.18.x series ###
+# 0.18.22
+0.18.22.updates =
+0.18.22.notices = This is the latest GA release.
+0.18.22.release-notes = https://github.com/killbill/killbill/releases/tag/killbill-0.18.22
+
# 0.18.21
-0.18.21.updates =
-0.18.21.notices = This is the latest GA release.
+0.18.21.updates = 0.18.22
+0.18.21.notices = We recommend upgrading to 0.18.22, our latest GA release.
0.18.21.release-notes = https://github.com/killbill/killbill/releases/tag/killbill-0.18.21
# 0.18.20
-0.18.20.updates = 0.18.21
-0.18.20.notices = We recommend upgrading to 0.18.21, our latest GA release.
+0.18.20.updates = 0.18.22
+0.18.20.notices = We recommend upgrading to 0.18.22, our latest GA release.
0.18.20.release-notes = https://github.com/killbill/killbill/releases/tag/killbill-0.18.20
# 0.18.19
-0.18.19.updates = 0.18.21
-0.18.19.notices = We recommend upgrading to 0.18.21, our latest GA release.
+0.18.19.updates = 0.18.22
+0.18.19.notices = We recommend upgrading to 0.18.22, our latest GA release.
0.18.19.release-notes = https://github.com/killbill/killbill/releases/tag/killbill-0.18.19
# 0.18.18
-0.18.18.updates = 0.18.21
-0.18.18.notices = We recommend upgrading to 0.18.21, our latest GA release.
+0.18.18.updates = 0.18.22
+0.18.18.notices = We recommend upgrading to 0.18.22, our latest GA release.
0.18.18.release-notes = https://github.com/killbill/killbill/releases/tag/killbill-0.18.18
# 0.18.17
-0.18.17.updates = 0.18.21
-0.18.17.notices = We recommend upgrading to 0.18.21, our latest GA release.
+0.18.17.updates = 0.18.22
+0.18.17.notices = We recommend upgrading to 0.18.22, our latest GA release.
0.18.17.release-notes = https://github.com/killbill/killbill/releases/tag/killbill-0.18.17
# 0.18.16
-0.18.16.updates = 0.18.21
-0.18.16.notices = We recommend upgrading to 0.18.21, our latest GA release.
+0.18.16.updates = 0.18.22
+0.18.16.notices = We recommend upgrading to 0.18.22, our latest GA release.
0.18.16.release-notes = https://github.com/killbill/killbill/releases/tag/killbill-0.18.16
# 0.18.15
-0.18.15.updates = 0.18.21
-0.18.15.notices = We recommend upgrading to 0.18.21, our latest GA release.
+0.18.15.updates = 0.18.22
+0.18.15.notices = We recommend upgrading to 0.18.22, our latest GA release.
0.18.15.release-notes = https://github.com/killbill/killbill/releases/tag/killbill-0.18.15
# 0.18.14
-0.18.14.updates = 0.18.21
-0.18.14.notices = We recommend upgrading to 0.18.21, our latest GA release.
+0.18.14.updates = 0.18.22
+0.18.14.notices = We recommend upgrading to 0.18.22, our latest GA release.
0.18.14.release-notes = https://github.com/killbill/killbill/releases/tag/killbill-0.18.14
# 0.18.13
-0.18.13.updates = 0.18.21
-0.18.13.notices = We recommend upgrading to 0.18.21, our latest GA release.
+0.18.13.updates = 0.18.22
+0.18.13.notices = We recommend upgrading to 0.18.22, our latest GA release.
0.18.13.release-notes = https://github.com/killbill/killbill/releases/tag/killbill-0.18.13
# 0.18.12
-0.18.12.updates = 0.18.21
-0.18.12.notices = We recommend upgrading to 0.18.21, our latest GA release.
+0.18.12.updates = 0.18.22
+0.18.12.notices = We recommend upgrading to 0.18.22, our latest GA release.
0.18.12.release-notes = https://github.com/killbill/killbill/releases/tag/killbill-0.18.12
# 0.18.11
-0.18.11.updates = 0.18.21
-0.18.11.notices = We recommend upgrading to 0.18.21, our latest GA release.
+0.18.11.updates = 0.18.22
+0.18.11.notices = We recommend upgrading to 0.18.22, our latest GA release.
0.18.11.release-notes = https://github.com/killbill/killbill/releases/tag/killbill-0.18.11
# 0.18.10
-0.18.10.updates = 0.18.19
-0.18.10.notices = We recommend upgrading to 0.18.19, our latest GA release.
+0.18.10.updates = 0.18.22
+0.18.10.notices = We recommend upgrading to 0.18.22, our latest GA release.
0.18.10.release-notes = https://github.com/killbill/killbill/releases/tag/killbill-0.18.10
# 0.18.9
-0.18.9.updates = 0.18.19
-0.18.9.notices = We recommend upgrading to 0.18.19, our latest GA release.
+0.18.9.updates = 0.18.22
+0.18.9.notices = We recommend upgrading to 0.18.22, our latest GA release.
0.18.9.release-notes = https://github.com/killbill/killbill/releases/tag/killbill-0.18.9
# 0.18.8
-0.18.8.updates = 0.18.19
-0.18.8.notices = We recommend upgrading to 0.18.19, our latest GA release.
+0.18.8.updates = 0.18.22
+0.18.8.notices = We recommend upgrading to 0.18.22, our latest GA release.
0.18.8.release-notes = https://github.com/killbill/killbill/releases/tag/killbill-0.18.8
# 0.18.7
-0.18.7.updates = 0.18.19
-0.18.7.notices = We recommend upgrading to 0.18.19, our latest GA release.
+0.18.7.updates = 0.18.22
+0.18.7.notices = We recommend upgrading to 0.18.22, our latest GA release.
0.18.7.release-notes = https://github.com/killbill/killbill/releases/tag/killbill-0.18.7
# 0.18.6
-0.18.6.updates = 0.18.19
-0.18.6.notices = We recommend upgrading to 0.18.19, our latest GA release.
+0.18.6.updates = 0.18.22
+0.18.6.notices = We recommend upgrading to 0.18.22, our latest GA release.
0.18.6.release-notes = https://github.com/killbill/killbill/releases/tag/killbill-0.18.6
# 0.18.5
-0.18.5.updates = 0.18.19
-0.18.5.notices = We recommend upgrading to 0.18.19, our latest GA release.
+0.18.5.updates = 0.18.22
+0.18.5.notices = We recommend upgrading to 0.18.22, our latest GA release.
0.18.5.release-notes = https://github.com/killbill/killbill/releases/tag/killbill-0.18.5
# 0.18.4
-0.18.4.updates = 0.18.19
-0.18.4.notices = We recommend upgrading to 0.18.19, our latest GA release.
+0.18.4.updates = 0.18.22
+0.18.4.notices = We recommend upgrading to 0.18.22, our latest GA release.
0.18.4.release-notes = https://github.com/killbill/killbill/releases/tag/killbill-0.18.4
# 0.18.3
-0.18.3.updates = 0.18.19
-0.18.3.notices = We recommend upgrading to 0.18.19, our latest GA release.
+0.18.3.updates = 0.18.22
+0.18.3.notices = We recommend upgrading to 0.18.22, our latest GA release.
0.18.3.release-notes = https://github.com/killbill/killbill/releases/tag/killbill-0.18.3
# 0.18.2
-0.18.2.updates = 0.18.19
-0.18.2.notices = We recommend upgrading to 0.18.19, our latest GA release.
+0.18.2.updates = 0.18.22
+0.18.2.notices = We recommend upgrading to 0.18.22, our latest GA release.
0.18.2.release-notes = https://github.com/killbill/killbill/releases/tag/killbill-0.18.2
# 0.18.1
-0.18.1.updates = 0.18.19
-0.18.1.notices = We recommend upgrading to 0.18.19, our latest GA release.
+0.18.1.updates = 0.18.22
+0.18.1.notices = We recommend upgrading to 0.18.22, our latest GA release.
0.18.1.release-notes = https://github.com/killbill/killbill/releases/tag/killbill-0.18.1
# 0.18.0
-0.18.0.updates = 0.18.19
-0.18.0.notices = We recommend upgrading to 0.18.19, our latest GA release.
+0.18.0.updates = 0.18.22
+0.18.0.notices = We recommend upgrading to 0.18.22, our latest GA release.
0.18.0.release-notes = https://github.com/killbill/killbill/releases/tag/killbill-0.18.0
### 0.17.x series ###
# 0.17.8
0.17.8.updates =
-0.17.8.notices = We recommend upgrading to 0.18.19, our latest GA release.
+0.17.8.notices = We recommend upgrading to 0.18.22, our latest GA release.
0.17.8.release-notes = https://github.com/killbill/killbill/releases/tag/killbill-0.17.8
# 0.17.7
diff --git a/profiles/killpay/src/main/resources/update-checker/killbill-server-update-list.properties b/profiles/killpay/src/main/resources/update-checker/killbill-server-update-list.properties
index a9b4e83..abbeecd 100644
--- a/profiles/killpay/src/main/resources/update-checker/killbill-server-update-list.properties
+++ b/profiles/killpay/src/main/resources/update-checker/killbill-server-update-list.properties
@@ -100,121 +100,126 @@
### 0.18.x series ###
+# 0.18.22
+0.18.22.updates =
+0.18.22.notices = This is the latest GA release.
+0.18.22.release-notes = https://github.com/killbill/killbill/releases/tag/killbill-0.18.22
+
# 0.18.21
-0.18.21.updates =
-0.18.21.notices = This is the latest GA release.
+0.18.21.updates = 0.18.22
+0.18.21.notices = We recommend upgrading to 0.18.22, our latest GA release.
0.18.21.release-notes = https://github.com/killbill/killbill/releases/tag/killbill-0.18.21
# 0.18.20
-0.18.20.updates = 0.18.21
-0.18.20.notices = We recommend upgrading to 0.18.21, our latest GA release.
+0.18.20.updates = 0.18.22
+0.18.20.notices = We recommend upgrading to 0.18.22, our latest GA release.
0.18.20.release-notes = https://github.com/killbill/killbill/releases/tag/killbill-0.18.20
# 0.18.19
-0.18.19.updates = 0.18.21
-0.18.19.notices = We recommend upgrading to 0.18.21, our latest GA release.
+0.18.19.updates = 0.18.22
+0.18.19.notices = We recommend upgrading to 0.18.22, our latest GA release.
0.18.19.release-notes = https://github.com/killbill/killbill/releases/tag/killbill-0.18.19
# 0.18.18
-0.18.18.updates = 0.18.21
-0.18.18.notices = We recommend upgrading to 0.18.21, our latest GA release.
+0.18.18.updates = 0.18.22
+0.18.18.notices = We recommend upgrading to 0.18.22, our latest GA release.
0.18.18.release-notes = https://github.com/killbill/killbill/releases/tag/killbill-0.18.18
# 0.18.17
-0.18.17.updates = 0.18.21
-0.18.17.notices = We recommend upgrading to 0.18.21, our latest GA release.
+0.18.17.updates = 0.18.22
+0.18.17.notices = We recommend upgrading to 0.18.22, our latest GA release.
0.18.17.release-notes = https://github.com/killbill/killbill/releases/tag/killbill-0.18.17
# 0.18.16
-0.18.16.updates = 0.18.21
-0.18.16.notices = We recommend upgrading to 0.18.21, our latest GA release.
+0.18.16.updates = 0.18.22
+0.18.16.notices = We recommend upgrading to 0.18.22, our latest GA release.
0.18.16.release-notes = https://github.com/killbill/killbill/releases/tag/killbill-0.18.16
# 0.18.15
-0.18.15.updates = 0.18.21
-0.18.15.notices = We recommend upgrading to 0.18.21, our latest GA release.
+0.18.15.updates = 0.18.22
+0.18.15.notices = We recommend upgrading to 0.18.22, our latest GA release.
0.18.15.release-notes = https://github.com/killbill/killbill/releases/tag/killbill-0.18.15
# 0.18.14
-0.18.14.updates = 0.18.21
-0.18.14.notices = We recommend upgrading to 0.18.21, our latest GA release.
+0.18.14.updates = 0.18.22
+0.18.14.notices = We recommend upgrading to 0.18.22, our latest GA release.
0.18.14.release-notes = https://github.com/killbill/killbill/releases/tag/killbill-0.18.14
# 0.18.13
-0.18.13.updates = 0.18.21
-0.18.13.notices = We recommend upgrading to 0.18.21, our latest GA release.
+0.18.13.updates = 0.18.22
+0.18.13.notices = We recommend upgrading to 0.18.22, our latest GA release.
0.18.13.release-notes = https://github.com/killbill/killbill/releases/tag/killbill-0.18.13
# 0.18.12
-0.18.12.updates = 0.18.21
-0.18.12.notices = We recommend upgrading to 0.18.21, our latest GA release.
+0.18.12.updates = 0.18.22
+0.18.12.notices = We recommend upgrading to 0.18.22, our latest GA release.
0.18.12.release-notes = https://github.com/killbill/killbill/releases/tag/killbill-0.18.12
# 0.18.11
-0.18.11.updates = 0.18.21
-0.18.11.notices = We recommend upgrading to 0.18.21, our latest GA release.
+0.18.11.updates = 0.18.22
+0.18.11.notices = We recommend upgrading to 0.18.22, our latest GA release.
0.18.11.release-notes = https://github.com/killbill/killbill/releases/tag/killbill-0.18.11
# 0.18.10
-0.18.10.updates = 0.18.19
-0.18.10.notices = We recommend upgrading to 0.18.19, our latest GA release.
+0.18.10.updates = 0.18.22
+0.18.10.notices = We recommend upgrading to 0.18.22, our latest GA release.
0.18.10.release-notes = https://github.com/killbill/killbill/releases/tag/killbill-0.18.10
# 0.18.9
-0.18.9.updates = 0.18.19
-0.18.9.notices = We recommend upgrading to 0.18.19, our latest GA release.
+0.18.9.updates = 0.18.22
+0.18.9.notices = We recommend upgrading to 0.18.22, our latest GA release.
0.18.9.release-notes = https://github.com/killbill/killbill/releases/tag/killbill-0.18.9
# 0.18.8
-0.18.8.updates = 0.18.19
-0.18.8.notices = We recommend upgrading to 0.18.19, our latest GA release.
+0.18.8.updates = 0.18.22
+0.18.8.notices = We recommend upgrading to 0.18.22, our latest GA release.
0.18.8.release-notes = https://github.com/killbill/killbill/releases/tag/killbill-0.18.8
# 0.18.7
-0.18.7.updates = 0.18.19
-0.18.7.notices = We recommend upgrading to 0.18.19, our latest GA release.
+0.18.7.updates = 0.18.22
+0.18.7.notices = We recommend upgrading to 0.18.22, our latest GA release.
0.18.7.release-notes = https://github.com/killbill/killbill/releases/tag/killbill-0.18.7
# 0.18.6
-0.18.6.updates = 0.18.19
-0.18.6.notices = We recommend upgrading to 0.18.19, our latest GA release.
+0.18.6.updates = 0.18.22
+0.18.6.notices = We recommend upgrading to 0.18.22, our latest GA release.
0.18.6.release-notes = https://github.com/killbill/killbill/releases/tag/killbill-0.18.6
# 0.18.5
-0.18.5.updates = 0.18.19
-0.18.5.notices = We recommend upgrading to 0.18.19, our latest GA release.
+0.18.5.updates = 0.18.22
+0.18.5.notices = We recommend upgrading to 0.18.22, our latest GA release.
0.18.5.release-notes = https://github.com/killbill/killbill/releases/tag/killbill-0.18.5
# 0.18.4
-0.18.4.updates = 0.18.19
-0.18.4.notices = We recommend upgrading to 0.18.19, our latest GA release.
+0.18.4.updates = 0.18.22
+0.18.4.notices = We recommend upgrading to 0.18.22, our latest GA release.
0.18.4.release-notes = https://github.com/killbill/killbill/releases/tag/killbill-0.18.4
# 0.18.3
-0.18.3.updates = 0.18.19
-0.18.3.notices = We recommend upgrading to 0.18.19, our latest GA release.
+0.18.3.updates = 0.18.22
+0.18.3.notices = We recommend upgrading to 0.18.22, our latest GA release.
0.18.3.release-notes = https://github.com/killbill/killbill/releases/tag/killbill-0.18.3
# 0.18.2
-0.18.2.updates = 0.18.19
-0.18.2.notices = We recommend upgrading to 0.18.19, our latest GA release.
+0.18.2.updates = 0.18.22
+0.18.2.notices = We recommend upgrading to 0.18.22, our latest GA release.
0.18.2.release-notes = https://github.com/killbill/killbill/releases/tag/killbill-0.18.2
# 0.18.1
-0.18.1.updates = 0.18.19
-0.18.1.notices = We recommend upgrading to 0.18.19, our latest GA release.
+0.18.1.updates = 0.18.22
+0.18.1.notices = We recommend upgrading to 0.18.22, our latest GA release.
0.18.1.release-notes = https://github.com/killbill/killbill/releases/tag/killbill-0.18.1
# 0.18.0
-0.18.0.updates = 0.18.19
-0.18.0.notices = We recommend upgrading to 0.18.19, our latest GA release.
+0.18.0.updates = 0.18.22
+0.18.0.notices = We recommend upgrading to 0.18.22, our latest GA release.
0.18.0.release-notes = https://github.com/killbill/killbill/releases/tag/killbill-0.18.0
### 0.17.x series ###
# 0.17.8
0.17.8.updates =
-0.17.8.notices = We recommend upgrading to 0.18.19, our latest GA release.
+0.17.8.notices = We recommend upgrading to 0.18.22, our latest GA release.
0.17.8.release-notes = https://github.com/killbill/killbill/releases/tag/killbill-0.17.8
# 0.17.7