killbill-memoizeit

diff --git a/jaxrs/src/main/java/com/ning/billing/jaxrs/json/AccountJson.java b/jaxrs/src/main/java/com/ning/billing/jaxrs/json/AccountJson.java
index 82645a5..9b114e8 100644
--- a/jaxrs/src/main/java/com/ning/billing/jaxrs/json/AccountJson.java
+++ b/jaxrs/src/main/java/com/ning/billing/jaxrs/json/AccountJson.java
@@ -29,43 +29,30 @@ public class AccountJson extends AccountJsonSimple {
 
     // STEPH Missing city, locale, postalCode from https://home.ninginc.com:8443/display/REVINFRA/Killbill+1.0+APIs
 
-    @JsonView(BundleTimelineViews.Base.class)
     private final String name;
     
-    @JsonView(BundleTimelineViews.Base.class)
     private final Integer length;
         
-    @JsonView(BundleTimelineViews.Base.class)
     private final String email;
     
-    @JsonView(BundleTimelineViews.Base.class)
     private final Integer billCycleDay;
     
-    @JsonView(BundleTimelineViews.Base.class)
     private final String currency;
     
-    @JsonView(BundleTimelineViews.Base.class)
     private final String paymentProvider;
     
-    @JsonView(BundleTimelineViews.Base.class)
     private final String timeZone;
     
-    @JsonView(BundleTimelineViews.Base.class)
     private final String address1;
     
-    @JsonView(BundleTimelineViews.Base.class)
     private final String address2;
     
-    @JsonView(BundleTimelineViews.Base.class)
     private final String company;
     
-    @JsonView(BundleTimelineViews.Base.class)
     private final String state;
     
-    @JsonView(BundleTimelineViews.Base.class)
     private final String country;
     
-    @JsonView(BundleTimelineViews.Base.class)
     private final String phone;

jaxrs/src/main/java/com/ning/billing/jaxrs/json/AccountJsonSimple.java 2(+0 -2)

diff --git a/jaxrs/src/main/java/com/ning/billing/jaxrs/json/AccountJsonSimple.java b/jaxrs/src/main/java/com/ning/billing/jaxrs/json/AccountJsonSimple.java
index d7e1b2d..0323a08 100644
--- a/jaxrs/src/main/java/com/ning/billing/jaxrs/json/AccountJsonSimple.java
+++ b/jaxrs/src/main/java/com/ning/billing/jaxrs/json/AccountJsonSimple.java
@@ -21,10 +21,8 @@ import org.codehaus.jackson.map.annotate.JsonView;
 
 public class AccountJsonSimple {
 
-    @JsonView(BundleTimelineViews.Base.class)
     protected final String accountId;
     
-    @JsonView(BundleTimelineViews.Base.class)
     protected final String externalKey;
     
     public AccountJsonSimple() {

jaxrs/src/main/java/com/ning/billing/jaxrs/json/AccountTimelineJson.java 4(+0 -4)

diff --git a/jaxrs/src/main/java/com/ning/billing/jaxrs/json/AccountTimelineJson.java b/jaxrs/src/main/java/com/ning/billing/jaxrs/json/AccountTimelineJson.java
index 881745a..ede4788 100644
--- a/jaxrs/src/main/java/com/ning/billing/jaxrs/json/AccountTimelineJson.java
+++ b/jaxrs/src/main/java/com/ning/billing/jaxrs/json/AccountTimelineJson.java
@@ -34,16 +34,12 @@ import com.ning.billing.payment.api.PaymentAttempt;
 
 public class AccountTimelineJson {
 
-    @JsonView(BundleTimelineViews.ReadTimeline.class)
     private final List<PaymentJsonWithBundleKeys> payments;
 
-    @JsonView(BundleTimelineViews.ReadTimeline.class)
     private final List<InvoiceJsonWithBundleKeys> invoices;
     
-    @JsonView(BundleTimelineViews.ReadTimeline.class)
     private final AccountJsonSimple account;
     
-    @JsonView(BundleTimelineViews.Timeline.class)
     private final List<BundleJsonWithSubscriptions> bundles;
     
     @JsonCreator

jaxrs/src/main/java/com/ning/billing/jaxrs/json/BundleJsonNoSubsciptions.java 1(+0 -1)

diff --git a/jaxrs/src/main/java/com/ning/billing/jaxrs/json/BundleJsonNoSubsciptions.java b/jaxrs/src/main/java/com/ning/billing/jaxrs/json/BundleJsonNoSubsciptions.java
index c1221b8..ec04773 100644
--- a/jaxrs/src/main/java/com/ning/billing/jaxrs/json/BundleJsonNoSubsciptions.java
+++ b/jaxrs/src/main/java/com/ning/billing/jaxrs/json/BundleJsonNoSubsciptions.java
@@ -26,7 +26,6 @@ import com.ning.billing.entitlement.api.user.SubscriptionBundle;
 
 public class BundleJsonNoSubsciptions  extends BundleJsonSimple {
 
-    @JsonView(BundleTimelineViews.Base.class)
     private final String accountId;

jaxrs/src/main/java/com/ning/billing/jaxrs/json/BundleJsonSimple.java 2(+0 -2)

diff --git a/jaxrs/src/main/java/com/ning/billing/jaxrs/json/BundleJsonSimple.java b/jaxrs/src/main/java/com/ning/billing/jaxrs/json/BundleJsonSimple.java
index 8c2d836..7e03a4e 100644
--- a/jaxrs/src/main/java/com/ning/billing/jaxrs/json/BundleJsonSimple.java
+++ b/jaxrs/src/main/java/com/ning/billing/jaxrs/json/BundleJsonSimple.java
@@ -21,10 +21,8 @@ import org.codehaus.jackson.map.annotate.JsonView;
 
 public class BundleJsonSimple {
     
-    @JsonView(BundleTimelineViews.Base.class)
     protected final String bundleId;
 
-    @JsonView(BundleTimelineViews.Base.class)
     protected final String externalKey;
 
     @JsonCreator

jaxrs/src/main/java/com/ning/billing/jaxrs/json/BundleJsonWithSubscriptions.java 1(+0 -1)

diff --git a/jaxrs/src/main/java/com/ning/billing/jaxrs/json/BundleJsonWithSubscriptions.java b/jaxrs/src/main/java/com/ning/billing/jaxrs/json/BundleJsonWithSubscriptions.java
index fa45cdd..925898a 100644
--- a/jaxrs/src/main/java/com/ning/billing/jaxrs/json/BundleJsonWithSubscriptions.java
+++ b/jaxrs/src/main/java/com/ning/billing/jaxrs/json/BundleJsonWithSubscriptions.java
@@ -29,7 +29,6 @@ import com.ning.billing.entitlement.api.user.SubscriptionBundle;
 
 public class BundleJsonWithSubscriptions extends BundleJsonSimple {
 
-    @JsonView(BundleTimelineViews.Timeline.class)
     private final List<SubscriptionJsonWithEvents> subscriptions;
 
     @JsonCreator

jaxrs/src/main/java/com/ning/billing/jaxrs/json/BundleTimelineJson.java 5(+0 -5)

diff --git a/jaxrs/src/main/java/com/ning/billing/jaxrs/json/BundleTimelineJson.java b/jaxrs/src/main/java/com/ning/billing/jaxrs/json/BundleTimelineJson.java
index 099d837..6c9ee9c 100644
--- a/jaxrs/src/main/java/com/ning/billing/jaxrs/json/BundleTimelineJson.java
+++ b/jaxrs/src/main/java/com/ning/billing/jaxrs/json/BundleTimelineJson.java
@@ -24,19 +24,14 @@ import org.codehaus.jackson.map.annotate.JsonView;
 
 public class BundleTimelineJson {
 
-    @JsonView(BundleTimelineViews.Timeline.class)
     private final String viewId;
 
-    @JsonView(BundleTimelineViews.Timeline.class)
     private final BundleJsonWithSubscriptions bundle;
 
-    @JsonView(BundleTimelineViews.ReadTimeline.class)
     private final List<PaymentJsonSimple> payments;
 
-    @JsonView(BundleTimelineViews.ReadTimeline.class)
     private final List<InvoiceJsonSimple> invoices;
 
-    @JsonView(BundleTimelineViews.WriteTimeline.class)
     private final String resonForChange;
 
     @JsonCreator

jaxrs/src/main/java/com/ning/billing/jaxrs/json/InvoiceJsonSimple.java 6(+0 -6)

diff --git a/jaxrs/src/main/java/com/ning/billing/jaxrs/json/InvoiceJsonSimple.java b/jaxrs/src/main/java/com/ning/billing/jaxrs/json/InvoiceJsonSimple.java
index be2516d..177b598 100644
--- a/jaxrs/src/main/java/com/ning/billing/jaxrs/json/InvoiceJsonSimple.java
+++ b/jaxrs/src/main/java/com/ning/billing/jaxrs/json/InvoiceJsonSimple.java
@@ -27,22 +27,16 @@ import com.ning.billing.invoice.api.Invoice;
 
 public class InvoiceJsonSimple {
 
-    @JsonView(BundleTimelineViews.Base.class)
     private final BigDecimal amount;
     
-    @JsonView(BundleTimelineViews.Base.class)
     private final String invoiceId;
     
-    @JsonView(BundleTimelineViews.Base.class)
     private final DateTime invoiceDate;
 
-    @JsonView(BundleTimelineViews.Base.class)
     private final DateTime targetDate;
 
-    @JsonView(BundleTimelineViews.Base.class)
     private final String invoiceNumber;
     
-    @JsonView(BundleTimelineViews.Base.class)
     private final BigDecimal balance;

jaxrs/src/main/java/com/ning/billing/jaxrs/json/SubscriptionJsonNoEvents.java 8(+0 -8)

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 95a5e09..dd14bfc 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
@@ -33,27 +33,19 @@ import com.ning.billing.util.clock.DefaultClock;
 
 public class SubscriptionJsonNoEvents extends SubscriptionJsonSimple {
 
-    @JsonView(BundleTimelineViews.Base.class)
     private final DateTime startDate;
     
-    @JsonView(BundleTimelineViews.Base.class)
     private final String bundleId;
 
-    @JsonView(BundleTimelineViews.Base.class)
     private final String productName;
 
-    @JsonView(BundleTimelineViews.Base.class)
     private final String productCategory;
 
-    @JsonView(BundleTimelineViews.Base.class)
     private final String billingPeriod;
 
-    @JsonView(BundleTimelineViews.Base.class)
     private final String priceList;
 
-    @JsonView(BundleTimelineViews.Base.class)
     private final DateTime chargedThroughDate;
-    
 
 
     @JsonCreator

jaxrs/src/main/java/com/ning/billing/jaxrs/json/SubscriptionJsonSimple.java 1(+0 -1)

diff --git a/jaxrs/src/main/java/com/ning/billing/jaxrs/json/SubscriptionJsonSimple.java b/jaxrs/src/main/java/com/ning/billing/jaxrs/json/SubscriptionJsonSimple.java
index 5fb782e..b532da1 100644
--- a/jaxrs/src/main/java/com/ning/billing/jaxrs/json/SubscriptionJsonSimple.java
+++ b/jaxrs/src/main/java/com/ning/billing/jaxrs/json/SubscriptionJsonSimple.java
@@ -21,7 +21,6 @@ import org.codehaus.jackson.map.annotate.JsonView;
 
 public class SubscriptionJsonSimple {
     
-    @JsonView(BundleTimelineViews.Base.class)
     protected final String subscriptionId;
 
     public SubscriptionJsonSimple() {

jaxrs/src/main/java/com/ning/billing/jaxrs/json/SubscriptionJsonWithEvents.java 12(+0 -12)

diff --git a/jaxrs/src/main/java/com/ning/billing/jaxrs/json/SubscriptionJsonWithEvents.java b/jaxrs/src/main/java/com/ning/billing/jaxrs/json/SubscriptionJsonWithEvents.java
index be5ba2c..5dbc18a 100644
--- a/jaxrs/src/main/java/com/ning/billing/jaxrs/json/SubscriptionJsonWithEvents.java
+++ b/jaxrs/src/main/java/com/ning/billing/jaxrs/json/SubscriptionJsonWithEvents.java
@@ -33,22 +33,17 @@ import com.ning.billing.util.clock.DefaultClock;
 
 public class SubscriptionJsonWithEvents extends SubscriptionJsonSimple {
     
-    @JsonView(BundleTimelineViews.ReadTimeline.class)
     private final List<SubscriptionReadEventJson> events;
 
-    @JsonView(BundleTimelineViews.WriteTimeline.class)
     private final List<SubscriptionDeletedEventJson> deletedEvents;
 
-    @JsonView(BundleTimelineViews.WriteTimeline.class)
     private final List<SubscriptionNewEventJson> newEvents;
 
 
     public static class SubscriptionReadEventJson extends SubscriptionBaseEventJson {
 
-        @JsonView(BundleTimelineViews.Timeline.class)
         private final String eventId;
 
-        @JsonView(BundleTimelineViews.Timeline.class)
         private final DateTime effectiveDate;
 
         public SubscriptionReadEventJson() {
@@ -135,23 +130,16 @@ public class SubscriptionJsonWithEvents extends SubscriptionJsonSimple {
 
     public static class SubscriptionBaseEventJson {
 
-        @JsonView(BundleTimelineViews.Timeline.class)
         private final String billingPeriod;
 
-        @JsonView(BundleTimelineViews.Timeline.class)
         private final DateTime requestedDate;
 
-
-        @JsonView(BundleTimelineViews.Timeline.class)
         private final String product;
 
-        @JsonView(BundleTimelineViews.Timeline.class)
         private final String priceList;
 
-        @JsonView(BundleTimelineViews.Timeline.class)
         private final String eventType;
 
-        @JsonView(BundleTimelineViews.Timeline.class)
         private final String phase;
 
         public SubscriptionBaseEventJson() {