Prosoft Git

killbill-memoizeit

Merge remote-tracking branch 'killbill/work-for-release-0.19.x' …

4/25/2018 11:18:31 AM
Joel Batista

Joel Batista

Commit: 3e1f3c5

Tree: a0b65af

Parents: 7ce84b4
fc08c9e

Changes

account/pom.xml 2(+1 -1)

account/src/main/java/org/killbill/billing/account/glue/DefaultAccountModule.java 3(+3 -0)

api/pom.xml 2(+1 -1)

beatrix/pom.xml 2(+1 -1)

catalog/pom.xml 2(+1 -1)

currency/pom.xml 2(+1 -1)

entitlement/pom.xml 2(+1 -1)

invoice/pom.xml 2(+1 -1)

jaxrs/pom.xml 2(+1 -1)

junction/pom.xml 2(+1 -1)

NEWS 4(+4 -0)

overdue/pom.xml 2(+1 -1)

payment/pom.xml 2(+1 -1)

pom.xml 4(+2 -2)

profiles/killbill/pom.xml 2(+1 -1)

profiles/killpay/pom.xml 2(+1 -1)

profiles/pom.xml 2(+1 -1)

subscription/pom.xml 2(+1 -1)

tenant/pom.xml 2(+1 -1)

usage/pom.xml 2(+1 -1)

util/pom.xml 3(+1 -2)

util/src/main/java/org/killbill/billing/util/glue/KillbillApiAopModule.java 43(+43 -0)

Details

account/pom.xml 2(+1 -1) 

diff --git a/account/pom.xml b/account/pom.xml
index 417f676..4607947 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.11-SNAPSHOT</version>
+        <version>0.19.12-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-account</artifactId>

account/src/main/java/org/killbill/billing/account/glue/DefaultAccountModule.java 3(+3 -0) 

diff --git a/account/src/main/java/org/killbill/billing/account/glue/DefaultAccountModule.java b/account/src/main/java/org/killbill/billing/account/glue/DefaultAccountModule.java
index c5931f6..f4fb78e 100644
--- a/account/src/main/java/org/killbill/billing/account/glue/DefaultAccountModule.java
+++ b/account/src/main/java/org/killbill/billing/account/glue/DefaultAccountModule.java
@@ -30,6 +30,8 @@ import org.killbill.billing.account.dao.AccountDao;
 import org.killbill.billing.account.dao.DefaultAccountDao;
 import org.killbill.billing.glue.AccountModule;
 import org.killbill.billing.platform.api.KillbillConfigSource;
