killbill-memoizeit

diff --git a/account/pom.xml b/account/pom.xml
index 084df5c..a4f8c17 100644
--- a/account/pom.xml
+++ b/account/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>killbill</artifactId>
         <groupId>org.kill-bill.billing</groupId>
-        <version>0.19.2-SNAPSHOT</version>
+        <version>0.19.3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-account</artifactId>

diff --git a/api/pom.xml b/api/pom.xml
index 0f70616..e96dd58 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>killbill</artifactId>
         <groupId>org.kill-bill.billing</groupId>
-        <version>0.19.2-SNAPSHOT</version>
+        <version>0.19.3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-internal-api</artifactId>

diff --git a/beatrix/pom.xml b/beatrix/pom.xml
index cf06b95..f49d2e3 100644
--- a/beatrix/pom.xml
+++ b/beatrix/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>killbill</artifactId>
         <groupId>org.kill-bill.billing</groupId>
-        <version>0.19.2-SNAPSHOT</version>
+        <version>0.19.3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-beatrix</artifactId>

diff --git a/beatrix/src/main/resources/org/killbill/billing/beatrix/ddl.sql b/beatrix/src/main/resources/org/killbill/billing/beatrix/ddl.sql
index d5ccb71..f0fc5a9 100644
--- a/beatrix/src/main/resources/org/killbill/billing/beatrix/ddl.sql
+++ b/beatrix/src/main/resources/org/killbill/billing/beatrix/ddl.sql
@@ -4,7 +4,7 @@ DROP TABLE IF EXISTS bus_ext_events;
 CREATE TABLE bus_ext_events (
     record_id serial unique,
     class_name varchar(128) NOT NULL,
-    event_json varchar(2048) NOT NULL,
+    event_json text NOT NULL,
     user_token varchar(36),
     created_date datetime NOT NULL,
     creating_owner varchar(50) NOT NULL,
@@ -24,7 +24,7 @@ DROP TABLE IF EXISTS bus_ext_events_history;
 CREATE TABLE bus_ext_events_history (
     record_id serial unique,
     class_name varchar(128) NOT NULL,
-    event_json varchar(2048) NOT NULL,
+    event_json text NOT NULL,
     user_token varchar(36),
     created_date datetime NOT NULL,
     creating_owner varchar(50) NOT NULL,

diff --git a/beatrix/src/main/resources/org/killbill/billing/beatrix/migration/V20180202093543__increase_field_event_json.sql b/beatrix/src/main/resources/org/killbill/billing/beatrix/migration/V20180202093543__increase_field_event_json.sql
new file mode 100644
index 0000000..ad94662
--- /dev/null
+++ b/beatrix/src/main/resources/org/killbill/billing/beatrix/migration/V20180202093543__increase_field_event_json.sql
@@ -0,0 +1,2 @@
+alter table bus_ext_events modify event_json text not null;
+alter table bus_ext_events_history modify event_json text not null;

diff --git a/catalog/pom.xml b/catalog/pom.xml
index a528b15..3a18e32 100644
--- a/catalog/pom.xml
+++ b/catalog/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>killbill</artifactId>
         <groupId>org.kill-bill.billing</groupId>
-        <version>0.19.2-SNAPSHOT</version>
+        <version>0.19.3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-catalog</artifactId>

diff --git a/currency/pom.xml b/currency/pom.xml
index e494bd3..7eeba61 100644
--- a/currency/pom.xml
+++ b/currency/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>killbill</artifactId>
         <groupId>org.kill-bill.billing</groupId>
-        <version>0.19.2-SNAPSHOT</version>
+        <version>0.19.3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-currency</artifactId>

diff --git a/entitlement/pom.xml b/entitlement/pom.xml
index a194d47..ac0f627 100644
--- a/entitlement/pom.xml
+++ b/entitlement/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>killbill</artifactId>
         <groupId>org.kill-bill.billing</groupId>
-        <version>0.19.2-SNAPSHOT</version>
+        <version>0.19.3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-entitlement</artifactId>

diff --git a/invoice/pom.xml b/invoice/pom.xml
index 4dc832f..6d2bfe1 100644
--- a/invoice/pom.xml
+++ b/invoice/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>killbill</artifactId>
         <groupId>org.kill-bill.billing</groupId>
-        <version>0.19.2-SNAPSHOT</version>
+        <version>0.19.3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-invoice</artifactId>

diff --git a/jaxrs/pom.xml b/jaxrs/pom.xml
index 54cb60e..5d8b159 100644
--- a/jaxrs/pom.xml
+++ b/jaxrs/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>killbill</artifactId>
         <groupId>org.kill-bill.billing</groupId>
-        <version>0.19.2-SNAPSHOT</version>
+        <version>0.19.3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-jaxrs</artifactId>

diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/AdminResource.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/AdminResource.java
index 6e84d68..ecdc194 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/AdminResource.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/AdminResource.java
@@ -301,14 +301,7 @@ public class AdminResource extends JaxRsResourceBase {
                     generator.close();
                 } finally {
                     // In case the client goes away (IOException), make sure to close the underlying DB connection
-                    if (tags instanceof Closeable) {
-                        ((Closeable) tags).close();
-                    } else {
-                        // TODO 0.20.x (https://github.com/killbill/killbill/issues/558)
-                        while (iterator.hasNext()) {
-                            iterator.next();
-                        }
-                    }
+                    tags.close();
                 }
             }
         };

diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/JaxRsResourceBase.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/JaxRsResourceBase.java
index 8a45b83..f0490db 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/JaxRsResourceBase.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/JaxRsResourceBase.java
@@ -350,14 +350,7 @@ public abstract class JaxRsResourceBase implements JaxrsResource {
                     generator.close();
                 } finally {
                     // In case the client goes away (IOException), make sure to close the underlying DB connection
-                    if (entities instanceof Closeable) {
-                        ((Closeable) entities).close();
-                    } else {
-                        // TODO 0.20.x (https://github.com/killbill/killbill/issues/558)
-                        while (iterator.hasNext()) {
-                            iterator.next();
-                        }
-                    }
+                    entities.close();
                 }
             }
         };

diff --git a/junction/pom.xml b/junction/pom.xml
index 0283447..d6aa036 100644
--- a/junction/pom.xml
+++ b/junction/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>killbill</artifactId>
         <groupId>org.kill-bill.billing</groupId>
-        <version>0.19.2-SNAPSHOT</version>
+        <version>0.19.3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-junction</artifactId>

diff --git a/NEWS b/NEWS
index 74cd426..4827589 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+0.19.2
+    Fix issue with STANDALONE plans (#840)
+    Fix connection leak (#558)
+    Fix limitation where catalog plan name cannot end with an number (#842)
+    Fix missing Invoice Notification when we have future billing events (#846)
+    Rreduce log level of InvoiceItemGeneratorLogger (#851)
+
 0.18.16
     See https://github.com/killbill/killbill/releases/tag/killbill-0.18.16
 

diff --git a/overdue/pom.xml b/overdue/pom.xml
index 4fc17ea..d9807da 100644
--- a/overdue/pom.xml
+++ b/overdue/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>killbill</artifactId>
         <groupId>org.kill-bill.billing</groupId>
-        <version>0.19.2-SNAPSHOT</version>
+        <version>0.19.3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-overdue</artifactId>

diff --git a/payment/pom.xml b/payment/pom.xml
index ef02c20..a7f8504 100644
--- a/payment/pom.xml
+++ b/payment/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>killbill</artifactId>
         <groupId>org.kill-bill.billing</groupId>
-        <version>0.19.2-SNAPSHOT</version>
+        <version>0.19.3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-payment</artifactId>

diff --git a/pom.xml b/pom.xml
index ce6620c..a3df44f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
         <version>0.141.27</version>
     </parent>
     <artifactId>killbill</artifactId>
-    <version>0.19.2-SNAPSHOT</version>
+    <version>0.19.3-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>killbill</name>
     <description>Library for managing recurring subscriptions and the associated billing</description>

diff --git a/profiles/killbill/pom.xml b/profiles/killbill/pom.xml
index 3793501..220dfb6 100644
--- a/profiles/killbill/pom.xml
+++ b/profiles/killbill/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>killbill-profiles</artifactId>
         <groupId>org.kill-bill.billing</groupId>
-        <version>0.19.2-SNAPSHOT</version>
+        <version>0.19.3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-profiles-killbill</artifactId>

diff --git a/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestCatalog.java b/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestCatalog.java
index a0f6ad4..c5f263b 100644
--- a/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestCatalog.java
+++ b/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestCatalog.java
@@ -106,7 +106,7 @@ public class TestCatalog extends TestJaxrsBase {
         Assert.assertEquals(catalogsJson.get(0).getName(), "Firearms");
         Assert.assertEquals(catalogsJson.get(0).getEffectiveDate(), Date.valueOf("2011-01-01"));
         Assert.assertEquals(catalogsJson.get(0).getCurrencies().size(), 3);
-        Assert.assertEquals(catalogsJson.get(0).getProducts().size(), 11);
+        Assert.assertEquals(catalogsJson.get(0).getProducts().size(), 12);
         Assert.assertEquals(catalogsJson.get(0).getPriceLists().size(), 7);
 
         for (final Product productJson : catalogsJson.get(0).getProducts()) {

diff --git a/profiles/killpay/pom.xml b/profiles/killpay/pom.xml
index ea189b8..2149fa1 100644
--- a/profiles/killpay/pom.xml
+++ b/profiles/killpay/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>killbill-profiles</artifactId>
         <groupId>org.kill-bill.billing</groupId>
-        <version>0.19.2-SNAPSHOT</version>
+        <version>0.19.3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-profiles-killpay</artifactId>

diff --git a/profiles/pom.xml b/profiles/pom.xml
index 4f18c54..4cde946 100644
--- a/profiles/pom.xml
+++ b/profiles/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>killbill</artifactId>
         <groupId>org.kill-bill.billing</groupId>
-        <version>0.19.2-SNAPSHOT</version>
+        <version>0.19.3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-profiles</artifactId>

diff --git a/subscription/pom.xml b/subscription/pom.xml
index bfff77c..b5f562c 100644
--- a/subscription/pom.xml
+++ b/subscription/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>killbill</artifactId>
         <groupId>org.kill-bill.billing</groupId>
-        <version>0.19.2-SNAPSHOT</version>
+        <version>0.19.3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-subscription</artifactId>

diff --git a/tenant/pom.xml b/tenant/pom.xml
index 5812005..00eab18 100644
--- a/tenant/pom.xml
+++ b/tenant/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>killbill</artifactId>
         <groupId>org.kill-bill.billing</groupId>
-        <version>0.19.2-SNAPSHOT</version>
+        <version>0.19.3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-tenant</artifactId>

diff --git a/usage/pom.xml b/usage/pom.xml
index 6124f01..3f4caca 100644
--- a/usage/pom.xml
+++ b/usage/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>killbill</artifactId>
         <groupId>org.kill-bill.billing</groupId>
-        <version>0.19.2-SNAPSHOT</version>
+        <version>0.19.3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-usage</artifactId>

diff --git a/util/pom.xml b/util/pom.xml
index 486618c..dd2a99b 100644
--- a/util/pom.xml
+++ b/util/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>killbill</artifactId>
         <groupId>org.kill-bill.billing</groupId>
-        <version>0.19.2-SNAPSHOT</version>
+        <version>0.19.3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-util</artifactId>

diff --git a/util/src/main/java/org/killbill/billing/util/tag/DefaultTagInternalApi.java b/util/src/main/java/org/killbill/billing/util/tag/DefaultTagInternalApi.java
index e4af036..81f5282 100644
--- a/util/src/main/java/org/killbill/billing/util/tag/DefaultTagInternalApi.java
+++ b/util/src/main/java/org/killbill/billing/util/tag/DefaultTagInternalApi.java
@@ -21,6 +21,7 @@ import java.util.UUID;
 
 import javax.inject.Inject;
 
+import org.killbill.billing.ErrorCode;
 import org.killbill.billing.ObjectType;
 import org.killbill.billing.callcontext.InternalCallContext;
 import org.killbill.billing.callcontext.InternalTenantContext;
@@ -74,8 +75,14 @@ public class DefaultTagInternalApi implements TagInternalApi {
     public void addTag(final UUID objectId, final ObjectType objectType, final UUID tagDefinitionId, final InternalCallContext context)
             throws TagApiException {
         final TagModelDao tag = new TagModelDao(context.getCreatedDate(), tagDefinitionId, objectId, objectType);
-        tagDao.create(tag, context);
-
+        try {
+            tagDao.create(tag, context);
+        } catch (TagApiException e) {
+            // Be lenient here and make the addTag method idempotent
+            if (ErrorCode.TAG_ALREADY_EXISTS.getCode() != e.getCode()) {
+                throw e;
+            }
+        }
     }
 
     @Override

diff --git a/util/src/main/resources/org/killbill/billing/util/ddl.sql b/util/src/main/resources/org/killbill/billing/util/ddl.sql
index 5523655..b1430a6 100644
--- a/util/src/main/resources/org/killbill/billing/util/ddl.sql
+++ b/util/src/main/resources/org/killbill/billing/util/ddl.sql
@@ -156,7 +156,7 @@ DROP TABLE IF EXISTS notifications;
 CREATE TABLE notifications (
     record_id serial unique,
     class_name varchar(256) NOT NULL,
-    event_json varchar(2048) NOT NULL,
+    event_json text NOT NULL,
     user_token varchar(36),
     created_date datetime NOT NULL,
     creating_owner varchar(50) NOT NULL,
@@ -180,7 +180,7 @@ DROP TABLE IF EXISTS notifications_history;
 CREATE TABLE notifications_history (
     record_id serial unique,
     class_name varchar(256) NOT NULL,
-    event_json varchar(2048) NOT NULL,
+    event_json text NOT NULL,
     user_token varchar(36),
     created_date datetime NOT NULL,
     creating_owner varchar(50) NOT NULL,
@@ -201,7 +201,7 @@ DROP TABLE IF EXISTS bus_events;
 CREATE TABLE bus_events (
     record_id serial unique,
     class_name varchar(128) NOT NULL,
-    event_json varchar(2048) NOT NULL,
+    event_json text NOT NULL,
     user_token varchar(36),
     created_date datetime NOT NULL,
     creating_owner varchar(50) NOT NULL,
@@ -221,7 +221,7 @@ DROP TABLE IF EXISTS bus_events_history;
 CREATE TABLE bus_events_history (
     record_id serial unique,
     class_name varchar(128) NOT NULL,
-    event_json varchar(2048) NOT NULL,
+    event_json text NOT NULL,
     user_token varchar(36),
     created_date datetime NOT NULL,
     creating_owner varchar(50) NOT NULL,

diff --git a/util/src/main/resources/org/killbill/billing/util/migration/V20180202093043__increase_field_event_json.sql b/util/src/main/resources/org/killbill/billing/util/migration/V20180202093043__increase_field_event_json.sql
new file mode 100644
index 0000000..a0c4568
--- /dev/null
+++ b/util/src/main/resources/org/killbill/billing/util/migration/V20180202093043__increase_field_event_json.sql
@@ -0,0 +1,4 @@
+alter table bus_events modify event_json text not null;
+alter table bus_events_history modify event_json text not null;
+alter table notifications modify event_json text not null;
+alter table notifications_history modify event_json text not null;