tidy up collections

dehora · dehora · commit 893f9a16485f · 2014-10-29T00:38:53.000Z
diff --git a/intercom-java/src/main/java/io/intercom/api/Admin.java b/intercom-java/src/main/java/io/intercom/api/Admin.java
@@ -34,13 +34,13 @@ public static AdminCollection list()
     @JsonProperty("type")
     private final String type = "admin";
 
-    @JsonProperty
+    @JsonProperty("id")
     private String id;
 
-    @JsonProperty
+    @JsonProperty("name")
     private String name;
 
-    @JsonProperty
+    @JsonProperty("email")
     private String email;
 
     @JsonProperty("created_at")
diff --git a/intercom-java/src/main/java/io/intercom/api/AdminCollection.java b/intercom-java/src/main/java/io/intercom/api/AdminCollection.java
@@ -26,8 +26,8 @@ public AdminCollection nextPage() {
     @SuppressWarnings("EmptyMethod")
     @JsonProperty("admins")
     @Override
-    public List<Admin> getPageItems() {
-        return super.getPageItems();
+    public List<Admin> getPage() {
+        return super.getPage();
     }
 
     public boolean hasNext() {
diff --git a/intercom-java/src/main/java/io/intercom/api/Author.java b/intercom-java/src/main/java/io/intercom/api/Author.java
@@ -14,13 +14,13 @@ public class Author extends TypedData {
     @JsonProperty("type")
     private String type;
 
-    @JsonProperty
+    @JsonProperty("id")
     private String id;
 
-    @JsonProperty
+    @JsonProperty("name")
     private String name;
 
-    @JsonProperty
+    @JsonProperty("email")
     private String email;
 
     @JsonProperty("user_id")
diff --git a/intercom-java/src/main/java/io/intercom/api/CompanyCollection.java b/intercom-java/src/main/java/io/intercom/api/CompanyCollection.java
@@ -22,14 +22,14 @@ public CompanyCollection() {
 
     public CompanyCollection(List<Company> companies) {
         this();
-        this.pageItems = companies;
+        this.page = companies;
     }
 
     @SuppressWarnings("EmptyMethod")
     @JsonProperty("companies")
     @Override
-    public List<Company> getPageItems() {
-        return super.getPageItems();
+    public List<Company> getPage() {
+        return super.getPage();
     }
 
     public long getTotalCount() {
@@ -61,6 +61,6 @@ public String toString() {
     }
 
     void addCompany(Company company) {
-        pageItems.add(company);
+        page.add(company);
     }
 }
diff --git a/intercom-java/src/main/java/io/intercom/api/Conversation.java b/intercom-java/src/main/java/io/intercom/api/Conversation.java
@@ -108,7 +108,7 @@ private static boolean isAdminQuery(Map<String, String> params) {
     @JsonProperty("type")
     private final String type = "conversation";
 
-    @JsonProperty
+    @JsonProperty("id")
     private String id;
 
     @JsonProperty("conversation_message")
@@ -126,7 +126,7 @@ private static boolean isAdminQuery(Map<String, String> params) {
     @JsonProperty("updated_at")
     private long updatedAt;
 
-    @JsonProperty
+    @JsonProperty("conversation_parts")
     private ConversationPartCollection conversationPartCollection;
 
     @JsonProperty("open")
@@ -157,12 +157,12 @@ public Admin getCurrentAssignee() {
     }
 
     public Optional<ConversationPart> getFirstConversationPart() {
-        return Optional.fromNullable(getConversationPartCollection().getPageItems().get(0));
+        return Optional.fromNullable(getConversationPartCollection().getPage().get(0));
     }
 
     public ConversationPart getMostRecentConversationPart() {
         final ConversationPartCollection conversationParts = getConversationPartCollection();
-        final List<ConversationPart> items = conversationParts.getPageItems();
+        final List<ConversationPart> items = conversationParts.getPage();
         if (items.isEmpty()) {
             return null;
         } else {
diff --git a/intercom-java/src/main/java/io/intercom/api/ConversationCollection.java b/intercom-java/src/main/java/io/intercom/api/ConversationCollection.java
@@ -19,8 +19,8 @@ public ConversationCollection() {
 
     @SuppressWarnings("EmptyMethod")
     @JsonProperty("conversations")
-    public List<Conversation> getPageItems() {
-        return super.getPageItems();
+    public List<Conversation> getPage() {
+        return super.getPage();
     }
 
     @Override
diff --git a/intercom-java/src/main/java/io/intercom/api/ConversationPartCollection.java b/intercom-java/src/main/java/io/intercom/api/ConversationPartCollection.java
@@ -15,8 +15,8 @@ public ConversationPartCollection() {
 
     @SuppressWarnings("EmptyMethod")
     @JsonProperty("conversation_parts")
-    public List<ConversationPart> getPageItems() {
-        return super.getPageItems();
+    public List<ConversationPart> getPage() {
+        return super.getPage();
     }
 
     @Override
diff --git a/intercom-java/src/main/java/io/intercom/api/HttpClient.java b/intercom-java/src/main/java/io/intercom/api/HttpClient.java
@@ -172,13 +172,14 @@ private void logError(URI uri, int responseCode, ErrorCollection errors) throws
     private <T> T readEntity(HttpURLConnection conn, int responseCode, Class<T> entityType) throws IOException {
         final InputStream entityStream = conn.getInputStream();
         try {
-            if (logger.isDebugEnabled()) {
+//            if (logger.isDebugEnabled()) {
                 final String text = CharStreams.toString(new InputStreamReader(entityStream));
                 logger.debug("api server response status[{}] --\n{}\n-- ", responseCode, text);
-                return objectMapper.readValue(text, entityType);
-            } else {
-                return objectMapper.readValue(entityStream, entityType);
-            }
+            System.out.println(text);
+            return objectMapper.readValue(text, entityType);
+//            } else {
+//                return objectMapper.readValue(entityStream, entityType);
+//            }
         } finally {
             IOUtils.closeQuietly(entityStream);
         }
diff --git a/intercom-java/src/main/java/io/intercom/api/NoteCollection.java b/intercom-java/src/main/java/io/intercom/api/NoteCollection.java
@@ -24,8 +24,8 @@ public NoteCollection nextPage() {
     @SuppressWarnings("EmptyMethod")
     @JsonProperty("notes")
     @Override
-    public List<Note> getPageItems() {
-        return super.getPageItems();
+    public List<Note> getPage() {
+        return super.getPage();
     }
 
     public boolean hasNext() {
diff --git a/intercom-java/src/main/java/io/intercom/api/NotificationCollection.java b/intercom-java/src/main/java/io/intercom/api/NotificationCollection.java
@@ -25,8 +25,8 @@ public NotificationCollection nextPage() {
     @SuppressWarnings("EmptyMethod")
     @JsonProperty("notifications")
     @Override
-    public List<Notification> getPageItems() {
-        return super.getPageItems();
+    public List<Notification> getPage() {
+        return super.getPage();
     }
 
     public boolean hasNext() {
diff --git a/intercom-java/src/main/java/io/intercom/api/NotificationErrorCollection.java b/intercom-java/src/main/java/io/intercom/api/NotificationErrorCollection.java
@@ -20,8 +20,8 @@ public NotificationErrorCollection() {
     @SuppressWarnings("EmptyMethod")
     @JsonProperty("notifications")
     @Override
-    public List<NotificationError> getPageItems() {
-        return super.getPageItems();
+    public List<NotificationError> getPage() {
+        return super.getPage();
     }
 
     @Override
diff --git a/intercom-java/src/main/java/io/intercom/api/SegmentCollection.java b/intercom-java/src/main/java/io/intercom/api/SegmentCollection.java
@@ -27,8 +27,8 @@ public SegmentCollection nextPage() {
     @SuppressWarnings("EmptyMethod")
     @JsonProperty("segments")
     @Override
-    public List<Segment> getPageItems() {
-        return super.getPageItems();
+    public List<Segment> getPage() {
+        return super.getPage();
     }
 
     public boolean hasNext() {
diff --git a/intercom-java/src/main/java/io/intercom/api/SubscriptionCollection.java b/intercom-java/src/main/java/io/intercom/api/SubscriptionCollection.java
@@ -26,8 +26,8 @@ public SubscriptionCollection nextPage() {
     @SuppressWarnings("EmptyMethod")
     @JsonProperty("items")
     @Override
-    public List<Subscription> getPageItems() {
-        return super.getPageItems();
+    public List<Subscription> getPage() {
+        return super.getPage();
     }
 
     public boolean hasNext() {
diff --git a/intercom-java/src/main/java/io/intercom/api/Tag.java b/intercom-java/src/main/java/io/intercom/api/Tag.java
@@ -73,7 +73,7 @@ static TaggableCollection createTagTypedCollection(Tag tag, UserCollection users
         taggableCollection.setName(tag.getName());
         taggableCollection.setId(tag.getId());
         final List<Map<String, Object>> usersLite = Lists.newArrayList();
-        final List<User> pageItems = users.getPageItems();
+        final List<User> pageItems = users.getPage();
         for (User user : pageItems) {
             Map<String, Object> userMap = Maps.newHashMap();
             final String id = user.getId();
@@ -108,7 +108,7 @@ static TaggableCollection createTagTypedCollection(Tag tag, CompanyCollection co
         taggableCollection.setId(tag.getId());
 
         final List<Map<String, Object>> companiesLite = Lists.newArrayList();
-        final List<Company> pageItems = companies.getPageItems();
+        final List<Company> pageItems = companies.getPage();
         for (Company company : pageItems) {
             Map<String, Object> companyMap = Maps.newHashMap();
             final String companyID = company.getCompanyID();
diff --git a/intercom-java/src/main/java/io/intercom/api/TagCollection.java b/intercom-java/src/main/java/io/intercom/api/TagCollection.java
@@ -26,8 +26,8 @@ public TagCollection nextPage() {
     @SuppressWarnings("EmptyMethod")
     @JsonProperty("tags")
     @Override
-    public List<Tag> getPageItems() {
-        return super.getPageItems();
+    public List<Tag> getPage() {
+        return super.getPage();
     }
 
     public boolean hasNext() {
diff --git a/intercom-java/src/main/java/io/intercom/api/TypedDataCollection.java b/intercom-java/src/main/java/io/intercom/api/TypedDataCollection.java
@@ -13,13 +13,13 @@
 import java.util.Map;
 
 @SuppressWarnings("UnusedDeclaration")
-@JsonIgnoreProperties({"pageItems"})
+@JsonIgnoreProperties({"page"})
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
 public abstract class TypedDataCollection<T extends TypedData> extends TypedData {
 
     public static final String NEXT_PAGE_REL = "next";
 
-    protected List<T> pageItems = Lists.newArrayList();
+    protected List<T> page = Lists.newArrayList();
 
     @JsonProperty("pages")
     protected Map<String, URI> pages = Maps.newHashMap();
@@ -33,8 +33,8 @@ public boolean hasNextPage() {
         return pages.containsKey("next") && pages.get("next") != null;
     }
 
-    public List<T> getPageItems() {
-        return ImmutableList.<T>builder().addAll(pageItems).build();
+    public List<T> getPage() {
+        return ImmutableList.<T>builder().addAll(page).build();
     }
 
     protected <C extends TypedDataCollection<T>> C fetchNextPage(Class<C> typeReference) {
@@ -47,7 +47,7 @@ protected <C extends TypedDataCollection<T>> C fetchNextPage(Class<C> typeRefere
         }
     }
 
-    public Map<String, URI> getPageLinks() {
+    public Map<String, URI> getPages() {
         return ImmutableMap.<String, URI>builder().putAll(pages).build();
     }
 
@@ -62,7 +62,7 @@ public boolean equals(Object o) {
 
         TypedDataCollection that = (TypedDataCollection) o;
 
-        if (pageItems != null ? !pageItems.equals(that.pageItems) : that.pageItems != null) return false;
+        if (page != null ? !page.equals(that.page) : that.page != null) return false;
         if (pages != null ? !pages.equals(that.pages) : that.pages != null) return false;
         //noinspection RedundantIfStatement
         if (type != null ? !type.equals(that.type) : that.type != null) return false;
@@ -72,7 +72,7 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-        int result = pageItems != null ? pageItems.hashCode() : 0;
+        int result = page != null ? page.hashCode() : 0;
         result = 31 * result + (pages != null ? pages.hashCode() : 0);
         result = 31 * result + (type != null ? type.hashCode() : 0);
         return result;
@@ -81,7 +81,7 @@ public int hashCode() {
     @Override
     public String toString() {
         return getType() + "{" +
-            "pageItems=" + pageItems +
+            "page=" + page +
             "} " + super.toString();
     }
 }
diff --git a/intercom-java/src/main/java/io/intercom/api/TypedDataCollectionIterator.java b/intercom-java/src/main/java/io/intercom/api/TypedDataCollectionIterator.java
@@ -14,7 +14,7 @@ public TypedDataCollectionIterator(TypedDataCollection<T> startingCollection) {
     }
 
     public boolean hasNext() {
-        if (pos == rollingCollection.getPageItems().size()) {
+        if (pos == rollingCollection.getPage().size()) {
             if (rollingCollection.hasNextPage()) {
                 rollingCollection = rollingCollection.nextPage();
                 pos = 0;
@@ -23,19 +23,19 @@ public boolean hasNext() {
                 return false;
             }
         } else {
-            return pos <= rollingCollection.getPageItems().size();
+            return pos <= rollingCollection.getPage().size();
         }
     }
 
     public T next() {
         iterate();
-        final T t = rollingCollection.getPageItems().get(pos);
+        final T t = rollingCollection.getPage().get(pos);
         pos++;
         return t;
     }
 
     private void iterate() {
-        if (pos == rollingCollection.getPageItems().size()) {
+        if (pos == rollingCollection.getPage().size()) {
             if (rollingCollection.hasNextPage()) {
                 rollingCollection = rollingCollection.nextPage();
                 pos = 0;
diff --git a/intercom-java/src/main/java/io/intercom/api/User.java b/intercom-java/src/main/java/io/intercom/api/User.java
@@ -24,7 +24,7 @@ private static List<CompanyWithStringPlan> buildUserUpdateCompanies(User user) {
         // restrictions on the company data that can be sent via a user update
         final ArrayList<CompanyWithStringPlan> updatableCompanies = Lists.newArrayList();
         if (user.getCompanyCollection() != null) {
-            final List<Company> companies = user.getCompanyCollection().getPageItems();
+            final List<Company> companies = user.getCompanyCollection().getPage();
             for (Company company : companies) {
                 final CompanyWithStringPlan updatableCompany = new CompanyWithStringPlan();
                 updatableCompany.setCompanyID(company.getCompanyID());
diff --git a/intercom-java/src/main/java/io/intercom/api/UserCollection.java b/intercom-java/src/main/java/io/intercom/api/UserCollection.java
@@ -18,14 +18,14 @@ public UserCollection() {
 
     public UserCollection(List<User> users) {
         this();
-        this.pageItems = users;
+        this.page = users;
     }
 
     @SuppressWarnings("EmptyMethod")
     @JsonProperty("users")
     @Override
-    public List<User> getPageItems() {
-        return super.getPageItems();
+    public List<User> getPage() {
+        return super.getPage();
     }
 
     @Override
diff --git a/intercom-java/src/test/java/io/intercom/api/UserTest.java b/intercom-java/src/test/java/io/intercom/api/UserTest.java
@@ -96,7 +96,7 @@ public void TestSerdes() throws Exception {
 
         final SegmentCollection segmentCollection = user.getSegmentCollection();
         assertEquals("segment.list", segmentCollection.getType());
-        final List<Segment> items = segmentCollection.getPageItems();
+        final List<Segment> items = segmentCollection.getPage();
         final Segment segment = items.get(0);
         assertEquals("segment", segment.getType());
         assertEquals("5310d8e7598c9a0b24000002", segment.getId());

Original file line number	Diff line number	Diff line change
`@@ -22,14 +22,14 @@ public CompanyCollection() {`
`22`	`22`
`23`	`23`	`public CompanyCollection(List<Company> companies) {`
`24`	`24`	`this();`
`25`		`- this.pageItems = companies;`
	`25`	`+ this.page = companies;`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`@SuppressWarnings("EmptyMethod")`
`29`	`29`	`@JsonProperty("companies")`
`30`	`30`	`@Override`
`31`		`- public List<Company> getPageItems() {`
`32`		`- return super.getPageItems();`
	`31`	`+ public List<Company> getPage() {`
	`32`	`+ return super.getPage();`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`public long getTotalCount() {`
`@@ -61,6 +61,6 @@ public String toString() {`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`void addCompany(Company company) {`
`64`		`- pageItems.add(company);`
	`64`	`+ page.add(company);`
`65`	`65`	`}`
`66`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,8 @@ public ConversationCollection() {`
`19`	`19`
`20`	`20`	`@SuppressWarnings("EmptyMethod")`
`21`	`21`	`@JsonProperty("conversations")`
`22`		`- public List<Conversation> getPageItems() {`
`23`		`- return super.getPageItems();`
	`22`	`+ public List<Conversation> getPage() {`
	`23`	`+ return super.getPage();`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,8 @@ public ConversationPartCollection() {`
`15`	`15`
`16`	`16`	`@SuppressWarnings("EmptyMethod")`
`17`	`17`	`@JsonProperty("conversation_parts")`
`18`		`- public List<ConversationPart> getPageItems() {`
`19`		`- return super.getPageItems();`
	`18`	`+ public List<ConversationPart> getPage() {`
	`19`	`+ return super.getPage();`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`@Override`