jaxrs: Minor tweaks for overdue json endpoint

killbill · Aug 31, 2016 · 0c22ac5 · 0c22ac5 · pierre · Sep 1, 2016
1 parent c7308f8
commit 0c22ac5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/OverdueConditionJson.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/OverdueConditionJson.java
@@ -17,7 +17,6 @@
 
 package org.killbill.billing.jaxrs.json;
 
-import org.killbill.billing.catalog.api.CurrencyValueNull;
 import org.killbill.billing.jaxrs.json.CatalogJson.DurationJson;
 import org.killbill.billing.overdue.api.OverdueCondition;
 import org.killbill.billing.util.tag.ControlTagType;

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
@@ -17,8 +17,6 @@
 
 package org.killbill.billing.jaxrs.json;
 
-import org.killbill.billing.catalog.api.CurrencyValueNull;
-import org.killbill.billing.overdue.api.OverdueApi;
 import org.killbill.billing.overdue.api.OverdueApiException;
 import org.killbill.billing.overdue.api.OverdueCancellationPolicy;
 import org.killbill.billing.overdue.api.OverdueState;
@@ -59,7 +57,7 @@ public OverdueStateConfigJson(@JsonProperty("name") final String name,
     public OverdueStateConfigJson(final OverdueState input) {
         this.name = input.getName();
         this.isClearState = input.isClearState();
-        this.condition = input.getOverdueCondition() !=  null ? new OverdueConditionJson(input.getOverdueCondition()) : null;
+        this.condition = input.getOverdueCondition() != null ? new OverdueConditionJson(input.getOverdueCondition()) : null;
         this.externalMessage = input.getExternalMessage();
         this.blockChanges = input.isBlockChanges();
         this.disableEntitlement = input.isDisableEntitlementAndChangesBlocked();
@@ -77,7 +75,8 @@ public String getName() {
         return name;
     }
 
-    public Boolean getClearState() {
+    @JsonProperty("isClearState")
+    public Boolean isClearState() {
         return isClearState;
     }