From bd7e003d013611615fa7a9c2eed994345c7970d8 Mon Sep 17 00:00:00 2001
From: Catalin Craciun <cata.craciun@outlook.com>
Date: Wed, 31 Oct 2018 08:19:09 +0200
Subject: [PATCH 1/2] Refactored collections iterators, extracted the iterator
 directly into TypedDataCollection so that all the collections can benefit
 from the iterator.

---
 .../java/io/intercom/api/AdminCollection.java | 18 +-------------
 .../io/intercom/api/CompanyCollection.java    | 18 +-------------
 .../io/intercom/api/ContactCollection.java    | 17 +------------
 .../intercom/api/ConversationCollection.java  | 18 +-------------
 .../java/io/intercom/api/EventCollection.java | 16 +------------
 .../io/intercom/api/JobItemCollection.java    | 21 +---------------
 .../java/io/intercom/api/NoteCollection.java  | 18 +-------------
 .../intercom/api/NotificationCollection.java  | 18 +-------------
 .../api/NotificationErrorCollection.java      | 18 +-------------
 .../io/intercom/api/SegmentCollection.java    | 20 ++--------------
 .../intercom/api/SubscriptionCollection.java  | 20 ++--------------
 .../java/io/intercom/api/TagCollection.java   | 20 ++--------------
 .../io/intercom/api/TypedDataCollection.java  | 24 ++++++++++++++++++-
 .../java/io/intercom/api/UserCollection.java  | 18 +-------------
 14 files changed, 39 insertions(+), 225 deletions(-)

