Details
diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/AccountEmailJson.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/AccountEmailJson.java
index a0447c5..fe33420 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/AccountEmailJson.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/AccountEmailJson.java
@@ -19,14 +19,15 @@ package org.killbill.billing.jaxrs.json;
import java.util.UUID;
import org.joda.time.DateTime;
-
import org.killbill.billing.account.api.AccountEmail;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
+import com.wordnik.swagger.annotations.ApiModelProperty;
public class AccountEmailJson extends JsonBase {
+ @ApiModelProperty(dataType = "java.util.UUID")
private final String accountId;
private final String email;
diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/AccountJson.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/AccountJson.java
index 7e6ceef..c6916fe 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/AccountJson.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/AccountJson.java
@@ -32,9 +32,11 @@ import org.killbill.billing.util.audit.AccountAuditLogs;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.base.Objects;
+import com.wordnik.swagger.annotations.ApiModelProperty;
public class AccountJson extends JsonBase {
+ @ApiModelProperty(dataType = "java.util.UUID")
private final String accountId;
private final String externalKey;
private final BigDecimal accountCBA;
@@ -44,6 +46,7 @@ public class AccountJson extends JsonBase {
private final String email;
private final Integer billCycleDayLocal;
private final String currency;
+ @ApiModelProperty(dataType = "java.util.UUID")
private final String paymentMethodId;
private final String timeZone;
private final String address1;
diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/AuditLogJson.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/AuditLogJson.java
index 9db5376..951e271 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/AuditLogJson.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/AuditLogJson.java
@@ -22,10 +22,12 @@ import org.killbill.billing.util.audit.AuditLog;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
+import com.wordnik.swagger.annotations.ApiModelProperty;
public class AuditLogJson {
private final String changeType;
+ @ApiModelProperty(dataType = "org.joda.time.DateTime")
private final DateTime changeDate;
private final String changedBy;
private final String reasonCode;
diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/BundleJson.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/BundleJson.java
index 249e149..2bc328b 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/BundleJson.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/BundleJson.java
@@ -31,10 +31,13 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.base.Predicate;
import com.google.common.collect.Collections2;
import com.google.common.collect.ImmutableList;
+import com.wordnik.swagger.annotations.ApiModelProperty;
public class BundleJson extends JsonBase {
+ @ApiModelProperty(dataType = "java.util.UUID")
protected final String accountId;
+ @ApiModelProperty(dataType = "java.util.UUID")
protected final String bundleId;
protected final String externalKey;
private final List<SubscriptionJson> subscriptions;
diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/CreditJson.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/CreditJson.java
index ab5112d..b9484f6 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/CreditJson.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/CreditJson.java
@@ -21,23 +21,23 @@ import java.util.List;
import javax.annotation.Nullable;
-import org.joda.time.DateTime;
-import org.joda.time.DateTimeZone;
import org.joda.time.LocalDate;
-
import org.killbill.billing.invoice.api.Invoice;
import org.killbill.billing.invoice.api.InvoiceItem;
import org.killbill.billing.util.audit.AuditLog;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
+import com.wordnik.swagger.annotations.ApiModelProperty;
public class CreditJson extends JsonBase {
private final BigDecimal creditAmount;
+ @ApiModelProperty(dataType = "java.util.UUID")
private final String invoiceId;
private final String invoiceNumber;
private final LocalDate effectiveDate;
+ @ApiModelProperty(dataType = "java.util.UUID")
private final String accountId;
@JsonCreator
diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/CustomFieldJson.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/CustomFieldJson.java
index c0abc8a..aed0fc9 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/CustomFieldJson.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/CustomFieldJson.java
@@ -26,10 +26,13 @@ import org.killbill.billing.util.customfield.CustomField;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
+import com.wordnik.swagger.annotations.ApiModelProperty;
public class CustomFieldJson extends JsonBase {
+ @ApiModelProperty(dataType = "java.util.UUID")
private final String customFieldId;
+ @ApiModelProperty(dataType = "java.util.UUID")
private final String objectId;
private final ObjectType objectType;
private final String name;
diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/GatewayNotificationJson.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/GatewayNotificationJson.java
index 923258c..bfc1b85 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/GatewayNotificationJson.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/GatewayNotificationJson.java
@@ -28,9 +28,11 @@ import org.killbill.billing.payment.plugin.api.GatewayNotification;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
+import com.wordnik.swagger.annotations.ApiModelProperty;
public class GatewayNotificationJson extends JsonBase {
+ @ApiModelProperty(dataType = "java.util.UUID")
private final String kbPaymentId;
private final Integer status;
private final String entity;
diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/HostedPaymentPageFormDescriptorJson.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/HostedPaymentPageFormDescriptorJson.java
index 2753e70..623cdca 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/HostedPaymentPageFormDescriptorJson.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/HostedPaymentPageFormDescriptorJson.java
@@ -23,9 +23,11 @@ import org.killbill.billing.payment.plugin.api.HostedPaymentPageFormDescriptor;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
+import com.wordnik.swagger.annotations.ApiModelProperty;
public class HostedPaymentPageFormDescriptorJson extends JsonBase {
+ @ApiModelProperty(dataType = "java.util.UUID")
private final String kbAccountId;
private final String formMethod;
private final String formUrl;
diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/InvoiceEmailJson.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/InvoiceEmailJson.java
index 0a4f024..a0e5d9e 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/InvoiceEmailJson.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/InvoiceEmailJson.java
@@ -19,9 +19,11 @@ package org.killbill.billing.jaxrs.json;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonGetter;
import com.fasterxml.jackson.annotation.JsonProperty;
+import com.wordnik.swagger.annotations.ApiModelProperty;
public class InvoiceEmailJson extends JsonBase {
+ @ApiModelProperty(dataType = "java.util.UUID")
private final String accountId;
private final boolean isNotifiedForInvoices;
diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/InvoiceItemJson.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/InvoiceItemJson.java
index 0d87f23..aabbd91 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/InvoiceItemJson.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/InvoiceItemJson.java
@@ -31,14 +31,21 @@ import org.killbill.billing.util.audit.AuditLog;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
+import com.wordnik.swagger.annotations.ApiModelProperty;
public class InvoiceItemJson extends JsonBase {
+ @ApiModelProperty(dataType = "java.util.UUID")
private final String invoiceItemId;
+ @ApiModelProperty(dataType = "java.util.UUID")
private final String invoiceId;
+ @ApiModelProperty(dataType = "java.util.UUID")
private final String linkedInvoiceItemId;
+ @ApiModelProperty(dataType = "java.util.UUID")
private final String accountId;
+ @ApiModelProperty(dataType = "java.util.UUID")
private final String bundleId;
+ @ApiModelProperty(dataType = "java.util.UUID")
private final String subscriptionId;
private final String planName;
private final String phaseName;
diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/InvoiceJson.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/InvoiceJson.java
index b45e4c4..639d2c9 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/InvoiceJson.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/InvoiceJson.java
@@ -31,11 +31,13 @@ import org.killbill.billing.util.audit.AuditLog;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
+import com.wordnik.swagger.annotations.ApiModelProperty;
public class InvoiceJson extends JsonBase {
private final BigDecimal amount;
private final String currency;
+ @ApiModelProperty(dataType = "java.util.UUID")
private final String invoiceId;
private final LocalDate invoiceDate;
private final LocalDate targetDate;
@@ -43,6 +45,7 @@ public class InvoiceJson extends JsonBase {
private final BigDecimal balance;
private final BigDecimal creditAdj;
private final BigDecimal refundAdj;
+ @ApiModelProperty(dataType = "java.util.UUID")
private final String accountId;
private final List<InvoiceItemJson> items;
private final String bundleKeys;
diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/InvoicePaymentJson.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/InvoicePaymentJson.java
index f7c366d..f37d2e4 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/InvoicePaymentJson.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/InvoicePaymentJson.java
@@ -29,9 +29,11 @@ import org.killbill.billing.util.audit.AccountAuditLogs;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
+import com.wordnik.swagger.annotations.ApiModelProperty;
public class InvoicePaymentJson extends PaymentJson {
+ @ApiModelProperty(dataType = "java.util.UUID")
private final String targetInvoiceId;
diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/NotificationJson.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/NotificationJson.java
index e8fcd14..469e2c4 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/NotificationJson.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/NotificationJson.java
@@ -20,6 +20,7 @@ import org.killbill.billing.notification.plugin.api.ExtBusEvent;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
+import com.wordnik.swagger.annotations.ApiModelProperty;
/*
* Use to communicate back with client after they registered a callback
@@ -27,8 +28,10 @@ import com.fasterxml.jackson.annotation.JsonProperty;
public class NotificationJson {
private final String eventType;
+ @ApiModelProperty(dataType = "java.util.UUID")
private final String accountId;
private final String objectType;
+ @ApiModelProperty(dataType = "java.util.UUID")
private final String objectId;
@JsonCreator
diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/PaymentJson.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/PaymentJson.java
index 4bf0f5d..3a85882 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/PaymentJson.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/PaymentJson.java
@@ -31,10 +31,13 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.base.Function;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
+import com.wordnik.swagger.annotations.ApiModelProperty;
public class PaymentJson extends JsonBase {
+ @ApiModelProperty(dataType = "java.util.UUID")
private final String accountId;
+ @ApiModelProperty(dataType = "java.util.UUID")
private final String paymentId;
private final String paymentNumber;
private final String paymentExternalKey;
@@ -44,6 +47,7 @@ public class PaymentJson extends JsonBase {
private final BigDecimal refundedAmount;
private final BigDecimal creditedAmount;
private final String currency;
+ @ApiModelProperty(dataType = "java.util.UUID")
private final String paymentMethodId;
private final List<? extends PaymentTransactionJson> transactions;
diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/PaymentMethodJson.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/PaymentMethodJson.java
index 0482484..2cc6720 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/PaymentMethodJson.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/PaymentMethodJson.java
@@ -36,11 +36,14 @@ import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.base.Function;
import com.google.common.collect.Collections2;
+import com.wordnik.swagger.annotations.ApiModelProperty;
public class PaymentMethodJson extends JsonBase {
private final String externalKey;
+ @ApiModelProperty(dataType = "java.util.UUID")
private final String paymentMethodId;
+ @ApiModelProperty(dataType = "java.util.UUID")
private final String accountId;
private final Boolean isDefault;
private final String pluginName;
diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/RolledUpUsageJson.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/RolledUpUsageJson.java
index 0cc9bc6..c8185b2 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/RolledUpUsageJson.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/RolledUpUsageJson.java
@@ -27,9 +27,11 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.base.Function;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
+import com.wordnik.swagger.annotations.ApiModelProperty;
public class RolledUpUsageJson {
+ @ApiModelProperty(dataType = "java.util.UUID")
private final String subscriptionId;
private final LocalDate startDate;
private final LocalDate endDate;
diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/SessionJson.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/SessionJson.java
index fbd5eca..03f7395 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/SessionJson.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/SessionJson.java
@@ -22,11 +22,14 @@ import org.joda.time.DateTimeZone;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
+import com.wordnik.swagger.annotations.ApiModelProperty;
public class SessionJson {
private final String id;
+ @ApiModelProperty(dataType = "org.joda.time.DateTime")
private final DateTime startDate;
+ @ApiModelProperty(dataType = "org.joda.time.DateTime")
private final DateTime lastAccessDate;
private final Long timeout;
private final String host;
diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/SubscriptionJson.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/SubscriptionJson.java
index ffecd4a..1c623a7 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/SubscriptionJson.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/SubscriptionJson.java
@@ -33,11 +33,15 @@ import org.killbill.billing.util.audit.AccountAuditLogs;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
+import com.wordnik.swagger.annotations.ApiModelProperty;
public class SubscriptionJson extends JsonBase {
+ @ApiModelProperty(dataType = "java.util.UUID")
private final String accountId;
+ @ApiModelProperty(dataType = "java.util.UUID")
private final String bundleId;
+ @ApiModelProperty(dataType = "java.util.UUID")
private final String subscriptionId;
private final String externalKey;
private final LocalDate startDate;
diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/SubscriptionUsageRecordJson.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/SubscriptionUsageRecordJson.java
index 06caa2d..b5d4570 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/SubscriptionUsageRecordJson.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/SubscriptionUsageRecordJson.java
@@ -30,9 +30,11 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.base.Function;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
+import com.wordnik.swagger.annotations.ApiModelProperty;
public class SubscriptionUsageRecordJson {
+ @ApiModelProperty(dataType = "java.util.UUID")
private final String subscriptionId;
private final List<UnitUsageRecordJson> unitUsageRecords;
diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/TagDefinitionJson.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/TagDefinitionJson.java
index fd1c5cb..0570780 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/TagDefinitionJson.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/TagDefinitionJson.java
@@ -29,9 +29,11 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.base.Function;
import com.google.common.collect.Collections2;
import com.google.common.collect.ImmutableList;
+import com.wordnik.swagger.annotations.ApiModelProperty;
public class TagDefinitionJson extends JsonBase {
+ @ApiModelProperty(dataType = "java.util.UUID")
private final String id;
private final Boolean isControlTag;
private final String name;
diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/TagJson.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/TagJson.java
index 6307410..0e8233d 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/TagJson.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/TagJson.java
@@ -27,11 +27,15 @@ import org.killbill.billing.util.tag.TagDefinition;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
+import com.wordnik.swagger.annotations.ApiModelProperty;
public class TagJson extends JsonBase {
+ @ApiModelProperty(dataType = "java.util.UUID")
private final String tagId;
+ @ApiModelProperty(dataType = "org.killbill.billing.ObjectType")
private final ObjectType objectType;
+ @ApiModelProperty(dataType = "java.util.UUID")
private final String tagDefinitionId;
private final String tagDefinitionName;
diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/TenantJson.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/TenantJson.java
index 6670881..f8c3a69 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/TenantJson.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/TenantJson.java
@@ -21,13 +21,15 @@ import org.killbill.billing.tenant.api.TenantData;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
+import com.wordnik.swagger.annotations.ApiModelProperty;
public class TenantJson extends JsonBase {
- protected final String tenantId;
- protected final String externalKey;
- protected final String apiKey;
- protected final String apiSecret;
+ @ApiModelProperty(dataType = "java.util.UUID")
+ private final String tenantId;
+ private final String externalKey;
+ private final String apiKey;
+ private final String apiSecret;
@JsonCreator
public TenantJson(@JsonProperty("tenantId") final String tenantId,
diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/TenantKeyJson.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/TenantKeyJson.java
index 51d4bdf..f3d3b3d 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/TenantKeyJson.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/TenantKeyJson.java
@@ -26,7 +26,6 @@ public class TenantKeyJson {
private final String key;
private final List<String> values;
-
@JsonCreator
public TenantKeyJson(@JsonProperty("key") final String key,
@JsonProperty("values") final List<String> values) {
