Details
diff --git a/jaxrs/src/main/java/com/ning/billing/jaxrs/json/SubscriptionJsonNoEvents.java b/jaxrs/src/main/java/com/ning/billing/jaxrs/json/SubscriptionJsonNoEvents.java
index c6f0930..9ca0078 100644
--- a/jaxrs/src/main/java/com/ning/billing/jaxrs/json/SubscriptionJsonNoEvents.java
+++ b/jaxrs/src/main/java/com/ning/billing/jaxrs/json/SubscriptionJsonNoEvents.java
@@ -118,10 +118,17 @@ public class SubscriptionJsonNoEvents extends SubscriptionJsonSimple {
@Override
public boolean equals(final Object o) {
- return equalsNoId(o) && super.equals(o);
+ if (equalsNoSubscriptionIdNoStartDateNoCTD(o) && super.equals(o)) {
+ final SubscriptionJsonNoEvents that = (SubscriptionJsonNoEvents) o;
+ return ((startDate == null && that.startDate == null) || (startDate != null && that.startDate != null && startDate.compareTo(that.startDate) == 0)) &&
+ ((chargedThroughDate == null && that.chargedThroughDate == null) || (chargedThroughDate != null && that.chargedThroughDate != null &&
+ chargedThroughDate.compareTo(that.chargedThroughDate) == 0));
+ } else {
+ return false;
+ }
}
- public boolean equalsNoId(final Object o) {
+ public boolean equalsNoSubscriptionIdNoStartDateNoCTD(final Object o) {
if (this == o) {
return true;
}
@@ -137,10 +144,6 @@ public class SubscriptionJsonNoEvents extends SubscriptionJsonSimple {
if (bundleId != null ? !bundleId.equals(that.bundleId) : that.bundleId != null) {
return false;
}
- if (!((chargedThroughDate == null && that.chargedThroughDate == null) ||
- (chargedThroughDate != null && that.chargedThroughDate != null && chargedThroughDate.compareTo(that.chargedThroughDate) == 0))) {
- return false;
- }
if (priceList != null ? !priceList.equals(that.priceList) : that.priceList != null) {
return false;
}
@@ -150,10 +153,6 @@ public class SubscriptionJsonNoEvents extends SubscriptionJsonSimple {
if (productName != null ? !productName.equals(that.productName) : that.productName != null) {
return false;
}
- if (!((startDate == null && that.startDate == null) ||
- (startDate != null && that.startDate != null && startDate.compareTo(that.startDate) == 0))) {
- return false;
- }
return true;
}
diff --git a/server/src/test/java/com/ning/billing/jaxrs/TestJaxrsBase.java b/server/src/test/java/com/ning/billing/jaxrs/TestJaxrsBase.java
index 8713e8d..fc79311 100644
--- a/server/src/test/java/com/ning/billing/jaxrs/TestJaxrsBase.java
+++ b/server/src/test/java/com/ning/billing/jaxrs/TestJaxrsBase.java
@@ -378,7 +378,7 @@ public class TestJaxrsBase {
baseJson = response.getResponseBody();
SubscriptionJsonNoEvents objFromJson = mapper.readValue(baseJson, SubscriptionJsonNoEvents.class);
- Assert.assertTrue(objFromJson.equalsNoId(input));
+ Assert.assertTrue(objFromJson.equalsNoSubscriptionIdNoStartDateNoCTD(input));
return objFromJson;
}
diff --git a/server/src/test/java/com/ning/billing/jaxrs/TestSubscription.java b/server/src/test/java/com/ning/billing/jaxrs/TestSubscription.java
index 962352b..e0a951e 100644
--- a/server/src/test/java/com/ning/billing/jaxrs/TestSubscription.java
+++ b/server/src/test/java/com/ning/billing/jaxrs/TestSubscription.java
@@ -89,7 +89,7 @@ public class TestSubscription extends TestJaxrsBase {
assertEquals(response.getStatusCode(), Status.OK.getStatusCode());
baseJson = response.getResponseBody();
objFromJson = mapper.readValue(baseJson, SubscriptionJsonNoEvents.class);
- assertTrue(objFromJson.equals(newInput));
+ assertTrue(objFromJson.equalsNoSubscriptionIdNoStartDateNoCTD(newInput));
// MOVE AFTER TRIAL
Interval it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusMonths(3).plusDays(1));