diff --git a/intercom-java/src/main/java/io/intercom/api/AdminCollection.java b/intercom-java/src/main/java/io/intercom/api/AdminCollection.java
index 7f37a2a5..a9978dc6 100644
--- a/intercom-java/src/main/java/io/intercom/api/AdminCollection.java
+++ b/intercom-java/src/main/java/io/intercom/api/AdminCollection.java
@@ -4,18 +4,15 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-import java.util.Iterator;
 import java.util.List;
 
 @SuppressWarnings("UnusedDeclaration")
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
-public class AdminCollection extends TypedDataCollection<Admin> implements Iterator<Admin> {
-    protected TypedDataCollectionIterator<Admin> iterator;
+public class AdminCollection extends TypedDataCollection<Admin> {
 
     public AdminCollection() {
         type = "company.list";
-        iterator = new TypedDataCollectionIterator<Admin>(this);
     }
 
     @Override
@@ -29,17 +26,4 @@ public AdminCollection nextPage() {
     public List<Admin> getPage() {
         return super.getPage();
     }
-
-    public boolean hasNext() {
-        return iterator.hasNext();
-    }
-
-    public Admin next() {
-        return iterator.next();
-    }
-
-    public void remove() {
-        iterator.remove();
-    }
-
 }
diff --git a/intercom-java/src/main/java/io/intercom/api/CompanyCollection.java b/intercom-java/src/main/java/io/intercom/api/CompanyCollection.java
index 37f8019e..57b7bdc8 100644
--- a/intercom-java/src/main/java/io/intercom/api/CompanyCollection.java
+++ b/intercom-java/src/main/java/io/intercom/api/CompanyCollection.java
@@ -3,21 +3,17 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-import java.util.Iterator;
 import java.util.List;
 
 @SuppressWarnings("UnusedDeclaration")
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class CompanyCollection extends TypedDataCollection<Company> implements Iterator<Company> {
-
-    protected TypedDataCollectionIterator<Company> iterator;
+public class CompanyCollection extends TypedDataCollection<Company> {
 
     @JsonProperty("total_count")
     private long totalCount;
 
     public CompanyCollection() {
         type = "company.list";
-        iterator = new TypedDataCollectionIterator<Company>(this);
     }
 
     public CompanyCollection(List<Company> companies) {
@@ -41,18 +37,6 @@ public CompanyCollection nextPage() {
         return fetchNextPage(CompanyCollection.class);
     }
 
-    public boolean hasNext() {
-        return iterator.hasNext();
-    }
-
-    public Company next() {
-        return iterator.next();
-    }
-
-    public void remove() {
-        iterator.remove();
-    }
-
     @Override
     public String toString() {
         return "CompanyCollection{" +
diff --git a/intercom-java/src/main/java/io/intercom/api/ContactCollection.java b/intercom-java/src/main/java/io/intercom/api/ContactCollection.java
index 2dbfd123..dbd2de08 100644
--- a/intercom-java/src/main/java/io/intercom/api/ContactCollection.java
+++ b/intercom-java/src/main/java/io/intercom/api/ContactCollection.java
@@ -8,12 +8,10 @@
 
 @SuppressWarnings("UnusedDeclaration")
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class ContactCollection extends TypedDataCollection<Contact> implements Iterator<Contact> {
+public class ContactCollection extends TypedDataCollection<Contact> {
 
-    protected TypedDataCollectionIterator<Contact> iterator;
 
     public ContactCollection() {
-        iterator = new TypedDataCollectionIterator<Contact>(this);
     }
 
     public ContactCollection(List<Contact> contacts) {
@@ -32,17 +30,4 @@ public List<Contact> getPage() {
     public ContactCollection nextPage() {
         return fetchNextPage(ContactCollection.class);
     }
-
-    public boolean hasNext() {
-        return iterator.hasNext();
-    }
-
-    public Contact next() {
-        return iterator.next();
-    }
-
-    public void remove() {
-        iterator.remove();
-    }
-
 }
diff --git a/intercom-java/src/main/java/io/intercom/api/ConversationCollection.java b/intercom-java/src/main/java/io/intercom/api/ConversationCollection.java
index 68251f0c..33965186 100644
--- a/intercom-java/src/main/java/io/intercom/api/ConversationCollection.java
+++ b/intercom-java/src/main/java/io/intercom/api/ConversationCollection.java
@@ -8,13 +8,11 @@
 
 @SuppressWarnings("UnusedDeclaration")
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class ConversationCollection extends TypedDataCollection<Conversation> implements Iterator<Conversation> {
+public class ConversationCollection extends TypedDataCollection<Conversation> {
 
-    protected TypedDataCollectionIterator<Conversation> iterator;
 
     public ConversationCollection() {
         type = "conversation.list";
-        iterator = new TypedDataCollectionIterator<Conversation>(this);
     }
 
     @SuppressWarnings("EmptyMethod")
@@ -27,18 +25,4 @@ public List<Conversation> getPage() {
     public ConversationCollection nextPage() {
         return fetchNextPage(ConversationCollection.class);
     }
-
-
-    public boolean hasNext() {
-        return iterator.hasNext();
-    }
-
-    public Conversation next() {
-        return iterator.next();
-    }
-
-    public void remove() {
-        iterator.remove();
-    }
-
 }
diff --git a/intercom-java/src/main/java/io/intercom/api/EventCollection.java b/intercom-java/src/main/java/io/intercom/api/EventCollection.java
index adcc18ab..70a74fba 100644
--- a/intercom-java/src/main/java/io/intercom/api/EventCollection.java
+++ b/intercom-java/src/main/java/io/intercom/api/EventCollection.java
@@ -8,11 +8,9 @@
 
 @SuppressWarnings("UnusedDeclaration")
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class EventCollection  extends TypedDataCollection<Event> implements Iterator<Event> {
-  protected TypedDataCollectionIterator<Event> iterator;
+public class EventCollection  extends TypedDataCollection<Event> {
 
   public EventCollection() {
-    iterator = new TypedDataCollectionIterator<Event>(this);
   }
 
   public EventCollection(List<Event> events) {
@@ -31,16 +29,4 @@ public List<Event> getPage() {
   public EventCollection nextPage() {
     return fetchNextPage(EventCollection.class);
   }
-
-  public boolean hasNext() {
-    return iterator.hasNext();
-  }
-
-  public Event next() {
-    return iterator.next();
-  }
-
-  public void remove() {
-    iterator.remove();
-  }
 }
diff --git a/intercom-java/src/main/java/io/intercom/api/JobItemCollection.java b/intercom-java/src/main/java/io/intercom/api/JobItemCollection.java
index 52d841b2..0cbd7641 100644
--- a/intercom-java/src/main/java/io/intercom/api/JobItemCollection.java
+++ b/intercom-java/src/main/java/io/intercom/api/JobItemCollection.java
@@ -3,19 +3,13 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-import java.util.Iterator;
 import java.util.List;
 
 @SuppressWarnings("UnusedDeclaration")
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class JobItemCollection<T extends TypedData>
-    extends TypedDataCollection<JobItem<T>>
-    implements Iterator<JobItem<T>> {
-
-    protected TypedDataCollectionIterator<JobItem<T>> iterator;
+public class JobItemCollection<T extends TypedData> extends TypedDataCollection<JobItem<T>> {
 
     public JobItemCollection() {
-        iterator = new TypedDataCollectionIterator<JobItem<T>>(this);
     }
 
     public JobItemCollection(List<JobItem<T>> items) {
@@ -34,17 +28,4 @@ public List<JobItem<T>> getPage() {
     public JobItemCollection<T> nextPage() {
         return fetchNextPage(JobItemCollection.class);
     }
-
-    public boolean hasNext() {
-        return iterator.hasNext();
-    }
-
-    public JobItem<T> next() {
-        return iterator.next();
-    }
-
-    public void remove() {
-        iterator.remove();
-    }
-
 }
diff --git a/intercom-java/src/main/java/io/intercom/api/NoteCollection.java b/intercom-java/src/main/java/io/intercom/api/NoteCollection.java
index 8a389088..63d40dec 100644
--- a/intercom-java/src/main/java/io/intercom/api/NoteCollection.java
+++ b/intercom-java/src/main/java/io/intercom/api/NoteCollection.java
@@ -3,17 +3,14 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-import java.util.Iterator;
 import java.util.List;
 
 @SuppressWarnings("UnusedDeclaration")
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class NoteCollection extends TypedDataCollection<Note> implements Iterator<Note> {
+public class NoteCollection extends TypedDataCollection<Note> {
 
-    protected TypedDataCollectionIterator<Note> iterator;
 
     public NoteCollection() {
-        iterator = new TypedDataCollectionIterator<Note>(this);
     }
 
     @Override
@@ -27,17 +24,4 @@ public NoteCollection nextPage() {
     public List<Note> getPage() {
         return super.getPage();
     }
-
-    public boolean hasNext() {
-        return iterator.hasNext();
-    }
-
-    public Note next() {
-        return iterator.next();
-    }
-
-    public void remove() {
-        iterator.remove();
-    }
-
 }
diff --git a/intercom-java/src/main/java/io/intercom/api/NotificationCollection.java b/intercom-java/src/main/java/io/intercom/api/NotificationCollection.java
index ff27f3c8..e1d89de6 100644
--- a/intercom-java/src/main/java/io/intercom/api/NotificationCollection.java
+++ b/intercom-java/src/main/java/io/intercom/api/NotificationCollection.java
@@ -3,18 +3,15 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-import java.util.Iterator;
 import java.util.List;
 
 @SuppressWarnings("UnusedDeclaration")
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class NotificationCollection extends TypedDataCollection<Notification> implements Iterator<Notification> {
+public class NotificationCollection extends TypedDataCollection<Notification> {
 
-    protected TypedDataCollectionIterator<Notification> iterator;
 
     public NotificationCollection() {
         type = "notification.list";
-        iterator = new TypedDataCollectionIterator<Notification>(this);
     }
 
     @Override
@@ -28,17 +25,4 @@ public NotificationCollection nextPage() {
     public List<Notification> getPage() {
         return super.getPage();
     }
-
-    public boolean hasNext() {
-        return iterator.hasNext();
-    }
-
-    public Notification next() {
-        return iterator.next();
-    }
-
-    public void remove() {
-        iterator.remove();
-    }
-
 }
diff --git a/intercom-java/src/main/java/io/intercom/api/NotificationErrorCollection.java b/intercom-java/src/main/java/io/intercom/api/NotificationErrorCollection.java
index 8121449a..cec6d0f9 100644
--- a/intercom-java/src/main/java/io/intercom/api/NotificationErrorCollection.java
+++ b/intercom-java/src/main/java/io/intercom/api/NotificationErrorCollection.java
@@ -3,18 +3,14 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-import java.util.Iterator;
 import java.util.List;
 
 @SuppressWarnings("UnusedDeclaration")
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class NotificationErrorCollection extends TypedDataCollection<NotificationError> implements Iterator<NotificationError> {
-
-    protected TypedDataCollectionIterator<NotificationError> iterator;
+public class NotificationErrorCollection extends TypedDataCollection<NotificationError> {
 
     public NotificationErrorCollection() {
         type = "notification.list";
-        iterator = new TypedDataCollectionIterator<NotificationError>(this);
     }
 
     @SuppressWarnings("EmptyMethod")
@@ -28,16 +24,4 @@ public List<NotificationError> getPage() {
     public NotificationErrorCollection nextPage() {
         return fetchNextPage(NotificationErrorCollection.class);
     }
-
-    public boolean hasNext() {
-        return iterator.hasNext();
-    }
-
-    public NotificationError next() {
-        return iterator.next();
-    }
-
-    public void remove() {
-        iterator.remove();
-    }
 }
diff --git a/intercom-java/src/main/java/io/intercom/api/SegmentCollection.java b/intercom-java/src/main/java/io/intercom/api/SegmentCollection.java
index 309697f0..61283888 100644
--- a/intercom-java/src/main/java/io/intercom/api/SegmentCollection.java
+++ b/intercom-java/src/main/java/io/intercom/api/SegmentCollection.java
@@ -4,19 +4,15 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-import java.util.Iterator;
 import java.util.List;
 
 @SuppressWarnings("UnusedDeclaration")
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
-public class SegmentCollection extends TypedDataCollection<Segment> implements Iterator<Segment> {
-
-    protected TypedDataCollectionIterator<Segment> iterator;
+public class SegmentCollection extends TypedDataCollection<Segment> {
 
     public SegmentCollection() {
         type = "segment.list";
-        iterator = new TypedDataCollectionIterator<Segment>(this);
     }
 
     @Override
@@ -31,21 +27,9 @@ public List<Segment> getPage() {
         return super.getPage();
     }
 
-    public boolean hasNext() {
-        return iterator.hasNext();
-    }
-
-    public Segment next() {
-        return iterator.next();
-    }
-
-    public void remove() {
-        iterator.remove();
-    }
-
     @Override
     public String toString() {
         return "SegmentCollection{" +
-            "} " + super.toString();
+                "} " + super.toString();
     }
 }
diff --git a/intercom-java/src/main/java/io/intercom/api/SubscriptionCollection.java b/intercom-java/src/main/java/io/intercom/api/SubscriptionCollection.java
index ac9aceeb..cb5ca887 100644
--- a/intercom-java/src/main/java/io/intercom/api/SubscriptionCollection.java
+++ b/intercom-java/src/main/java/io/intercom/api/SubscriptionCollection.java
@@ -4,18 +4,14 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-import java.util.Iterator;
 import java.util.List;
 
 @SuppressWarnings("UnusedDeclaration")
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
-public class SubscriptionCollection extends TypedDataCollection<Subscription> implements Iterator<Subscription> {
-
-    protected TypedDataCollectionIterator<Subscription> iterator;
+public class SubscriptionCollection extends TypedDataCollection<Subscription> {
 
     public SubscriptionCollection() {
-        iterator = new TypedDataCollectionIterator<Subscription>(this);
     }
 
     @Override
@@ -30,21 +26,9 @@ public List<Subscription> getPage() {
         return super.getPage();
     }
 
-    public boolean hasNext() {
-        return iterator.hasNext();
-    }
-
-    public Subscription next() {
-        return iterator.next();
-    }
-
-    public void remove() {
-        iterator.remove();
-    }
-
     @Override
     public String toString() {
         return "SubscriptionCollection{" +
-            "} " + super.toString();
+                "} " + super.toString();
     }
 }
diff --git a/intercom-java/src/main/java/io/intercom/api/TagCollection.java b/intercom-java/src/main/java/io/intercom/api/TagCollection.java
index b37e942c..57fdf6bb 100644
--- a/intercom-java/src/main/java/io/intercom/api/TagCollection.java
+++ b/intercom-java/src/main/java/io/intercom/api/TagCollection.java
@@ -4,18 +4,14 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-import java.util.Iterator;
 import java.util.List;
 
 @SuppressWarnings("UnusedDeclaration")
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
-public class TagCollection extends TypedDataCollection<Tag> implements Iterator<Tag> {
-
-    protected TypedDataCollectionIterator<Tag> iterator;
+public class TagCollection extends TypedDataCollection<Tag> {
 
     public TagCollection() {
-        iterator = new TypedDataCollectionIterator<Tag>(this);
     }
 
     @Override
@@ -30,21 +26,9 @@ public List<Tag> getPage() {
         return super.getPage();
     }
 
-    public boolean hasNext() {
-        return iterator.hasNext();
-    }
-
-    public Tag next() {
-        return iterator.next();
-    }
-
-    public void remove() {
-        iterator.remove();
-    }
-
     @Override
     public String toString() {
         return "TagCollection{" +
-            "} " + super.toString();
+                "} " + super.toString();
     }
 }
diff --git a/intercom-java/src/main/java/io/intercom/api/TypedDataCollection.java b/intercom-java/src/main/java/io/intercom/api/TypedDataCollection.java
index 44895934..c76bc6f7 100644
--- a/intercom-java/src/main/java/io/intercom/api/TypedDataCollection.java
+++ b/intercom-java/src/main/java/io/intercom/api/TypedDataCollection.java
@@ -9,13 +9,14 @@
 import com.google.common.collect.Maps;
 
 import java.net.URI;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
 @SuppressWarnings("UnusedDeclaration")
 @JsonIgnoreProperties(value={"page"}, ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
-public abstract class TypedDataCollection<T extends TypedData> extends TypedData {
+public abstract class TypedDataCollection<T extends TypedData> extends TypedData implements Iterator<T> {
 
     public static final String NEXT_PAGE_REL = "next";
 
@@ -27,6 +28,12 @@ public abstract class TypedDataCollection<T extends TypedData> extends TypedData
     @JsonProperty("type")
     protected String type;
 
+    private TypedDataCollectionIterator<T> iterator;
+
+    public TypedDataCollection() {
+        iterator = new TypedDataCollectionIterator<>(this);
+    }
+
     public abstract TypedDataCollection<T> nextPage();
 
     public boolean hasNextPage() {
@@ -55,6 +62,21 @@ public String getType() {
         return type;
     }
 
+    @Override
+    public boolean hasNext() {
+        return iterator.hasNext();
+    }
+
+    @Override
+    public T next() {
+        return iterator.next();
+    }
+
+    @Override
+    public void remove() {
+        iterator.remove();
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
diff --git a/intercom-java/src/main/java/io/intercom/api/UserCollection.java b/intercom-java/src/main/java/io/intercom/api/UserCollection.java
index eb46c8a1..78394909 100644
--- a/intercom-java/src/main/java/io/intercom/api/UserCollection.java
+++ b/intercom-java/src/main/java/io/intercom/api/UserCollection.java
@@ -3,17 +3,14 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-import java.util.Iterator;
 import java.util.List;
 
 @SuppressWarnings("UnusedDeclaration")
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class UserCollection extends TypedDataCollection<User> implements Iterator<User> {
+public class UserCollection extends TypedDataCollection<User> {
 
-    protected TypedDataCollectionIterator<User> iterator;
 
     public UserCollection() {
-        iterator = new TypedDataCollectionIterator<User>(this);
     }
 
     public UserCollection(List<User> users) {
@@ -32,17 +29,4 @@ public List<User> getPage() {
     public UserCollection nextPage() {
         return fetchNextPage(UserCollection.class);
     }
-
-    public boolean hasNext() {
-        return iterator.hasNext();
-    }
-
-    public User next() {
-        return iterator.next();
-    }
-
-    public void remove() {
-        iterator.remove();
-    }
-
 }

From bbfe445da7708819ed3d289c5c4839682acd13b6 Mon Sep 17 00:00:00 2001
From: Catalin Craciun <cata.craciun@outlook.com>
Date: Wed, 31 Oct 2018 08:23:30 +0200
Subject: [PATCH 2/2] Making sure the iterator is always initialized, even if a
 subclass does not call super() in its constructor.

---
 .../src/main/java/io/intercom/api/TypedDataCollection.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/intercom-java/src/main/java/io/intercom/api/TypedDataCollection.java b/intercom-java/src/main/java/io/intercom/api/TypedDataCollection.java
index c76bc6f7..440e8352 100644
--- a/intercom-java/src/main/java/io/intercom/api/TypedDataCollection.java
+++ b/intercom-java/src/main/java/io/intercom/api/TypedDataCollection.java
@@ -30,7 +30,7 @@ public abstract class TypedDataCollection<T extends TypedData> extends TypedData
 
     private TypedDataCollectionIterator<T> iterator;
 
-    public TypedDataCollection() {
+    {
         iterator = new TypedDataCollectionIterator<>(this);
     }