killbill-aplcache

Tag AUTO_BILLING_OFF -> AUTO_PAY_OFF

3/16/2012 6:24:36 PM

Martin Westhead

Commit: 93718c1

Tree: 9126144

Parents: d160be0

Changes

api/src/main/java/com/ning/billing/util/tag/ControlTagType.java 2(+1 -1)

util/src/main/java/com/ning/billing/util/tag/DefaultTagStore.java 2(+1 -1)

util/src/test/java/com/ning/billing/util/tag/TestTagStore.java 4(+2 -2)

Details

api/src/main/java/com/ning/billing/util/tag/ControlTagType.java 2(+1 -1)

diff --git a/api/src/main/java/com/ning/billing/util/tag/ControlTagType.java b/api/src/main/java/com/ning/billing/util/tag/ControlTagType.java
index c0e87e4..119c02d 100644
--- a/api/src/main/java/com/ning/billing/util/tag/ControlTagType.java
+++ b/api/src/main/java/com/ning/billing/util/tag/ControlTagType.java
@@ -17,7 +17,7 @@
 package com.ning.billing.util.tag;
 
 public enum ControlTagType {
-    AUTO_BILLING_OFF("Suspends billing until removed.", true, false),
+    AUTO_PAY_OFF("Suspends billing until removed.", true, false),
     AUTO_INVOICING_OFF("Suspends invoicing until removed.", false, true);
 
     private final String description;

util/src/main/java/com/ning/billing/util/tag/DefaultTagStore.java 2(+1 -1)

diff --git a/util/src/main/java/com/ning/billing/util/tag/DefaultTagStore.java b/util/src/main/java/com/ning/billing/util/tag/DefaultTagStore.java
index 5bea67a..eace017 100644
--- a/util/src/main/java/com/ning/billing/util/tag/DefaultTagStore.java
+++ b/util/src/main/java/com/ning/billing/util/tag/DefaultTagStore.java
@@ -38,7 +38,7 @@ public class DefaultTagStore extends EntityCollectionBase<Tag> implements TagSto
         for (Tag tag : entities.values()) {
             if (tag instanceof ControlTag) {
                 ControlTag controlTag = (ControlTag) tag;
-                if (controlTag.getControlTagType() == ControlTagType.AUTO_BILLING_OFF) {
+                if (controlTag.getControlTagType() == ControlTagType.AUTO_PAY_OFF) {
                     return false;
                 }
             }

util/src/test/java/com/ning/billing/util/tag/TestTagStore.java 4(+2 -2)

diff --git a/util/src/test/java/com/ning/billing/util/tag/TestTagStore.java b/util/src/test/java/com/ning/billing/util/tag/TestTagStore.java
index 52dede6..47e7a83 100644
--- a/util/src/test/java/com/ning/billing/util/tag/TestTagStore.java
+++ b/util/src/test/java/com/ning/billing/util/tag/TestTagStore.java
@@ -219,7 +219,7 @@ public class TestTagStore {
         assertEquals(tagStore.generateInvoice(), false);
         assertEquals(tagStore.processPayment(), true);
 
-        ControlTag paymentTag = new DefaultControlTag("testUser", clock.getUTCNow(), ControlTagType.AUTO_BILLING_OFF);
+        ControlTag paymentTag = new DefaultControlTag("testUser", clock.getUTCNow(), ControlTagType.AUTO_PAY_OFF);
         tagStore.add(paymentTag);
         assertEquals(tagStore.generateInvoice(), false);
         assertEquals(tagStore.processPayment(), false);
@@ -227,7 +227,7 @@ public class TestTagStore {
 
     @Test(expectedExceptions = TagDefinitionApiException.class)
     public void testTagDefinitionCreationWithControlTagName() throws TagDefinitionApiException {
-        String definitionName = ControlTagType.AUTO_BILLING_OFF.toString();
+        String definitionName = ControlTagType.AUTO_PAY_OFF.toString();
         tagDefinitionDao.create(definitionName, "This should break", "test");
     }