Details
diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/BillingExceptionJson.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/BillingExceptionJson.java
index 2dd9324..7643502 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/BillingExceptionJson.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/BillingExceptionJson.java
@@ -163,19 +163,19 @@ public class BillingExceptionJson {
private final String fileName;
private final Integer lineNumber;
private final String methodName;
- private final Boolean nativeMethod;
+ private final Boolean isNativeMethod;
@JsonCreator
public StackTraceElementJson(@JsonProperty("className") final String className,
@JsonProperty("fileName") final String fileName,
@JsonProperty("lineNumber") final Integer lineNumber,
@JsonProperty("methodName") final String methodName,
- @JsonProperty("nativeMethod") final Boolean nativeMethod) {
+ @JsonProperty("isNativeMethod") final Boolean isNativeMethod) {
this.className = className;
this.fileName = fileName;
this.lineNumber = lineNumber;
this.methodName = methodName;
- this.nativeMethod = nativeMethod;
+ this.isNativeMethod = isNativeMethod;
}
public String getClassName() {
@@ -194,8 +194,9 @@ public class BillingExceptionJson {
return methodName;
}
- public Boolean getNativeMethod() {
- return nativeMethod;
+ @JsonProperty("isNativeMethod")
+ public Boolean isNativeMethod() {
+ return isNativeMethod;
}
@Override
@@ -205,7 +206,7 @@ public class BillingExceptionJson {
sb.append(", fileName='").append(fileName).append('\'');
sb.append(", lineNumber=").append(lineNumber);
sb.append(", methodName='").append(methodName).append('\'');
- sb.append(", nativeMethod=").append(nativeMethod);
+ sb.append(", isNativeMethod=").append(isNativeMethod);
sb.append('}');
return sb.toString();
}
@@ -233,7 +234,7 @@ public class BillingExceptionJson {
if (methodName != null ? !methodName.equals(that.methodName) : that.methodName != null) {
return false;
}
- if (nativeMethod != null ? !nativeMethod.equals(that.nativeMethod) : that.nativeMethod != null) {
+ if (isNativeMethod != null ? !isNativeMethod.equals(that.isNativeMethod) : that.isNativeMethod != null) {
return false;
}
@@ -246,7 +247,7 @@ public class BillingExceptionJson {
result = 31 * result + (fileName != null ? fileName.hashCode() : 0);
result = 31 * result + (lineNumber != null ? lineNumber.hashCode() : 0);
result = 31 * result + (methodName != null ? methodName.hashCode() : 0);
- result = 31 * result + (nativeMethod != null ? nativeMethod.hashCode() : 0);
+ result = 31 * result + (isNativeMethod != null ? isNativeMethod.hashCode() : 0);
return result;
}
}
diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/BlockingStateJson.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/BlockingStateJson.java
index 588350a..bafc4bc 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/BlockingStateJson.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/BlockingStateJson.java
@@ -23,7 +23,6 @@ import java.util.UUID;
import javax.annotation.Nullable;
import org.joda.time.DateTime;
-import org.joda.time.LocalDate;
import org.killbill.billing.entitlement.api.BlockingState;
import org.killbill.billing.entitlement.api.BlockingStateType;
import org.killbill.billing.util.audit.AccountAuditLogs;
@@ -31,7 +30,6 @@ import org.killbill.billing.util.audit.AccountAuditLogs;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
@ApiModel(value="BlockingState", parent = JsonBase.class)
public class BlockingStateJson extends JsonBase {
@@ -39,9 +37,9 @@ public class BlockingStateJson extends JsonBase {
private final UUID blockedId;
private final String stateName;
private final String service;
- private final Boolean blockChange;
- private final Boolean blockEntitlement;
- private final Boolean blockBilling;
+ private final Boolean isBlockChange;
+ private final Boolean isBlockEntitlement;
+ private final Boolean isBlockBilling;
private final DateTime effectiveDate;
private final BlockingStateType type;
@@ -49,9 +47,9 @@ public class BlockingStateJson extends JsonBase {
public BlockingStateJson(@JsonProperty("blockedId") final UUID blockedId,
@JsonProperty("stateName") final String stateName,
@JsonProperty("service") final String service,
- @JsonProperty("blockChange") final Boolean blockChange,
- @JsonProperty("blockEntitlement") final Boolean blockEntitlement,
- @JsonProperty("blockBilling") final Boolean blockBilling,
+ @JsonProperty("isBlockChange") final Boolean isBlockChange,
+ @JsonProperty("isBlockEntitlement") final Boolean isBlockEntitlement,
+ @JsonProperty("isBlockBilling") final Boolean isBlockBilling,
@JsonProperty("effectiveDate") final DateTime effectiveDate,
@JsonProperty("type") final BlockingStateType type,
@JsonProperty("auditLogs") @Nullable final List<AuditLogJson> auditLogs) {
@@ -59,9 +57,9 @@ public class BlockingStateJson extends JsonBase {
this.blockedId = blockedId;
this.stateName = stateName;
this.service = service;
- this.blockChange = blockChange;
- this.blockEntitlement = blockEntitlement;
- this.blockBilling = blockBilling;
+ this.isBlockChange = isBlockChange;
+ this.isBlockEntitlement = isBlockEntitlement;
+ this.isBlockBilling = isBlockBilling;
this.effectiveDate = effectiveDate;
this.type = type;
}
@@ -91,16 +89,19 @@ public class BlockingStateJson extends JsonBase {
return service;
}
+ @JsonProperty("isBlockChange")
public Boolean isBlockChange() {
- return blockChange;
+ return isBlockChange;
}
+ @JsonProperty("isBlockEntitlement")
public Boolean isBlockEntitlement() {
- return blockEntitlement;
+ return isBlockEntitlement;
}
+ @JsonProperty("isBlockBilling")
public Boolean isBlockBilling() {
- return blockBilling;
+ return isBlockBilling;
}
public DateTime getEffectiveDate() {
@@ -122,13 +123,13 @@ public class BlockingStateJson extends JsonBase {
final BlockingStateJson that = (BlockingStateJson) o;
- if (blockChange != that.blockChange) {
+ if (isBlockChange != that.isBlockChange) {
return false;
}
- if (blockEntitlement != that.blockEntitlement) {
+ if (isBlockEntitlement != that.isBlockEntitlement) {
return false;
}
- if (blockBilling != that.blockBilling) {
+ if (isBlockBilling != that.isBlockBilling) {
return false;
}
if (blockedId != null ? !blockedId.equals(that.blockedId) : that.blockedId != null) {
@@ -152,9 +153,9 @@ public class BlockingStateJson extends JsonBase {
int result = blockedId != null ? blockedId.hashCode() : 0;
result = 31 * result + (stateName != null ? stateName.hashCode() : 0);
result = 31 * result + (service != null ? service.hashCode() : 0);
- result = 31 * result + (blockChange ? 1 : 0);
- result = 31 * result + (blockEntitlement ? 1 : 0);
- result = 31 * result + (blockBilling ? 1 : 0);
+ result = 31 * result + (isBlockChange ? 1 : 0);
+ result = 31 * result + (isBlockEntitlement ? 1 : 0);
+ result = 31 * result + (isBlockBilling ? 1 : 0);
result = 31 * result + (effectiveDate != null ? effectiveDate.hashCode() : 0);
result = 31 * result + (type != null ? type.hashCode() : 0);
return result;
@@ -166,9 +167,9 @@ public class BlockingStateJson extends JsonBase {
"blockedId='" + blockedId + '\'' +
", stateName='" + stateName + '\'' +
", service='" + service + '\'' +
- ", blockChange=" + blockChange +
- ", blockEntitlement=" + blockEntitlement +
- ", blockBilling=" + blockBilling +
+ ", isBlockChange=" + isBlockChange +
+ ", isBlockEntitlement=" + isBlockEntitlement +
+ ", isBlockBilling=" + isBlockBilling +
", effectiveDate=" + effectiveDate +
", type=" + type +
'}';
diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/NodeCommandJson.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/NodeCommandJson.java
index ffcf1d3..8898e03 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/NodeCommandJson.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/NodeCommandJson.java
@@ -19,8 +19,6 @@ package org.killbill.billing.jaxrs.json;
import java.util.List;
-import org.killbill.billing.util.nodes.NodeCommandProperty;
-
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.ApiModel;
@@ -28,21 +26,22 @@ import io.swagger.annotations.ApiModel;
@ApiModel(value="NodeCommand")
public class NodeCommandJson {
- private final boolean systemCommandType;
+ private final boolean isSystemCommandType;
private final String nodeCommandType;
private final List<NodeCommandPropertyJson> nodeCommandProperties;
@JsonCreator
- public NodeCommandJson(@JsonProperty("systemCommandType") final boolean systemCommandType,
+ public NodeCommandJson(@JsonProperty("isSystemCommandType") final boolean isSystemCommandType,
@JsonProperty("nodeCommandType") final String nodeCommandType,
@JsonProperty("nodeCommandProperties") final List<NodeCommandPropertyJson> nodeCommandProperties) {
- this.systemCommandType = systemCommandType;
+ this.isSystemCommandType = isSystemCommandType;
this.nodeCommandType = nodeCommandType;
this.nodeCommandProperties = nodeCommandProperties;
}
+ @JsonProperty("isSystemCommandType")
public boolean isSystemCommandType() {
- return systemCommandType;
+ return isSystemCommandType;
}
public String getNodeCommandType() {
diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/OverdueJson.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/OverdueJson.java
index 1e30ce4..5a7a601 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/OverdueJson.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/OverdueJson.java
@@ -19,9 +19,7 @@ package org.killbill.billing.jaxrs.json;
import java.util.List;
-import org.killbill.billing.catalog.api.CurrencyValueNull;
import org.killbill.billing.catalog.api.TimeUnit;
-import org.killbill.billing.overdue.api.OverdueApiException;
import org.killbill.billing.overdue.api.OverdueConfig;
import org.killbill.billing.overdue.api.OverdueState;
import org.killbill.billing.overdue.config.DefaultDuration;
@@ -126,8 +124,8 @@ public class OverdueJson {
final DefaultOverdueState state = new DefaultOverdueState();
state.setName(cur.getName());
state.setExternalMessage(cur.getExternalMessage());
- state.setBlockChanges(cur.getBlockChanges());
- state.setDisableEntitlement(cur.getDisableEntitlement());
+ state.setBlockChanges(cur.isBlockChanges());
+ state.setDisableEntitlement(cur.isDisableEntitlement());
state.setSubscriptionCancellationPolicy(cur.getSubscriptionCancellationPolicy());
state.setClearState(cur.isClearState());
state.setAutoReevaluationInterval(computeReevaluationInterval(cur.getAutoReevaluationIntervalDays(), prevTimeSinceEarliestUnpaidInvoice, cur.getCondition().getTimeSinceEarliestUnpaidInvoiceEqualsOrExceeds().getNumber()));
diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/OverdueStateConfigJson.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/OverdueStateConfigJson.java
index 9a509ab..e646eb1 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/OverdueStateConfigJson.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/OverdueStateConfigJson.java
@@ -32,8 +32,8 @@ public class OverdueStateConfigJson {
private final Boolean isClearState;
private final OverdueConditionJson condition;
private final String externalMessage;
- private final Boolean blockChanges;
- private final Boolean disableEntitlement;
+ private final Boolean isBlockChanges;
+ private final Boolean isDisableEntitlement;
private final OverdueCancellationPolicy subscriptionCancellationPolicy;
private final Integer autoReevaluationIntervalDays;
@@ -42,16 +42,16 @@ public class OverdueStateConfigJson {
@JsonProperty("isClearState") final Boolean isClearState,
@JsonProperty("condition") final OverdueConditionJson condition,
@JsonProperty("externalMessage") final String externalMessage,
- @JsonProperty("blockChanges") final Boolean blockChanges,
- @JsonProperty("disableEntitlement") final Boolean disableEntitlement,
+ @JsonProperty("isBlockChanges") final Boolean isBlockChanges,
+ @JsonProperty("isDisableEntitlement") final Boolean isDisableEntitlement,
@JsonProperty("subscriptionCancellationPolicy") final OverdueCancellationPolicy subscriptionCancellationPolicy,
@JsonProperty("autoReevaluationIntervalDays") final Integer autoReevaluationInterval) {
this.name = name;
this.isClearState = isClearState;
this.condition = condition;
this.externalMessage = externalMessage;
- this.blockChanges = blockChanges;
- this.disableEntitlement = disableEntitlement;
+ this.isBlockChanges = isBlockChanges;
+ this.isDisableEntitlement = isDisableEntitlement;
this.subscriptionCancellationPolicy = subscriptionCancellationPolicy;
this.autoReevaluationIntervalDays = autoReevaluationInterval;
}
@@ -61,8 +61,8 @@ public class OverdueStateConfigJson {
this.isClearState = input.isClearState();
this.condition = input.getOverdueCondition() != null ? new OverdueConditionJson(input.getOverdueCondition()) : null;
this.externalMessage = input.getExternalMessage();
- this.blockChanges = input.isBlockChanges();
- this.disableEntitlement = input.isDisableEntitlementAndChangesBlocked();
+ this.isBlockChanges = input.isBlockChanges();
+ this.isDisableEntitlement = input.isDisableEntitlementAndChangesBlocked();
this.subscriptionCancellationPolicy = input.getOverdueCancellationPolicy();
Integer tmpAutoReevaluationIntervalDays = null;
try {
@@ -90,12 +90,14 @@ public class OverdueStateConfigJson {
return externalMessage;
}
- public Boolean getBlockChanges() {
- return blockChanges;
+ @JsonProperty("isBlockChanges")
+ public Boolean isBlockChanges() {
+ return isBlockChanges;
}
- public Boolean getDisableEntitlement() {
- return disableEntitlement;
+ @JsonProperty("isDisableEntitlement")
+ public Boolean isDisableEntitlement() {
+ return isDisableEntitlement;
}
public OverdueCancellationPolicy getSubscriptionCancellationPolicy() {
@@ -129,10 +131,10 @@ public class OverdueStateConfigJson {
if (externalMessage != null ? !externalMessage.equals(that.externalMessage) : that.externalMessage != null) {
return false;
}
- if (blockChanges != null ? !blockChanges.equals(that.blockChanges) : that.blockChanges != null) {
+ if (isBlockChanges != null ? !isBlockChanges.equals(that.isBlockChanges) : that.isBlockChanges != null) {
return false;
}
- if (disableEntitlement != null ? !disableEntitlement.equals(that.disableEntitlement) : that.disableEntitlement != null) {
+ if (isDisableEntitlement != null ? !isDisableEntitlement.equals(that.isDisableEntitlement) : that.isDisableEntitlement != null) {
return false;
}
if (subscriptionCancellationPolicy != that.subscriptionCancellationPolicy) {
@@ -148,8 +150,8 @@ public class OverdueStateConfigJson {
result = 31 * result + (isClearState != null ? isClearState.hashCode() : 0);
result = 31 * result + (condition != null ? condition.hashCode() : 0);
result = 31 * result + (externalMessage != null ? externalMessage.hashCode() : 0);
- result = 31 * result + (blockChanges != null ? blockChanges.hashCode() : 0);
- result = 31 * result + (disableEntitlement != null ? disableEntitlement.hashCode() : 0);
+ result = 31 * result + (isBlockChanges != null ? isBlockChanges.hashCode() : 0);
+ result = 31 * result + (isDisableEntitlement != null ? isDisableEntitlement.hashCode() : 0);
result = 31 * result + (subscriptionCancellationPolicy != null ? subscriptionCancellationPolicy.hashCode() : 0);
result = 31 * result + (autoReevaluationIntervalDays != null ? autoReevaluationIntervalDays.hashCode() : 0);
return result;
@@ -162,8 +164,8 @@ public class OverdueStateConfigJson {
", isClearState=" + isClearState +
", condition=" + condition +
", externalMessage='" + externalMessage + '\'' +
- ", blockChanges=" + blockChanges +
- ", disableEntitlement=" + disableEntitlement +
+ ", isBlockChanges=" + isBlockChanges +
+ ", isDisableEntitlement=" + isDisableEntitlement +
", subscriptionCancellationPolicy=" + subscriptionCancellationPolicy +
", autoReevaluationIntervalDays=" + autoReevaluationIntervalDays +
'}';
diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/OverdueStateJson.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/OverdueStateJson.java
index ef5f7fa..567ad91 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/OverdueStateJson.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/OverdueStateJson.java
@@ -33,8 +33,8 @@ public class OverdueStateJson {
private final String name;
private final String externalMessage;
private final List<Integer> daysBetweenPaymentRetries;
- private final Boolean disableEntitlementAndChangesBlocked;
- private final Boolean blockChanges;
+ private final Boolean isDisableEntitlementAndChangesBlocked;
+ private final Boolean isBlockChanges;
private final Boolean isClearState;
private final Integer reevaluationIntervalDays;
@@ -42,15 +42,15 @@ public class OverdueStateJson {
public OverdueStateJson(@JsonProperty("name") final String name,
@JsonProperty("externalMessage") final String externalMessage,
@JsonProperty("daysBetweenPaymentRetries") final List<Integer> daysBetweenPaymentRetries,
- @JsonProperty("disableEntitlementAndChangesBlocked") final Boolean disableEntitlementAndChangesBlocked,
- @JsonProperty("blockChanges") final Boolean blockChanges,
- @JsonProperty("clearState") final Boolean isClearState,
+ @JsonProperty("isDisableEntitlementAndChangesBlocked") final Boolean isDisableEntitlementAndChangesBlocked,
+ @JsonProperty("isBlockChanges") final Boolean isBlockChanges,
+ @JsonProperty("isClearState") final Boolean isClearState,
@JsonProperty("reevaluationIntervalDays") final Integer reevaluationIntervalDays) {
this.name = name;
this.externalMessage = externalMessage;
this.daysBetweenPaymentRetries = daysBetweenPaymentRetries;
- this.disableEntitlementAndChangesBlocked = disableEntitlementAndChangesBlocked;
- this.blockChanges = blockChanges;
+ this.isDisableEntitlementAndChangesBlocked = isDisableEntitlementAndChangesBlocked;
+ this.isBlockChanges = isBlockChanges;
this.isClearState = isClearState;
this.reevaluationIntervalDays = reevaluationIntervalDays;
}
@@ -60,8 +60,8 @@ public class OverdueStateJson {
this.externalMessage = overdueState.getExternalMessage();
// TODO this is broken if the per tenant system property was updated, but should we really return that in the OverdueState ?
this.daysBetweenPaymentRetries = paymentConfig.getPaymentFailureRetryDays(null);
- this.disableEntitlementAndChangesBlocked = overdueState.isDisableEntitlementAndChangesBlocked();
- this.blockChanges = overdueState.isBlockChanges();
+ this.isDisableEntitlementAndChangesBlocked = overdueState.isDisableEntitlementAndChangesBlocked();
+ this.isBlockChanges = overdueState.isBlockChanges();
this.isClearState = overdueState.isClearState();
Period reevaluationIntervalPeriod = null;
@@ -89,14 +89,17 @@ public class OverdueStateJson {
return daysBetweenPaymentRetries;
}
+ @JsonProperty("isDisableEntitlementAndChangesBlocked")
public Boolean isDisableEntitlementAndChangesBlocked() {
- return disableEntitlementAndChangesBlocked;
+ return isDisableEntitlementAndChangesBlocked;
}
+ @JsonProperty("isBlockChanges")
public Boolean isBlockChanges() {
- return blockChanges;
+ return isBlockChanges;
}
+ @JsonProperty("isClearState")
public Boolean isClearState() {
return isClearState;
}
@@ -112,8 +115,8 @@ public class OverdueStateJson {
sb.append("{name='").append(name).append('\'');
sb.append(", externalMessage='").append(externalMessage).append('\'');
sb.append(", daysBetweenPaymentRetries=").append(daysBetweenPaymentRetries);
- sb.append(", disableEntitlementAndChangesBlocked=").append(disableEntitlementAndChangesBlocked);
- sb.append(", blockChanges=").append(blockChanges);
+ sb.append(", isDisableEntitlementAndChangesBlocked=").append(isDisableEntitlementAndChangesBlocked);
+ sb.append(", isBlockChanges=").append(isBlockChanges);
sb.append(", isClearState=").append(isClearState);
sb.append(", reevaluationIntervalDays=").append(reevaluationIntervalDays);
sb.append('}');
@@ -131,13 +134,13 @@ public class OverdueStateJson {
final OverdueStateJson that = (OverdueStateJson) o;
- if (blockChanges != null ? !blockChanges.equals(that.blockChanges) : that.blockChanges != null) {
+ if (isBlockChanges != null ? !isBlockChanges.equals(that.isBlockChanges) : that.isBlockChanges != null) {
return false;
}
if (daysBetweenPaymentRetries != null ? !daysBetweenPaymentRetries.equals(that.daysBetweenPaymentRetries) : that.daysBetweenPaymentRetries != null) {
return false;
}
- if (disableEntitlementAndChangesBlocked != null ? !disableEntitlementAndChangesBlocked.equals(that.disableEntitlementAndChangesBlocked) : that.disableEntitlementAndChangesBlocked != null) {
+ if (isDisableEntitlementAndChangesBlocked != null ? !isDisableEntitlementAndChangesBlocked.equals(that.isDisableEntitlementAndChangesBlocked) : that.isDisableEntitlementAndChangesBlocked != null) {
return false;
}
if (externalMessage != null ? !externalMessage.equals(that.externalMessage) : that.externalMessage != null) {
@@ -161,8 +164,8 @@ public class OverdueStateJson {
int result = name != null ? name.hashCode() : 0;
result = 31 * result + (externalMessage != null ? externalMessage.hashCode() : 0);
result = 31 * result + (daysBetweenPaymentRetries != null ? daysBetweenPaymentRetries.hashCode() : 0);
- result = 31 * result + (disableEntitlementAndChangesBlocked != null ? disableEntitlementAndChangesBlocked.hashCode() : 0);
- result = 31 * result + (blockChanges != null ? blockChanges.hashCode() : 0);
+ result = 31 * result + (isDisableEntitlementAndChangesBlocked != null ? isDisableEntitlementAndChangesBlocked.hashCode() : 0);
+ result = 31 * result + (isBlockChanges != null ? isBlockChanges.hashCode() : 0);
result = 31 * result + (isClearState != null ? isClearState.hashCode() : 0);
result = 31 * result + (reevaluationIntervalDays != null ? reevaluationIntervalDays.hashCode() : 0);
return result;
diff --git a/jaxrs/src/test/java/org/killbill/billing/jaxrs/json/TestAccountEmailJson.java b/jaxrs/src/test/java/org/killbill/billing/jaxrs/json/TestAccountEmailJson.java
index 71419b0..a892f8f 100644
--- a/jaxrs/src/test/java/org/killbill/billing/jaxrs/json/TestAccountEmailJson.java
+++ b/jaxrs/src/test/java/org/killbill/billing/jaxrs/json/TestAccountEmailJson.java
@@ -38,7 +38,7 @@ public class TestAccountEmailJson extends JaxrsTestSuiteNoDB {
final String asJson = mapper.writeValueAsString(accountEmailJson);
Assert.assertEquals(asJson, "{\"accountId\":\"" + accountId + "\"," +
"\"email\":\"" + email + "\"," +
- "\"auditLogs\":null}");
+ "\"auditLogs\":[]}");
final AccountEmailJson fromJson = mapper.readValue(asJson, AccountEmailJson.class);
Assert.assertEquals(fromJson, accountEmailJson);
diff --git a/jaxrs/src/test/java/org/killbill/billing/jaxrs/json/TestBillingExceptionJson.java b/jaxrs/src/test/java/org/killbill/billing/jaxrs/json/TestBillingExceptionJson.java
index 626df42..72d3f5d 100644
--- a/jaxrs/src/test/java/org/killbill/billing/jaxrs/json/TestBillingExceptionJson.java
+++ b/jaxrs/src/test/java/org/killbill/billing/jaxrs/json/TestBillingExceptionJson.java
@@ -65,7 +65,7 @@ public class TestBillingExceptionJson extends JaxrsTestSuiteNoDB {
Assert.assertFalse(exceptionJson.getStackTrace().isEmpty());
Assert.assertEquals(exceptionJson.getStackTrace().get(0).getClassName(), TestBillingExceptionJson.class.getName());
Assert.assertEquals(exceptionJson.getStackTrace().get(0).getMethodName(), "testFromException");
- Assert.assertFalse(exceptionJson.getStackTrace().get(0).getNativeMethod());
+ Assert.assertFalse(exceptionJson.getStackTrace().get(0).isNativeMethod());
final BillingExceptionJson exceptionJsonNoStackTrace = new BillingExceptionJson(e, false);
Assert.assertEquals(exceptionJsonNoStackTrace.getClassName(), e.getClass().getName());
diff --git a/jaxrs/src/test/java/org/killbill/billing/jaxrs/json/TestCustomFieldJson.java b/jaxrs/src/test/java/org/killbill/billing/jaxrs/json/TestCustomFieldJson.java
index 792a1a2..30b9880 100644
--- a/jaxrs/src/test/java/org/killbill/billing/jaxrs/json/TestCustomFieldJson.java
+++ b/jaxrs/src/test/java/org/killbill/billing/jaxrs/json/TestCustomFieldJson.java
@@ -39,7 +39,7 @@ public class TestCustomFieldJson extends JaxrsTestSuiteNoDB {
Assert.assertEquals(customFieldJson.getObjectType(), objectType);
Assert.assertEquals(customFieldJson.getName(), name);
Assert.assertEquals(customFieldJson.getValue(), value);
- Assert.assertNull(customFieldJson.getAuditLogs());
+ Assert.assertEquals(customFieldJson.getAuditLogs().size(), 0);
final String asJson = mapper.writeValueAsString(customFieldJson);
final CustomFieldJson fromJson = mapper.readValue(asJson, CustomFieldJson.class);
diff --git a/jaxrs/src/test/java/org/killbill/billing/jaxrs/json/TestInvoiceEmailJson.java b/jaxrs/src/test/java/org/killbill/billing/jaxrs/json/TestInvoiceEmailJson.java
index f3a5a34..195603f 100644
--- a/jaxrs/src/test/java/org/killbill/billing/jaxrs/json/TestInvoiceEmailJson.java
+++ b/jaxrs/src/test/java/org/killbill/billing/jaxrs/json/TestInvoiceEmailJson.java
@@ -38,7 +38,7 @@ public class TestInvoiceEmailJson extends JaxrsTestSuiteNoDB {
final String asJson = mapper.writeValueAsString(invoiceEmailJson);
Assert.assertEquals(asJson, "{\"accountId\":\"" + accountId + "\"," +
"\"isNotifiedForInvoices\":" + isNotifiedForInvoices + "," +
- "\"auditLogs\":null}");
+ "\"auditLogs\":[]}");
final InvoiceEmailJson fromJson = mapper.readValue(asJson, InvoiceEmailJson.class);
Assert.assertEquals(fromJson, invoiceEmailJson);
diff --git a/jaxrs/src/test/java/org/killbill/billing/jaxrs/json/TestInvoiceJsonWithBundleKeys.java b/jaxrs/src/test/java/org/killbill/billing/jaxrs/json/TestInvoiceJsonWithBundleKeys.java
index 5dcbc4e..c4c9efe 100644
--- a/jaxrs/src/test/java/org/killbill/billing/jaxrs/json/TestInvoiceJsonWithBundleKeys.java
+++ b/jaxrs/src/test/java/org/killbill/billing/jaxrs/json/TestInvoiceJsonWithBundleKeys.java
@@ -106,7 +106,7 @@ public class TestInvoiceJsonWithBundleKeys extends JaxrsTestSuiteNoDB {
Assert.assertEquals(invoiceJson.getAccountId(), invoice.getAccountId());
Assert.assertEquals(invoiceJson.getBundleKeys(), bundleKeys);
Assert.assertEquals(invoiceJson.getCredits(), credits);
- Assert.assertNull(invoiceJson.getAuditLogs());
+ Assert.assertEquals(invoiceJson.getAuditLogs().size(),0);
Assert.assertEquals(invoiceJson.getStatus(), InvoiceStatus.COMMITTED.toString());
}
