Details
diff --git a/beatrix/src/test/resources/retiredCatalogs/WeaponsHireSmall-v1.xml b/beatrix/src/test/resources/retiredCatalogs/WeaponsHireSmall-v1.xml
index a8456f3..4701c94 100644
--- a/beatrix/src/test/resources/retiredCatalogs/WeaponsHireSmall-v1.xml
+++ b/beatrix/src/test/resources/retiredCatalogs/WeaponsHireSmall-v1.xml
@@ -96,7 +96,7 @@
<plans>
<plan name="pistol-monthly">
- <effectiveDateForExistingSubscriptons>2011-03-14T00:00:00+00:00</effectiveDateForExistingSubscriptons>
+ <effectiveDateForExistingSubscriptions>2011-03-14T00:00:00+00:00</effectiveDateForExistingSubscriptions>
<product>Pistol</product>
<initialPhases>
<phase type="TRIAL">
diff --git a/catalog/src/main/java/org/killbill/billing/catalog/DefaultPlan.java b/catalog/src/main/java/org/killbill/billing/catalog/DefaultPlan.java
index 7d1c326..29cbeb2 100644
--- a/catalog/src/main/java/org/killbill/billing/catalog/DefaultPlan.java
+++ b/catalog/src/main/java/org/killbill/billing/catalog/DefaultPlan.java
@@ -56,9 +56,9 @@ public class DefaultPlan extends ValidatingConfig<StandaloneCatalog> implements
@XmlID
private String name;
- //TODO MDW Validation - effectiveDateForExistingSubscriptons > catalog effectiveDate
+ //TODO MDW Validation - effectiveDateForExistingSubscriptions > catalog effectiveDate
@XmlElement(required = false)
- private Date effectiveDateForExistingSubscriptons;
+ private Date effectiveDateForExistingSubscriptions;
@XmlElement(required = true)
@XmlIDREF
@@ -86,7 +86,7 @@ public class DefaultPlan extends ValidatingConfig<StandaloneCatalog> implements
public DefaultPlan(final String planName, final DefaultPlan in, final PlanPhasePriceOverride[] overrides) {
this.name = planName;
- this.effectiveDateForExistingSubscriptons = in.getEffectiveDateForExistingSubscriptons();
+ this.effectiveDateForExistingSubscriptions = in.getEffectiveDateForExistingSubscriptions();
this.product = (DefaultProduct) in.getProduct();
this.initialPhases = new DefaultPlanPhase[in.getInitialPhases().length];
for (int i = 0; i < overrides.length - 1; i++) {
@@ -98,8 +98,8 @@ public class DefaultPlan extends ValidatingConfig<StandaloneCatalog> implements
}
@Override
- public Date getEffectiveDateForExistingSubscriptons() {
- return effectiveDateForExistingSubscriptons;
+ public Date getEffectiveDateForExistingSubscriptions() {
+ return effectiveDateForExistingSubscriptions;
}
@Override
@@ -190,10 +190,10 @@ public class DefaultPlan extends ValidatingConfig<StandaloneCatalog> implements
@Override
public ValidationErrors validate(final StandaloneCatalog catalog, final ValidationErrors errors) {
- if (effectiveDateForExistingSubscriptons != null &&
- catalog.getEffectiveDate().getTime() > effectiveDateForExistingSubscriptons.getTime()) {
+ if (effectiveDateForExistingSubscriptions != null &&
+ catalog.getEffectiveDate().getTime() > effectiveDateForExistingSubscriptions.getTime()) {
errors.add(new ValidationError(String.format("Price effective date %s is before catalog effective date '%s'",
- effectiveDateForExistingSubscriptons,
+ effectiveDateForExistingSubscriptions,
catalog.getEffectiveDate().getTime()),
catalog.getCatalogURI(), DefaultInternationalPrice.class, ""));
}
@@ -203,9 +203,9 @@ public class DefaultPlan extends ValidatingConfig<StandaloneCatalog> implements
return errors;
}
- public void setEffectiveDateForExistingSubscriptons(
- final Date effectiveDateForExistingSubscriptons) {
- this.effectiveDateForExistingSubscriptons = effectiveDateForExistingSubscriptons;
+ public void setEffectiveDateForExistingSubscriptions(
+ final Date effectiveDateForExistingSubscriptions) {
+ this.effectiveDateForExistingSubscriptions = effectiveDateForExistingSubscriptions;
}
public DefaultPlan setName(final String name) {
@@ -274,7 +274,7 @@ public class DefaultPlan extends ValidatingConfig<StandaloneCatalog> implements
final DefaultPlan that = (DefaultPlan) o;
- if (effectiveDateForExistingSubscriptons != null ? !effectiveDateForExistingSubscriptons.equals(that.effectiveDateForExistingSubscriptons) : that.effectiveDateForExistingSubscriptons != null) {
+ if (effectiveDateForExistingSubscriptions != null ? !effectiveDateForExistingSubscriptions.equals(that.effectiveDateForExistingSubscriptions) : that.effectiveDateForExistingSubscriptions != null) {
return false;
}
if (finalPhase != null ? !finalPhase.equals(that.finalPhase) : that.finalPhase != null) {
@@ -298,7 +298,7 @@ public class DefaultPlan extends ValidatingConfig<StandaloneCatalog> implements
@Override
public int hashCode() {
int result = name != null ? name.hashCode() : 0;
- result = 31 * result + (effectiveDateForExistingSubscriptons != null ? effectiveDateForExistingSubscriptons.hashCode() : 0);
+ result = 31 * result + (effectiveDateForExistingSubscriptions != null ? effectiveDateForExistingSubscriptions.hashCode() : 0);
result = 31 * result + (initialPhases != null ? Arrays.hashCode(initialPhases) : 0);
result = 31 * result + (finalPhase != null ? finalPhase.hashCode() : 0);
result = 31 * result + (plansAllowedInBundle != null ? plansAllowedInBundle.hashCode() : 0);
@@ -307,8 +307,8 @@ public class DefaultPlan extends ValidatingConfig<StandaloneCatalog> implements
@Override
public String toString() {
- return "DefaultPlan [name=" + name + ", effectiveDateForExistingSubscriptons="
- + effectiveDateForExistingSubscriptons + ", product=" + product + ", initialPhases="
+ return "DefaultPlan [name=" + name + ", effectiveDateForExistingSubscriptions="
+ + effectiveDateForExistingSubscriptions + ", product=" + product + ", initialPhases="
+ Arrays.toString(initialPhases) + ", finalPhase=" + finalPhase + ", plansAllowedInBundle="
+ plansAllowedInBundle + "]";
}
diff --git a/catalog/src/main/java/org/killbill/billing/catalog/plugin/StandaloneCatalogMapper.java b/catalog/src/main/java/org/killbill/billing/catalog/plugin/StandaloneCatalogMapper.java
index b8335b0..1b42d71 100644
--- a/catalog/src/main/java/org/killbill/billing/catalog/plugin/StandaloneCatalogMapper.java
+++ b/catalog/src/main/java/org/killbill/billing/catalog/plugin/StandaloneCatalogMapper.java
@@ -427,7 +427,7 @@ public class StandaloneCatalogMapper {
}
final DefaultPlan result = new DefaultPlan();
result.setName(input.getName());
- result.setEffectiveDateForExistingSubscriptons(input.getEffectiveDateForExistingSubscriptons());
+ result.setEffectiveDateForExistingSubscriptions(input.getEffectiveDateForExistingSubscriptions());
result.setFinalPhase(toDefaultPlanPhase(input.getFinalPhase()));
result.setInitialPhases(toDefaultPlanPhases(ImmutableList.copyOf(input.getInitialPhases())));
result.setPlansAllowedInBundle(input.getPlansAllowedInBundle());
diff --git a/catalog/src/main/java/org/killbill/billing/catalog/VersionedCatalog.java b/catalog/src/main/java/org/killbill/billing/catalog/VersionedCatalog.java
index 02b746d..de4e38a 100644
--- a/catalog/src/main/java/org/killbill/billing/catalog/VersionedCatalog.java
+++ b/catalog/src/main/java/org/killbill/billing/catalog/VersionedCatalog.java
@@ -176,8 +176,8 @@ public class VersionedCatalog extends ValidatingConfig<StandaloneCatalogWithPric
if (!subscriptionStartDate.isBefore(catalogEffectiveDate)) { // Its a new subscription this plan always applies
return plan;
} else { //Its an existing subscription
- if (plan.getEffectiveDateForExistingSubscriptons() != null) { //if it is null any change to this does not apply to existing subscriptions
- final DateTime existingSubscriptionDate = CatalogDateHelper.toUTCDateTime(plan.getEffectiveDateForExistingSubscriptons());
+ if (plan.getEffectiveDateForExistingSubscriptions() != null) { //if it is null any change to this does not apply to existing subscriptions
+ final DateTime existingSubscriptionDate = CatalogDateHelper.toUTCDateTime(plan.getEffectiveDateForExistingSubscriptions());
if (requestedDate.isAfter(existingSubscriptionDate)) { // this plan is now applicable to existing subs
return plan;
}
diff --git a/catalog/src/test/java/org/killbill/billing/catalog/TestDefaultPriceOverride.java b/catalog/src/test/java/org/killbill/billing/catalog/TestDefaultPriceOverride.java
index 0af9c4a..858dde8 100644
--- a/catalog/src/test/java/org/killbill/billing/catalog/TestDefaultPriceOverride.java
+++ b/catalog/src/test/java/org/killbill/billing/catalog/TestDefaultPriceOverride.java
@@ -64,8 +64,8 @@ public class TestDefaultPriceOverride extends CatalogTestSuiteWithEmbeddedDB {
assertEquals(overriddenPlan.getProduct().getName(), plan.getProduct().getName());
assertEquals(overriddenPlan.getRecurringBillingPeriod(), plan.getRecurringBillingPeriod());
- if (plan.getEffectiveDateForExistingSubscriptons() != null) {
- assertEquals(overriddenPlan.getEffectiveDateForExistingSubscriptons().compareTo(plan.getEffectiveDateForExistingSubscriptons()), 0);
+ if (plan.getEffectiveDateForExistingSubscriptions() != null) {
+ assertEquals(overriddenPlan.getEffectiveDateForExistingSubscriptions().compareTo(plan.getEffectiveDateForExistingSubscriptions()), 0);
}
assertNotEquals(overriddenPlan.getFinalPhase().getName(), plan.getFinalPhase().getName());
assertEquals(overriddenPlan.getPlansAllowedInBundle(), plan.getPlansAllowedInBundle());
@@ -131,8 +131,8 @@ public class TestDefaultPriceOverride extends CatalogTestSuiteWithEmbeddedDB {
assertEquals(overriddenPlan.getProduct().getName(), plan.getProduct().getName());
assertEquals(overriddenPlan.getRecurringBillingPeriod(), plan.getRecurringBillingPeriod());
- if (plan.getEffectiveDateForExistingSubscriptons() != null) {
- assertEquals(overriddenPlan.getEffectiveDateForExistingSubscriptons().compareTo(plan.getEffectiveDateForExistingSubscriptons()), 0);
+ if (plan.getEffectiveDateForExistingSubscriptions() != null) {
+ assertEquals(overriddenPlan.getEffectiveDateForExistingSubscriptions().compareTo(plan.getEffectiveDateForExistingSubscriptions()), 0);
}
assertNotEquals(overriddenPlan.getFinalPhase().getName(), plan.getFinalPhase().getName());
assertEquals(overriddenPlan.getPlansAllowedInBundle(), plan.getPlansAllowedInBundle());
diff --git a/catalog/src/test/java/org/killbill/billing/catalog/TestPlan.java b/catalog/src/test/java/org/killbill/billing/catalog/TestPlan.java
index 466b1c4..86f5033 100644
--- a/catalog/src/test/java/org/killbill/billing/catalog/TestPlan.java
+++ b/catalog/src/test/java/org/killbill/billing/catalog/TestPlan.java
@@ -32,7 +32,7 @@ public class TestPlan extends CatalogTestSuiteNoDB {
final StandaloneCatalog c = new MockCatalog();
c.setSupportedCurrencies(new Currency[]{Currency.GBP, Currency.EUR, Currency.USD, Currency.BRL, Currency.MXN});
final DefaultPlan p1 = MockPlan.createBicycleTrialEvergreen1USD();
- p1.setEffectiveDateForExistingSubscriptons(new Date((new Date().getTime()) - (1000 * 60 * 60 * 24)));
+ p1.setEffectiveDateForExistingSubscriptions(new Date((new Date().getTime()) - (1000 * 60 * 60 * 24)));
final ValidationErrors errors = p1.validate(c, new ValidationErrors());
Assert.assertEquals(errors.size(), 1);
errors.log(log);
diff --git a/catalog/src/test/resources/versionedCatalog/WeaponsHireSmall-2.xml b/catalog/src/test/resources/versionedCatalog/WeaponsHireSmall-2.xml
index 251678b..f04ff0e 100644
--- a/catalog/src/test/resources/versionedCatalog/WeaponsHireSmall-2.xml
+++ b/catalog/src/test/resources/versionedCatalog/WeaponsHireSmall-2.xml
@@ -87,7 +87,7 @@
<plans>
<plan name="pistol-monthly">
- <effectiveDateForExistingSubscriptons>2011-02-14T00:00:00+00:00</effectiveDateForExistingSubscriptons>
+ <effectiveDateForExistingSubscriptions>2011-02-14T00:00:00+00:00</effectiveDateForExistingSubscriptions>
<product>Pistol</product>
<initialPhases>
diff --git a/catalog/src/test/resources/versionedCatalog/WeaponsHireSmall-3.xml b/catalog/src/test/resources/versionedCatalog/WeaponsHireSmall-3.xml
index bdeca61..dc9c0b1 100644
--- a/catalog/src/test/resources/versionedCatalog/WeaponsHireSmall-3.xml
+++ b/catalog/src/test/resources/versionedCatalog/WeaponsHireSmall-3.xml
@@ -87,7 +87,7 @@
<plans>
<plan name="pistol-monthly">
- <effectiveDateForExistingSubscriptons>2011-03-14T00:00:00+00:00</effectiveDateForExistingSubscriptons>
+ <effectiveDateForExistingSubscriptions>2011-03-14T00:00:00+00:00</effectiveDateForExistingSubscriptions>
<product>Pistol</product>
<initialPhases>
<phase type="TRIAL">
diff --git a/util/src/test/java/org/killbill/billing/mock/MockPlan.java b/util/src/test/java/org/killbill/billing/mock/MockPlan.java
index 004346e..ab6ae03 100644
--- a/util/src/test/java/org/killbill/billing/mock/MockPlan.java
+++ b/util/src/test/java/org/killbill/billing/mock/MockPlan.java
@@ -63,7 +63,7 @@ public class MockPlan implements Plan {
}
@Override
- public Date getEffectiveDateForExistingSubscriptons() {
+ public Date getEffectiveDateForExistingSubscriptions() {
return new Date();
}
