killbill-memoizeit

diff --git a/overdue/src/main/java/org/killbill/billing/overdue/config/DefaultOverdueCondition.java b/overdue/src/main/java/org/killbill/billing/overdue/config/DefaultOverdueCondition.java
index 743012e..3cca103 100644
--- a/overdue/src/main/java/org/killbill/billing/overdue/config/DefaultOverdueCondition.java
+++ b/overdue/src/main/java/org/killbill/billing/overdue/config/DefaultOverdueCondition.java
@@ -57,8 +57,8 @@ public class DefaultOverdueCondition extends ValidatingConfig<DefaultOverdueConf
     @XmlElement(required = false, name = "response")
     private PaymentResponse[] responseForLastFailedPayment;
 
-    @XmlElement(required = false, name = "controlTag")
-    private ControlTagType controlTag;
+    @XmlElement(required = false, name = "controlTagInclusion")
+    private ControlTagType controlTagInclusion;
 
     @XmlElement(required = false, name = "controlTagExclusion")
     private ControlTagType controlTagExclusion;
@@ -76,7 +76,7 @@ public class DefaultOverdueCondition extends ValidatingConfig<DefaultOverdueConf
                 (timeSinceEarliestUnpaidInvoiceEqualsOrExceeds == null ||
                  (unpaidInvoiceTriggerDate != null && !unpaidInvoiceTriggerDate.isAfter(date))) &&
                 (responseForLastFailedPayment == null || responseIsIn(state.getResponseForLastFailedPayment(), responseForLastFailedPayment)) &&
-                (controlTag == null || isTagIn(controlTag, state.getTags())) &&
+                (controlTagInclusion == null || isTagIn(controlTagInclusion, state.getTags())) &&
                 (controlTagExclusion == null || isTagNotIn(controlTagExclusion, state.getTags()));
     }
 
@@ -148,8 +148,8 @@ public class DefaultOverdueCondition extends ValidatingConfig<DefaultOverdueConf
     }
 
     @Override
-    public ControlTagType getControlTagType() {
-        return controlTag;
+    public ControlTagType getInclusionControlTagType() {
+        return controlTagInclusion;
     }
 
     @Override
@@ -164,7 +164,7 @@ public class DefaultOverdueCondition extends ValidatingConfig<DefaultOverdueConf
         sb.append(", totalUnpaidInvoiceBalanceEqualsOrExceeds=").append(totalUnpaidInvoiceBalanceEqualsOrExceeds);
         sb.append(", timeSinceEarliestUnpaidInvoiceEqualsOrExceeds=").append(timeSinceEarliestUnpaidInvoiceEqualsOrExceeds);
         sb.append(", responseForLastFailedPayment=").append(Arrays.toString(responseForLastFailedPayment));
-        sb.append(", controlTag=").append(controlTag);
+        sb.append(", controlTagInclusion=").append(controlTagInclusion);
         sb.append(", controlTagExclusion=").append(controlTagExclusion);
         sb.append('}');
         return sb.toString();

diff --git a/overdue/src/test/java/org/killbill/billing/overdue/config/TestCondition.java b/overdue/src/test/java/org/killbill/billing/overdue/config/TestCondition.java
index 1e6ee8c..99efef6 100644
--- a/overdue/src/test/java/org/killbill/billing/overdue/config/TestCondition.java
+++ b/overdue/src/test/java/org/killbill/billing/overdue/config/TestCondition.java
@@ -139,7 +139,7 @@ public class TestCondition extends OverdueTestSuiteNoDB {
     public void testHasControlTag() throws Exception {
         final String xml =
                 "<condition>" +
-                "	<controlTag>OVERDUE_ENFORCEMENT_OFF</controlTag>" +
+                "	<controlTagInclusion>OVERDUE_ENFORCEMENT_OFF</controlTagInclusion>" +
                 "</condition>";
         final InputStream is = new ByteArrayInputStream(xml.getBytes());
         final MockCondition c = XMLLoader.getObjectFromStreamNoValidation(is, MockCondition.class);

diff --git a/overdue/src/test/java/org/killbill/billing/overdue/TestOverdueHelper.java b/overdue/src/test/java/org/killbill/billing/overdue/TestOverdueHelper.java
index ac380e7..f805d5d 100644
--- a/overdue/src/test/java/org/killbill/billing/overdue/TestOverdueHelper.java
+++ b/overdue/src/test/java/org/killbill/billing/overdue/TestOverdueHelper.java
@@ -81,7 +81,7 @@ public class TestOverdueHelper {
             "               <timeSinceEarliestUnpaidInvoiceEqualsOrExceeds>" +
             "                   <unit>DAYS</unit><number>30</number>" +
             "               </timeSinceEarliestUnpaidInvoiceEqualsOrExceeds>" +
-            "               <controlTag>TEST</controlTag>" +
+            "               <controlTagInclusion>TEST</controlTagInclusion>" +
             "           </condition>" +
             "           <externalMessage>Reached OD1</externalMessage>" +
             "           <blockChanges>true</blockChanges>" +

diff --git a/overdue/src/test/resources/OverdueConfigSchema.xsd b/overdue/src/test/resources/OverdueConfigSchema.xsd
index dfb0e47..7b95f24 100644
--- a/overdue/src/test/resources/OverdueConfigSchema.xsd
+++ b/overdue/src/test/resources/OverdueConfigSchema.xsd
@@ -71,7 +71,7 @@
 </xs:sequence>
 </xs:complexType>
 </xs:element>
-<xs:element minOccurs="0" name="controlTag" type="controlTagType"/>
+<xs:element minOccurs="0" name="controlTagInclusion" type="controlTagType"/>
 <xs:element minOccurs="0" name="controlTagExclusion" type="controlTagType"/>
 </xs:sequence>
 </xs:extension>

diff --git a/profiles/killbill/src/test/resources/overdueWithControlTag.xml b/profiles/killbill/src/test/resources/overdueWithControlTag.xml
index dcb06f9..6d20b0e 100644
--- a/profiles/killbill/src/test/resources/overdueWithControlTag.xml
+++ b/profiles/killbill/src/test/resources/overdueWithControlTag.xml
@@ -22,7 +22,7 @@
                <timeSinceEarliestUnpaidInvoiceEqualsOrExceeds>
                    <unit>DAYS</unit><number>50</number>
                </timeSinceEarliestUnpaidInvoiceEqualsOrExceeds>
-               <controlTag>TEST</controlTag>
+               <controlTagInclusion>TEST</controlTagInclusion>
            </condition>
            <externalMessage>Reached OD3</externalMessage>
            <blockChanges>true</blockChanges>
@@ -36,7 +36,7 @@
                <timeSinceEarliestUnpaidInvoiceEqualsOrExceeds>
                    <unit>DAYS</unit><number>40</number>
                </timeSinceEarliestUnpaidInvoiceEqualsOrExceeds>
-               <controlTag>TEST</controlTag>
+               <controlTagInclusion>TEST</controlTagInclusion>
            </condition>
            <externalMessage>Reached OD2</externalMessage>
            <blockChanges>true</blockChanges>
@@ -50,7 +50,7 @@
                <timeSinceEarliestUnpaidInvoiceEqualsOrExceeds>
                    <unit>DAYS</unit><number>30</number>
                </timeSinceEarliestUnpaidInvoiceEqualsOrExceeds>
-               <controlTag>TEST</controlTag>
+               <controlTagInclusion>TEST</controlTagInclusion>
            </condition>
            <externalMessage>Reached OD1</externalMessage>
            <blockChanges>true</blockChanges>