killbill-uncached

rename entitlementId -> subscriptionid in SubscriptionJson Intellij

9/15/2013 1:39:17 AM

Details

diff --git a/jaxrs/src/main/java/com/ning/billing/jaxrs/json/SubscriptionJson.java b/jaxrs/src/main/java/com/ning/billing/jaxrs/json/SubscriptionJson.java
index ad2e27b..ad23683 100644
--- a/jaxrs/src/main/java/com/ning/billing/jaxrs/json/SubscriptionJson.java
+++ b/jaxrs/src/main/java/com/ning/billing/jaxrs/json/SubscriptionJson.java
@@ -279,7 +279,7 @@ public class SubscriptionJson extends JsonBase {
     @JsonCreator
     public SubscriptionJson(@JsonProperty("accountId") @Nullable final String accountId,
                             @JsonProperty("bundleId") @Nullable final String bundleId,
-                            @JsonProperty("entitlementId") @Nullable final String entitlementId,
+                            @JsonProperty("subscriptionId") @Nullable final String subscriptionId,
                             @JsonProperty("externalKey") @Nullable final String externalKey,
                             @JsonProperty("startDate") @Nullable final LocalDate startDate,
                             @JsonProperty("productName") @Nullable final String productName,
@@ -306,7 +306,7 @@ public class SubscriptionJson extends JsonBase {
         this.billingEndDate = billingEndDate;
         this.accountId = accountId;
         this.bundleId = bundleId;
-        this.subscriptionId = entitlementId;
+        this.subscriptionId = subscriptionId;
         this.externalKey = externalKey;
         this.events = events;
         this.deletedEvents = deletedEvents;

pom.xml 2(+1 -1)

diff --git a/pom.xml b/pom.xml
index d395c8a..c20d1a2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>killbill-oss-parent</artifactId>
         <groupId>com.ning.billing</groupId>
-        <version>0.4.9</version>
+        <version>0.4.10</version>
     </parent>
     <artifactId>killbill</artifactId>
     <version>0.6.8-SNAPSHOT</version>