+import org.killbill.billing.util.audit.dao.AuditDao;
+import org.killbill.billing.util.audit.dao.DefaultAuditDao;
 import org.killbill.billing.util.glue.KillBillModule;
 
 public class DefaultAccountModule extends KillBillModule implements AccountModule {
@@ -43,6 +45,7 @@ public class DefaultAccountModule extends KillBillModule implements AccountModul
 
     protected void installAccountDao() {
         bind(AccountDao.class).to(DefaultAccountDao.class).asEagerSingleton();
+        bind(AuditDao.class).to(DefaultAuditDao.class).asEagerSingleton();
     }
 
     @Override

api/pom.xml 2(+1 -1) 

diff --git a/api/pom.xml b/api/pom.xml
index cd2c6d5..5f17ca0 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.11-SNAPSHOT</version>
+        <version>0.19.12-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-internal-api</artifactId>

beatrix/pom.xml 2(+1 -1) 

diff --git a/beatrix/pom.xml b/beatrix/pom.xml
index 61adc18..836ed73 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.11-SNAPSHOT</version>
+        <version>0.19.12-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-beatrix</artifactId>

catalog/pom.xml 2(+1 -1) 

diff --git a/catalog/pom.xml b/catalog/pom.xml
index abb51d5..e4dc840 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.11-SNAPSHOT</version>
+        <version>0.19.12-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-catalog</artifactId>

currency/pom.xml 2(+1 -1) 

diff --git a/currency/pom.xml b/currency/pom.xml
index 62792ff..690d28c 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.11-SNAPSHOT</version>
+        <version>0.19.12-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-currency</artifactId>

entitlement/pom.xml 2(+1 -1) 

diff --git a/entitlement/pom.xml b/entitlement/pom.xml
index ee7964e..01a4d52 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.11-SNAPSHOT</version>
+        <version>0.19.12-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-entitlement</artifactId>

invoice/pom.xml 2(+1 -1) 

diff --git a/invoice/pom.xml b/invoice/pom.xml
index d86d45c..af2c2fc 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.11-SNAPSHOT</version>
+        <version>0.19.12-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-invoice</artifactId>

jaxrs/pom.xml 2(+1 -1) 

diff --git a/jaxrs/pom.xml b/jaxrs/pom.xml
index 335c64a..4d48ab3 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.11-SNAPSHOT</version>
+        <version>0.19.12-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-jaxrs</artifactId>

junction/pom.xml 2(+1 -1) 

diff --git a/junction/pom.xml b/junction/pom.xml
index e861302..96a2001 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.11-SNAPSHOT</version>
+        <version>0.19.12-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-junction</artifactId>

NEWS 4(+4 -0) 

diff --git a/NEWS b/NEWS
index cc38732..cdc44bf 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+0.19.11
+    Subscription and entitlement rework mostly targeted around performance
+    Add ability to use read only instances from JAXRS and plugin layer
+
 0.19.10
     Entitlement and Subscription performance
     Fix issue in invoice plugin ordering

overdue/pom.xml 2(+1 -1) 

diff --git a/overdue/pom.xml b/overdue/pom.xml
index 50e64d0..737a844 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.11-SNAPSHOT</version>
+        <version>0.19.12-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-overdue</artifactId>

payment/pom.xml 2(+1 -1) 

diff --git a/payment/pom.xml b/payment/pom.xml
index 66b0100..cb787db 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.11-SNAPSHOT</version>
+        <version>0.19.12-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-payment</artifactId>

pom.xml 4(+2 -2) 

diff --git a/pom.xml b/pom.xml
index 0be4e28..aca7ffc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,10 +21,10 @@
     <parent>
         <artifactId>killbill-oss-parent</artifactId>
         <groupId>org.kill-bill.billing</groupId>
-        <version>0.141.58</version>
+        <version>0.141.60</version>
     </parent>
     <artifactId>killbill</artifactId>
-    <version>0.19.11-SNAPSHOT</version>
+    <version>0.19.12-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>killbill</name>
     <description>Library for managing recurring subscriptions and the associated billing</description>

profiles/killbill/pom.xml 2(+1 -1) 

diff --git a/profiles/killbill/pom.xml b/profiles/killbill/pom.xml
index a06c3ac..62d371f 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.11-SNAPSHOT</version>
+        <version>0.19.12-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-profiles-killbill</artifactId>

profiles/killpay/pom.xml 2(+1 -1) 

diff --git a/profiles/killpay/pom.xml b/profiles/killpay/pom.xml
index 7bd7494..3b935cf 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.11-SNAPSHOT</version>
+        <version>0.19.12-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-profiles-killpay</artifactId>

profiles/pom.xml 2(+1 -1) 

diff --git a/profiles/pom.xml b/profiles/pom.xml
index afe81c3..a3e66cf 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.11-SNAPSHOT</version>
+        <version>0.19.12-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-profiles</artifactId>

subscription/pom.xml 2(+1 -1) 

diff --git a/subscription/pom.xml b/subscription/pom.xml
index a2d2459..b963212 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.11-SNAPSHOT</version>
+        <version>0.19.12-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-subscription</artifactId>

tenant/pom.xml 2(+1 -1) 

diff --git a/tenant/pom.xml b/tenant/pom.xml
index 3936329..7748f03 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.11-SNAPSHOT</version>
+        <version>0.19.12-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-tenant</artifactId>

usage/pom.xml 2(+1 -1) 

diff --git a/usage/pom.xml b/usage/pom.xml
index 2858c6c..dceaf52 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.11-SNAPSHOT</version>
+        <version>0.19.12-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-usage</artifactId>

util/pom.xml 3(+1 -2) 

diff --git a/util/pom.xml b/util/pom.xml
index 946d4c3..e6ec817 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.11-SNAPSHOT</version>
+        <version>0.19.12-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-util</artifactId>
@@ -201,7 +201,6 @@
         <dependency>
             <groupId>org.kill-bill.billing</groupId>
             <artifactId>killbill-platform-osgi-api</artifactId>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.kill-bill.billing</groupId>

util/src/main/java/org/killbill/billing/util/glue/KillbillApiAopModule.java 43(+43 -0) 

diff --git a/util/src/main/java/org/killbill/billing/util/glue/KillbillApiAopModule.java b/util/src/main/java/org/killbill/billing/util/glue/KillbillApiAopModule.java
index c751f83..80abe6d 100644
--- a/util/src/main/java/org/killbill/billing/util/glue/KillbillApiAopModule.java
+++ b/util/src/main/java/org/killbill/billing/util/glue/KillbillApiAopModule.java
@@ -22,6 +22,11 @@ import java.lang.reflect.Method;
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
 import org.killbill.billing.KillbillApi;
+import org.killbill.billing.callcontext.DefaultTenantContext;
+import org.killbill.billing.callcontext.InternalCallContext;
+import org.killbill.billing.callcontext.InternalTenantContext;
+import org.killbill.billing.osgi.api.ROTenantContext;
+import org.killbill.billing.util.callcontext.CallContext;
 import org.killbill.commons.profiling.Profiling;
 import org.killbill.commons.profiling.Profiling.WithProfilingCallback;
 import org.killbill.commons.profiling.ProfilingFeature.ProfilingFeatureType;
@@ -59,6 +64,11 @@ public class KillbillApiAopModule extends AbstractModule {
             return prof.executeWithProfiling(ProfilingFeatureType.API, invocation.getMethod().getName(), new WithProfilingCallback() {
                 @Override
                 public Object execute() throws Throwable {
+                    final boolean useRODBIfAvailable = shouldUseRODBIfAvailable(invocation);
+                    if (!useRODBIfAvailable) {
+                        setDirtyDBFlag();
+                    }
+
                     try {
                         logger.debug("Entering API call {}, arguments: {}", invocation.getMethod(), invocation.getArguments());
                         final Object proceed = invocation.proceed();
@@ -70,6 +80,39 @@ public class KillbillApiAopModule extends AbstractModule {
                 }
             });
         }
+
+        private boolean shouldUseRODBIfAvailable(final MethodInvocation invocation) {
+            // Verify if the flag is already set for re-entrant calls
+            if (getDirtyDBFlag()) {
+                return false;
+            }
+
+            final Object[] arguments = invocation.getArguments();
+            if (arguments.length == 0) {
+                return false;
+            }
+
+            // Snowflakes from server filters
+            final boolean safeROOperations = "getTenantByApiKey".equals(invocation.getMethod().getName()) || "login".equals(invocation.getMethod().getName());
+            if (safeROOperations) {
+                return true;
+            }
+
+            for (int i = arguments.length - 1; i >= 0; i--) {
+                final Object argument = arguments[i];
+                // DefaultTenantContext belongs to killbill-internal-api and shouldn't be used by plugins
+                final boolean fromJAXRS = argument instanceof DefaultTenantContext && !(argument instanceof CallContext);
+                // Kill Bill internal re-entrant calls
+                final boolean fromInternalAPIs = argument instanceof InternalTenantContext && !(argument instanceof InternalCallContext);
+                // RO DB explicitly requested by a plugin
+                final boolean pluginRequestROInstance = argument instanceof ROTenantContext && !(argument instanceof CallContext);
+                if (fromJAXRS || fromInternalAPIs || pluginRequestROInstance) {
+                    return true;
+                }
+            }
+
+            return false;
+        }
     }
 
     public static void setDirtyDBFlag() {

Bonobo Git Server (6.3.0.632) © 2015 Jakub Chodounský · Official Page · Github