From 75e9c6ddf7dcbcb4e98ebb17cd8e9ef9ed3965b4 Mon Sep 17 00:00:00 2001
From: Alessio Nunzi <alessio.nunzi@gmail.com>
Date: Wed, 17 Jul 2019 00:23:20 +0100
Subject: [PATCH 1/6] Converted all ids to long to avoid occasional
 NumberFormatException

---
 .idea/.name                                   |   1 -
 .idea/caches/build_file_checksums.ser         | Bin 589 -> 0 bytes
 .idea/codeStyles/Project.xml                  |  29 ------------------
 .idea/gradle.xml                              |   3 ++
 .idea/modules.xml                             |   1 +
 .../stravazpot/activity/model/Activity.java   |   8 ++---
 .../activity/model/ActivityLap.java           |   4 +--
 .../stravazpot/activity/model/Comment.java    |   8 ++---
 .../stravazpot/activity/model/Photo.java      |   8 ++---
 .../activity/model/PrimaryPhoto.java          |   4 +--
 .../authenticaton/api/StravaLogin.java        |   4 +--
 .../stravazpot/club/model/Announcement.java   |   8 ++---
 .../sweetzpot/stravazpot/club/model/Club.java |   4 +--
 .../stravazpot/club/model/Event.java          |  12 ++++----
 .../stravazpot/route/model/Route.java         |   4 +--
 .../segment/model/LeaderboardEntry.java       |  12 ++++----
 .../stravazpot/segment/model/Segment.java     |   4 +--
 .../stravazpot/upload/model/UploadStatus.java |   6 ++--
 .../stravazpot/upload/api/UploadAPITest.java  |   2 +-
 19 files changed, 48 insertions(+), 74 deletions(-)
 delete mode 100644 .idea/.name
 delete mode 100644 .idea/caches/build_file_checksums.ser
 delete mode 100644 .idea/codeStyles/Project.xml

diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index 8dff4fb..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-StravaZpot
\ No newline at end of file
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
deleted file mode 100644
index 1129044cd19fe656fbcfdba4fec156c9865dfd90..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 589
zcmZ4UmVvdnh`~NNKUXg?FQq6yGexf?KR>5fFEb@IQ7^qHF(oHeub?PDD>b=9F91S2
zm1gFoxMk*~I%lLNXBU^|7Q2L-Ts|(GuF1r}<i#MFTj`TnT;dMa8(f)}9Fm!vT3nKt
zTj0aMpIeEdv4nx&Co8cmQNOe#Ge_SyvB0{bfPsNA*;>7AC(vDjAUQpdoSsKwaRyMH
zmHpPi!(s^+nHiYe7`Srs6I0w0lS}f8JQ+AkGKx}*GxBp%Dhli!7(jrhoC8P-05Lnz
zqT<w&lFYpHVyLf5ix`-qoz{F7|G~x)@_>nf0c10SK(m0--(AjgxVNhP{E#N;F{gxq
zCkf<Vn65&GItDh7!Y3J_+n#&P51-L0bw}f5(V-Fsft>v0#2ip)6{HrGWTqCE!WH+1
zyx6_Bbebv4&u>DrCoQinVbIqPElw>e)-TD=O)M@d&8*4+>Z;O*TBDB$c?`3z$oAaq
zXV}E@vVn8Pn;%YfB@BXiRLi;E_T+Gz8r$7<_i1w0ACNN>3kvkH`)S#_BN;kO>5FGK
jo%*)N&G8AyPnk(L6lat_OjQW1W>sE#qmSYDuGbX+A%)Sk

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index 30aa626..0000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <Objective-C-extensions>
-      <file>
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
-      </file>
-      <class>
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
-      </class>
-      <extensions>
-        <pair source="cpp" header="h" fileNamingConvention="NONE" />
-        <pair source="c" header="h" fileNamingConvention="NONE" />
-      </extensions>
-    </Objective-C-extensions>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 9126e14..e30fbe4 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -3,6 +3,9 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <compositeConfiguration>
+          <compositeBuild compositeDefinitionSource="SCRIPT" />
+        </compositeConfiguration>
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1" />
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 30d689e..2afc5e7 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,6 +3,7 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/StravaZpot.iml" filepath="$PROJECT_DIR$/StravaZpot.iml" />
+      <module fileurl="file://$PROJECT_DIR$/StravaZpot-Android.iml" filepath="$PROJECT_DIR$/StravaZpot-Android.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
       <module fileurl="file://$PROJECT_DIR$/lib/lib.iml" filepath="$PROJECT_DIR$/lib/lib.iml" />
     </modules>
diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/activity/model/Activity.java b/lib/src/main/java/com/sweetzpot/stravazpot/activity/model/Activity.java
index 3e93d51..37ea208 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/activity/model/Activity.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/activity/model/Activity.java
@@ -16,10 +16,10 @@
 import java.util.List;
 
 public class Activity {
-    @SerializedName("id") private int ID;
+    @SerializedName("id") private long ID;
     @SerializedName("resource_state") private ResourceState resourceState;
     @SerializedName("external_id") private String externalID;
-    @SerializedName("upload_id") private int uploadID;
+    @SerializedName("upload_id") private long uploadID;
     @SerializedName("athlete") private Athlete athlete;
     @SerializedName("name") private String name;
     @SerializedName("description") private String description;
@@ -73,7 +73,7 @@ public class Activity {
     @SerializedName("splits_metric") private List<Split> splitsMetric;
     @SerializedName("splits_standard") private List<Split> splitsStandard;
 
-    public int getID() {
+    public long getID() {
         return ID;
     }
 
@@ -85,7 +85,7 @@ public String getExternalID() {
         return externalID;
     }
 
-    public int getUploadID() {
+    public long getUploadID() {
         return uploadID;
     }
 
diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/activity/model/ActivityLap.java b/lib/src/main/java/com/sweetzpot/stravazpot/activity/model/ActivityLap.java
index c71b25b..2647663 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/activity/model/ActivityLap.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/activity/model/ActivityLap.java
@@ -10,7 +10,7 @@
 import java.util.Date;
 
 public class ActivityLap {
-    @SerializedName("id") private int ID;
+    @SerializedName("id") private long ID;
     @SerializedName("resource_state") private ResourceState resourceState;
     @SerializedName("name") private String name;
     @SerializedName("activity") private Activity activity;
@@ -33,7 +33,7 @@ public class ActivityLap {
     @SerializedName("average_heartrate") private float averageHeartRate;
     @SerializedName("lap_index") private int lapIndex;
 
-    public int getID() {
+    public long getID() {
         return ID;
     }
 
diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/activity/model/Comment.java b/lib/src/main/java/com/sweetzpot/stravazpot/activity/model/Comment.java
index 12202dd..b2b144d 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/activity/model/Comment.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/activity/model/Comment.java
@@ -7,14 +7,14 @@
 import java.util.Date;
 
 public class Comment {
-    @SerializedName("id") private int ID;
+    @SerializedName("id") private long ID;
     @SerializedName("resource_state") private ResourceState resourceState;
-    @SerializedName("activity_id") private int activityID;
+    @SerializedName("activity_id") private long activityID;
     @SerializedName("text") private String text;
     @SerializedName("athlete") private Athlete athlete;
     @SerializedName("created_at") private Date createdAt;
 
-    public int getID() {
+    public long getID() {
         return ID;
     }
 
@@ -22,7 +22,7 @@ public ResourceState getResourceState() {
         return resourceState;
     }
 
-    public int getActivityID() {
+    public long getActivityID() {
         return activityID;
     }
 
diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/activity/model/Photo.java b/lib/src/main/java/com/sweetzpot/stravazpot/activity/model/Photo.java
index 59e21d1..cfdcc96 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/activity/model/Photo.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/activity/model/Photo.java
@@ -9,8 +9,8 @@
 
 public class Photo {
     @SerializedName("unique_id") private String uniqueID;
-    @SerializedName("id") private int ID;
-    @SerializedName("activity_id") private int activityID;
+    @SerializedName("id") private long ID;
+    @SerializedName("activity_id") private long activityID;
     @SerializedName("resource_state") private ResourceState resourceState;
     @SerializedName("urls") private HashMap<String, String> urls;
     @SerializedName("caption") private String caption;
@@ -26,11 +26,11 @@ public String getUniqueID() {
         return uniqueID;
     }
 
-    public int getID() {
+    public long getID() {
         return ID;
     }
 
-    public int getActivityID() {
+    public long getActivityID() {
         return activityID;
     }
 
diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/activity/model/PrimaryPhoto.java b/lib/src/main/java/com/sweetzpot/stravazpot/activity/model/PrimaryPhoto.java
index 626d2dd..82a2751 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/activity/model/PrimaryPhoto.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/activity/model/PrimaryPhoto.java
@@ -5,12 +5,12 @@
 import java.util.HashMap;
 
 public class PrimaryPhoto {
-    @SerializedName("id") private int ID;
+    @SerializedName("id") private long ID;
     @SerializedName("source") private PhotoSource source;
     @SerializedName("unique_id") private String uniqueID;
     @SerializedName("urls") private HashMap<String, String> urls;
 
-    public int getID() {
+    public long getID() {
         return ID;
     }
 
diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/authenticaton/api/StravaLogin.java b/lib/src/main/java/com/sweetzpot/stravazpot/authenticaton/api/StravaLogin.java
index d1270a6..52d8104 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/authenticaton/api/StravaLogin.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/authenticaton/api/StravaLogin.java
@@ -9,7 +9,7 @@ public class StravaLogin {
 
     private static final String STRAVA_LOGIN_URL = "https://www.strava.com/oauth/authorize?response_type=code";
     private Context context;
-    private int clientID;
+    private long clientID;
     private String redirectURI;
     private ApprovalPrompt approvalPrompt;
     private AccessScope accessScope;
@@ -22,7 +22,7 @@ public StravaLogin(Context context) {
         this.context = context;
     }
 
-    public StravaLogin withClientID(int clientID) {
+    public StravaLogin withClientID(long clientID) {
         this.clientID = clientID;
         return this;
     }
diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/club/model/Announcement.java b/lib/src/main/java/com/sweetzpot/stravazpot/club/model/Announcement.java
index 8a82452..d7a15da 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/club/model/Announcement.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/club/model/Announcement.java
@@ -7,14 +7,14 @@
 import java.util.Date;
 
 public class Announcement {
-    @SerializedName("id") private int ID;
+    @SerializedName("id") private long ID;
     @SerializedName("resource_state") private ResourceState resourceState;
-    @SerializedName("club_id") private int clubID;
+    @SerializedName("club_id") private long clubID;
     @SerializedName("athlete") private Athlete athlete;
     @SerializedName("created_at") private Date createdAt;
     @SerializedName("message") private String message;
 
-    public int getID() {
+    public long getID() {
         return ID;
     }
 
@@ -22,7 +22,7 @@ public ResourceState getResourceState() {
         return resourceState;
     }
 
-    public int getClubID() {
+    public long getClubID() {
         return clubID;
     }
 
diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/club/model/Club.java b/lib/src/main/java/com/sweetzpot/stravazpot/club/model/Club.java
index fbddd65..5d264c6 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/club/model/Club.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/club/model/Club.java
@@ -4,7 +4,7 @@
 import com.sweetzpot.stravazpot.common.model.ResourceState;
 
 public class Club {
-    @SerializedName("id") private int ID;
+    @SerializedName("id") private long ID;
     @SerializedName("resource_state") private ResourceState resourceState;
     @SerializedName("name") private String name;
     @SerializedName("profile_medium") private String profileMedium;
@@ -27,7 +27,7 @@ public class Club {
     @SerializedName("following_count") private int followingCount;
     @SerializedName("url") private String url;
 
-    public int getID() {
+    public long getID() {
         return ID;
     }
 
diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/club/model/Event.java b/lib/src/main/java/com/sweetzpot/stravazpot/club/model/Event.java
index 714597b..7b1a089 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/club/model/Event.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/club/model/Event.java
@@ -9,15 +9,15 @@
 import java.util.List;
 
 public class Event {
-    @SerializedName("id") private int ID;
+    @SerializedName("id") private long ID;
     @SerializedName("resource_state") private ResourceState resourceState;
     @SerializedName("title") private String title;
     @SerializedName("description") private String description;
-    @SerializedName("club_id") private int clubID;
+    @SerializedName("club_id") private long clubID;
     @SerializedName("organizing_athlete") private Athlete organizingAthlete;
     @SerializedName("activity_type") private ActivityType activityType;
     @SerializedName("created_at") private Date createdAt;
-    @SerializedName("route_id") private int routeID;
+    @SerializedName("route_id") private long routeID;
     @SerializedName("women_only") private boolean womenOnly;
     @SerializedName("private") private boolean isPrivate;
     @SerializedName("skill_levels") private SkillLevel skillLevel;
@@ -25,7 +25,7 @@ public class Event {
     @SerializedName("upcoming_occurrences") private List<Date> upcomingOccurrences;
     @SerializedName("address") private String address;
 
-    public int getID() {
+    public long getID() {
         return ID;
     }
 
@@ -41,7 +41,7 @@ public String getDescription() {
         return description;
     }
 
-    public int getClubID() {
+    public long getClubID() {
         return clubID;
     }
 
@@ -57,7 +57,7 @@ public Date getCreatedAt() {
         return createdAt;
     }
 
-    public int getRouteID() {
+    public long getRouteID() {
         return routeID;
     }
 
diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/route/model/Route.java b/lib/src/main/java/com/sweetzpot/stravazpot/route/model/Route.java
index 5ca8b9f..387ab5e 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/route/model/Route.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/route/model/Route.java
@@ -9,7 +9,7 @@
 import java.util.List;
 
 public class Route {
-    @SerializedName("id") private int ID;
+    @SerializedName("id") private long ID;
     @SerializedName("resource_state") private ResourceState resourceState;
     @SerializedName("name") private String name;
     @SerializedName("description") private String description;
@@ -25,7 +25,7 @@ public class Route {
     @SerializedName("segments") private List<Segment> segments;
     @SerializedName("estimated_moving_time") private int estimatedMovingTime;
 
-    public int getID() {
+    public long getID() {
         return ID;
     }
 
diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/segment/model/LeaderboardEntry.java b/lib/src/main/java/com/sweetzpot/stravazpot/segment/model/LeaderboardEntry.java
index 47f997d..9ff4195 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/segment/model/LeaderboardEntry.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/segment/model/LeaderboardEntry.java
@@ -9,7 +9,7 @@
 
 public class LeaderboardEntry {
     @SerializedName("athlete_name") private String athleteName;
-    @SerializedName("athlete_id") private int athleteID;
+    @SerializedName("athlete_id") private long athleteID;
     @SerializedName("athlete_gender") private Gender athleteGender;
     @SerializedName("average_hr") private float averageHeartRate;
     @SerializedName("average_watts") private float averageWatts;
@@ -18,8 +18,8 @@ public class LeaderboardEntry {
     @SerializedName("moving_time") private Time movingTime;
     @SerializedName("start_date") private Date startDate;
     @SerializedName("start_date_local") private Date startDateLocal;
-    @SerializedName("activity_id") private int activityID;
-    @SerializedName("effort_id") private int effortID;
+    @SerializedName("activity_id") private long activityID;
+    @SerializedName("effort_id") private long effortID;
     @SerializedName("rank") private int rank;
     @SerializedName("athlete_profile") private String athleteProfile;
 
@@ -27,7 +27,7 @@ public String getAthleteName() {
         return athleteName;
     }
 
-    public int getAthleteID() {
+    public long getAthleteID() {
         return athleteID;
     }
 
@@ -63,11 +63,11 @@ public Date getStartDateLocal() {
         return startDateLocal;
     }
 
-    public int getActivityID() {
+    public long getActivityID() {
         return activityID;
     }
 
-    public int getEffortID() {
+    public long getEffortID() {
         return effortID;
     }
 
diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/segment/model/Segment.java b/lib/src/main/java/com/sweetzpot/stravazpot/segment/model/Segment.java
index db6a614..661d86b 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/segment/model/Segment.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/segment/model/Segment.java
@@ -11,7 +11,7 @@
 import java.util.Date;
 
 public class Segment {
-    @SerializedName("id") private int ID;
+    @SerializedName("id") private long ID;
     @SerializedName("resource_state") private ResourceState resourceState;
     @SerializedName("name") private String name;
     @SerializedName("activity_type") private ActivityType activityType;
@@ -37,7 +37,7 @@ public class Segment {
     @SerializedName("hazardous") private boolean hazardous;
     @SerializedName("star_count") private int starCount;
 
-    public int getID() {
+    public long getID() {
         return ID;
     }
 
diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/upload/model/UploadStatus.java b/lib/src/main/java/com/sweetzpot/stravazpot/upload/model/UploadStatus.java
index 9cebaa2..6506ee7 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/upload/model/UploadStatus.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/upload/model/UploadStatus.java
@@ -4,14 +4,14 @@
 
 public class UploadStatus {
 
-    @SerializedName("id") private int id;
+    @SerializedName("id") private long ID;
     @SerializedName("external_id") private String externalID;
     @SerializedName("error") private String error;
     @SerializedName("status") private String status;
     @SerializedName("activity_id") private Integer activityID;
 
-    public int getId() {
-        return id;
+    public long getID() {
+        return ID;
     }
 
     public String getExternalID() {
diff --git a/lib/src/test/java/com/sweetzpot/stravazpot/upload/api/UploadAPITest.java b/lib/src/test/java/com/sweetzpot/stravazpot/upload/api/UploadAPITest.java
index 445c06d..aa57bd3 100644
--- a/lib/src/test/java/com/sweetzpot/stravazpot/upload/api/UploadAPITest.java
+++ b/lib/src/test/java/com/sweetzpot/stravazpot/upload/api/UploadAPITest.java
@@ -62,7 +62,7 @@ private void enqueueUploadStatus() {
     }
 
     private void assertUploadStatusParsedCorrectly(UploadStatus uploadStatus) {
-        assertThat(uploadStatus.getId(), is(16486788));
+        assertThat(uploadStatus.getID(), is(16486788));
         assertThat(uploadStatus.getExternalID(), is(equalTo("test.fit")));
         assertThat(uploadStatus.getError(), is(nullValue()));
         assertThat(uploadStatus.getStatus(), is(equalTo("Your activity is still being processed.")));

From f84969a5a7e143dc4d5ff676993a952217feccdb Mon Sep 17 00:00:00 2001
From: Alessio Nunzi <alessio.nunzi@gmail.com>
Date: Wed, 17 Jul 2019 00:33:06 +0100
Subject: [PATCH 2/6] fixed travis build

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 9a7acec..d01e011 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,5 +25,6 @@ before_install:
   - echo "sdk.dir=$ANDROID_HOME" > local.properties
   - echo "bintray.user=user" >> local.properties
   - echo "bintray.apikey=key" >> local.properties
+  - yes | sdkmanager "platforms;android-27"
 script:
   - ./gradlew clean assemble test

From 788cee0f96125fe309e3fa6cb3149bde5c2159a0 Mon Sep 17 00:00:00 2001
From: Alessio Nunzi <alessio.nunzi@gmail.com>
Date: Wed, 17 Jul 2019 00:45:12 +0100
Subject: [PATCH 3/6] fixing failed tests

---
 .../stravazpot/activity/api/ActivityAPITest.java     |  6 +++---
 .../stravazpot/activity/api/CommentAPITest.java      |  4 ++--
 .../stravazpot/activity/api/PhotoAPITest.java        |  4 ++--
 .../sweetzpot/stravazpot/club/api/ClubAPITest.java   | 12 ++++++------
 .../sweetzpot/stravazpot/route/api/RouteAPITest.java |  2 +-
 .../stravazpot/segment/api/SegmentAPITest.java       |  8 ++++----
 .../stravazpot/upload/api/UploadAPITest.java         |  2 +-
 7 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/lib/src/test/java/com/sweetzpot/stravazpot/activity/api/ActivityAPITest.java b/lib/src/test/java/com/sweetzpot/stravazpot/activity/api/ActivityAPITest.java
index ff640b7..6738e51 100644
--- a/lib/src/test/java/com/sweetzpot/stravazpot/activity/api/ActivityAPITest.java
+++ b/lib/src/test/java/com/sweetzpot/stravazpot/activity/api/ActivityAPITest.java
@@ -200,10 +200,10 @@ private ActivityAPI givenAnActivityAPI() {
     }
 
     private void assertActivityParsedCorrectly(Activity activity) {
-        assertThat(activity.getID(), is(321934));
+        assertThat(activity.getID(), is(321934L));
         assertThat(activity.getResourceState(), is(ResourceState.DETAILED));
         assertThat(activity.getExternalID(), is("2012-12-12_21-40-32-80-29011.fit"));
-        assertThat(activity.getUploadID(), is(361720));
+        assertThat(activity.getUploadID(), is(361720L));
         assertThat(activity.getAthlete(), is(notNullValue()));
         assertThat(activity.getName(), is("Evening Ride"));
         assertThat(activity.getDescription(), is("the best ride ever"));
@@ -537,7 +537,7 @@ private void enqueueActivityZones() {
     private void assertActivityLapsParsedCorrectly(List<ActivityLap> laps) {
         assertThat(laps.size(), is(1));
         ActivityLap lap = laps.get(0);
-        assertThat(lap.getID(), is(401614652));
+        assertThat(lap.getID(), is(401614652L));
         assertThat(lap.getResourceState(), is(ResourceState.SUMMARY));
         assertThat(lap.getName(), is("Lap 1"));
         assertThat(lap.getActivity(), is(notNullValue()));
diff --git a/lib/src/test/java/com/sweetzpot/stravazpot/activity/api/CommentAPITest.java b/lib/src/test/java/com/sweetzpot/stravazpot/activity/api/CommentAPITest.java
index b554158..9e3acc2 100644
--- a/lib/src/test/java/com/sweetzpot/stravazpot/activity/api/CommentAPITest.java
+++ b/lib/src/test/java/com/sweetzpot/stravazpot/activity/api/CommentAPITest.java
@@ -42,8 +42,8 @@ private CommentAPI givenACommentAPI() {
     private void assertCommentsParsedCorrectly(List<Comment> comments) {
         assertThat(comments.size(), is(1));
         Comment comment = comments.get(0);
-        assertThat(comment.getID(), is(26));
-        assertThat(comment.getActivityID(), is(123));
+        assertThat(comment.getID(), is(26L));
+        assertThat(comment.getActivityID(), is(123L));
         assertThat(comment.getResourceState(), is(ResourceState.SUMMARY));
         assertThat(comment.getText(), is("Nice ride!!!"));
         assertThat(comment.getAthlete(), is(notNullValue()));
diff --git a/lib/src/test/java/com/sweetzpot/stravazpot/activity/api/PhotoAPITest.java b/lib/src/test/java/com/sweetzpot/stravazpot/activity/api/PhotoAPITest.java
index d3fab02..7374833 100644
--- a/lib/src/test/java/com/sweetzpot/stravazpot/activity/api/PhotoAPITest.java
+++ b/lib/src/test/java/com/sweetzpot/stravazpot/activity/api/PhotoAPITest.java
@@ -39,8 +39,8 @@ private PhotoAPI givenAPhotoAPI() {
     private void assertPhotosParsedCorrectly(List<Photo> photos) {
         assertThat(photos.size(), is(2));
         Photo photo = photos.get(0);
-        assertThat(photo.getID(), is(10701863));
-        assertThat(photo.getActivityID(), is(81121657));
+        assertThat(photo.getID(), is(10701863L));
+        assertThat(photo.getActivityID(), is(81121657L));
         assertThat(photo.getRef(), is("http://instagram.com/p/eAvA-tir85/"));
         assertThat(photo.getUid(), is("540638730806542137_2865686"));
         assertThat(photo.getType(), is("InstagramPhoto"));
diff --git a/lib/src/test/java/com/sweetzpot/stravazpot/club/api/ClubAPITest.java b/lib/src/test/java/com/sweetzpot/stravazpot/club/api/ClubAPITest.java
index 6c0194f..6a01f25 100644
--- a/lib/src/test/java/com/sweetzpot/stravazpot/club/api/ClubAPITest.java
+++ b/lib/src/test/java/com/sweetzpot/stravazpot/club/api/ClubAPITest.java
@@ -158,7 +158,7 @@ private ClubAPI givenAClubAPI() {
     }
 
     private void assertClubParsedCorrectly(Club club) {
-        assertThat(club.getID(), is(1));
+        assertThat(club.getID(), is(1L));
         assertThat(club.getResourceState(), is(ResourceState.DETAILED));
         assertThat(club.getName(), is("Team Strava Cycling"));
         assertThat(club.getProfileMedium(), is("http://pics.com/clubs/1/medium.jpg"));
@@ -213,9 +213,9 @@ private void enqueueClub() {
     private void assertAnnouncementsParsedCorrectly(List<Announcement> announcements) {
         assertThat(announcements.size(), is(1));
         Announcement announcement = announcements.get(0);
-        assertThat(announcement.getID(), is(1219827));
+        assertThat(announcement.getID(), is(1219827L));
         assertThat(announcement.getResourceState(), is(ResourceState.SUMMARY));
-        assertThat(announcement.getClubID(), is(109984));
+        assertThat(announcement.getClubID(), is(109984L));
         assertThat(announcement.getAthlete(), is(notNullValue()));
         assertThat(announcement.getCreatedAt(), isSameDate(makeDate(1, Calendar.APRIL, 2015, 21, 14, 2)));
         assertThat(announcement.getMessage(), is("hello club"));
@@ -254,15 +254,15 @@ private void enqueueAnnouncements() {
     private void assertEventsParsedCorrectly(List<Event> events) {
         assertThat(events.size(), is(1));
         Event event = events.get(0);
-        assertThat(event.getID(), is(1234567));
+        assertThat(event.getID(), is(1234567L));
         assertThat(event.getResourceState(), is(ResourceState.SUMMARY));
         assertThat(event.getTitle(), is("Test Group Event"));
         assertThat(event.getDescription(), is("Very fun group ride"));
-        assertThat(event.getClubID(), is(1));
+        assertThat(event.getClubID(), is(1L));
         assertThat(event.getOrganizingAthlete(), is(notNullValue()));
         assertThat(event.getActivityType(), is(ActivityType.RIDE));
         assertThat(event.getCreatedAt(), isSameDate(makeDate(26, Calendar.AUGUST, 2009, 13, 42, 5)));
-        assertThat(event.getRouteID(), is(123456));
+        assertThat(event.getRouteID(), is(123456L));
         assertThat(event.isWomenOnly(), is(false));
         assertThat(event.isPrivate(), is(true));
         assertThat(event.getSkillLevel(), is(SkillLevel.CASUAL));
diff --git a/lib/src/test/java/com/sweetzpot/stravazpot/route/api/RouteAPITest.java b/lib/src/test/java/com/sweetzpot/stravazpot/route/api/RouteAPITest.java
index 13ae7a0..da711fa 100644
--- a/lib/src/test/java/com/sweetzpot/stravazpot/route/api/RouteAPITest.java
+++ b/lib/src/test/java/com/sweetzpot/stravazpot/route/api/RouteAPITest.java
@@ -50,7 +50,7 @@ private void assertRouteParsedCorrectly(Route route) {
         assertThat(route.getDescription(), is(""));
         assertThat(route.getDistance(), is(equalTo(Distance.meters(173625.6f))));
         assertThat(route.getElevationGain(), is(equalTo(Distance.meters(2964.6f))));
-        assertThat(route.getID(), is(1263727));
+        assertThat(route.getID(), is(1263727L));
         assertThat(route.getMap().getID(), is("r1263727"));
         assertThat(route.getMap().getSummaryPolyline(), is("qyrFxswgV|"));
         assertThat(route.getMap().getResourceState(), is(ResourceState.DETAILED));
diff --git a/lib/src/test/java/com/sweetzpot/stravazpot/segment/api/SegmentAPITest.java b/lib/src/test/java/com/sweetzpot/stravazpot/segment/api/SegmentAPITest.java
index e959dc9..ccea5b3 100644
--- a/lib/src/test/java/com/sweetzpot/stravazpot/segment/api/SegmentAPITest.java
+++ b/lib/src/test/java/com/sweetzpot/stravazpot/segment/api/SegmentAPITest.java
@@ -191,7 +191,7 @@ private SegmentAPI givenASegmentAPI() {
     }
 
     private void assertSegmentParsedCorrectly(Segment segment) {
-        assertThat(segment.getID(), is(229781));
+        assertThat(segment.getID(), is(229781L));
         assertThat(segment.getResourceState(), is(DETAILED));
         assertThat(segment.getName(), is("Hawk Hill"));
         assertThat(segment.getActivityType(), is(ActivityType.RIDE));
@@ -266,7 +266,7 @@ private void assertLeaderboardParsedCorrectly(Leaderboard leaderboard) {
         assertThat(leaderboard.getEntries().size(), is(2));
         LeaderboardEntry entry = leaderboard.getEntries().get(0);
         assertThat(entry.getAthleteName(), is("Jim Whimpey"));
-        assertThat(entry.getAthleteID(), is(123529));
+        assertThat(entry.getAthleteID(), is(123529L));
         assertThat(entry.getAthleteGender(), is(Gender.MALE));
         assertThat(entry.getAverageHeartRate(), is(190.5f));
         assertThat(entry.getAverageWatts(), is(460.8f));
@@ -275,8 +275,8 @@ private void assertLeaderboardParsedCorrectly(Leaderboard leaderboard) {
         assertThat(entry.getMovingTime(), is(equalTo(Time.seconds(360))));
         assertThat(entry.getStartDate(), isSameDate(makeDate(29, Calendar.MARCH, 2013, 13, 49, 35)));
         assertThat(entry.getStartDateLocal(), isSameDate(makeDate(29, Calendar.MARCH, 2013, 6, 49, 35)));
-        assertThat(entry.getActivityID(), is(46320211));
-        assertThat(entry.getEffortID(), is(801006623));
+        assertThat(entry.getActivityID(), is(46320211L));
+        assertThat(entry.getEffortID(), is(801006623L));
         assertThat(entry.getRank(), is(1));
         assertThat(entry.getAthleteProfile(), is("http://pics.com/227615/large.jpg"));
     }
diff --git a/lib/src/test/java/com/sweetzpot/stravazpot/upload/api/UploadAPITest.java b/lib/src/test/java/com/sweetzpot/stravazpot/upload/api/UploadAPITest.java
index aa57bd3..49e651f 100644
--- a/lib/src/test/java/com/sweetzpot/stravazpot/upload/api/UploadAPITest.java
+++ b/lib/src/test/java/com/sweetzpot/stravazpot/upload/api/UploadAPITest.java
@@ -62,7 +62,7 @@ private void enqueueUploadStatus() {
     }
 
     private void assertUploadStatusParsedCorrectly(UploadStatus uploadStatus) {
-        assertThat(uploadStatus.getID(), is(16486788));
+        assertThat(uploadStatus.getID(), is(16486788L));
         assertThat(uploadStatus.getExternalID(), is(equalTo("test.fit")));
         assertThat(uploadStatus.getError(), is(nullValue()));
         assertThat(uploadStatus.getStatus(), is(equalTo("Your activity is still being processed.")));

From c06bb7e612ce671d732e903b7557b3233d967fad Mon Sep 17 00:00:00 2001
From: Alessio Nunzi <alessio.nunzi@gmail.com>
Date: Thu, 18 Jul 2019 00:45:22 +0100
Subject: [PATCH 4/6] using long throughout the code

---
 .../stravazpot/activity/api/ActivityAPI.java     | 12 ++++++------
 .../stravazpot/activity/api/CommentAPI.java      |  2 +-
 .../stravazpot/activity/api/KudosAPI.java        |  2 +-
 .../stravazpot/activity/api/PhotoAPI.java        |  2 +-
 .../activity/request/DeleteActivityRequest.java  |  4 ++--
 .../activity/request/GetActivityRequest.java     |  4 ++--
 .../request/ListActivityCommentsRequest.java     |  4 ++--
 .../request/ListActivityKudoersRequest.java      |  4 ++--
 .../request/ListActivityLapsRequest.java         |  4 ++--
 .../request/ListActivityPhotosRequest.java       |  4 ++--
 .../request/ListActivityZonesRequest.java        |  4 ++--
 .../request/ListRelatedActivitiesRequest.java    |  4 ++--
 .../activity/request/UpdateActivityRequest.java  |  4 ++--
 .../stravazpot/activity/rest/ActivityRest.java   | 12 ++++++------
 .../stravazpot/activity/rest/CommentsRest.java   |  2 +-
 .../stravazpot/activity/rest/KudosRest.java      |  2 +-
 .../stravazpot/activity/rest/PhotosRest.java     |  2 +-
 .../stravazpot/athlete/api/AthleteAPI.java       |  6 +++---
 .../stravazpot/athlete/api/FriendAPI.java        |  6 +++---
 .../athlete/request/AthleteRequest.java          |  4 ++--
 .../request/GetAthleteFollowersRequest.java      |  4 ++--
 .../request/GetAthleteFriendsRequest.java        |  4 ++--
 .../athlete/request/GetBothFollowingRequest.java |  4 ++--
 .../request/GetTotalsAndStatsRequest.java        |  4 ++--
 .../athlete/request/ListAthleteKOMSRequest.java  |  4 ++--
 .../stravazpot/athlete/rest/AthleteRest.java     |  6 +++---
 .../stravazpot/athlete/rest/FriendRest.java      |  6 +++---
 .../sweetzpot/stravazpot/club/api/ClubAPI.java   | 16 ++++++++--------
 .../stravazpot/club/request/GetClubRequest.java  |  4 ++--
 .../stravazpot/club/request/JoinClubRequest.java |  4 ++--
 .../club/request/LeaveClubRequest.java           |  4 ++--
 .../club/request/ListClubActivitiesRequest.java  |  4 ++--
 .../club/request/ListClubAdminsRequest.java      |  4 ++--
 .../request/ListClubAnnouncementsRequest.java    |  4 ++--
 .../club/request/ListClubGroupEventsRequest.java |  4 ++--
 .../club/request/ListClubMembersRequest.java     |  4 ++--
 .../sweetzpot/stravazpot/club/rest/ClubRest.java | 16 ++++++++--------
 .../sweetzpot/stravazpot/route/api/RouteAPI.java |  4 ++--
 .../route/request/GetRouteRequest.java           |  4 ++--
 .../route/request/ListRoutesRequest.java         |  4 ++--
 .../stravazpot/route/rest/RouteRest.java         |  4 ++--
 .../request/GetSegmentLeaderboardRequest.java    |  8 ++++----
 .../segment/request/GetSegmentRequest.java       |  4 ++--
 .../ListAthleteStarredSegmentsRequest.java       |  4 ++--
 .../request/ListSegmentEffortsRequest.java       |  8 ++++----
 .../segment/request/StarSegmentRequest.java      |  4 ++--
 .../stravazpot/segment/rest/SegmentRest.java     | 14 +++++++-------
 .../stravazpot/stream/api/StreamAPI.java         |  2 +-
 .../request/GetActivityStreamsRequest.java       |  4 ++--
 .../stream/request/GetRouteStreamsRequest.java   |  4 ++--
 .../stream/request/GetSegmentStreamsRequest.java |  4 ++--
 .../stravazpot/stream/rest/StreamRest.java       |  6 +++---
 .../upload/request/CheckUploadStatusRequest.java |  4 ++--
 .../stravazpot/upload/rest/UploadRest.java       |  2 +-
 54 files changed, 134 insertions(+), 134 deletions(-)

diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/activity/api/ActivityAPI.java b/lib/src/main/java/com/sweetzpot/stravazpot/activity/api/ActivityAPI.java
index 3009285..b41a792 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/activity/api/ActivityAPI.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/activity/api/ActivityAPI.java
@@ -23,15 +23,15 @@ public CreateActivityRequest createActivity(String name) {
         return new CreateActivityRequest(name, getAPI(ActivityRest.class), this);
     }
 
-    public GetActivityRequest getActivity(int activityID) {
+    public GetActivityRequest getActivity(long activityID) {
         return new GetActivityRequest(activityID, getAPI(ActivityRest.class), this);
     }
 
-    public UpdateActivityRequest updateActivity(int activityID) {
+    public UpdateActivityRequest updateActivity(long activityID) {
         return new UpdateActivityRequest(activityID, getAPI(ActivityRest.class), this);
     }
 
-    public DeleteActivityRequest deleteActivity(int activityID) {
+    public DeleteActivityRequest deleteActivity(long activityID) {
         return new DeleteActivityRequest(activityID, getAPI(ActivityRest.class), this);
     }
 
@@ -43,15 +43,15 @@ public ListFriendActivitiesRequest listFriendActivities() {
         return new ListFriendActivitiesRequest(getAPI(ActivityRest.class), this);
     }
 
-    public ListRelatedActivitiesRequest listRelatedActivities(int activityID) {
+    public ListRelatedActivitiesRequest listRelatedActivities(long activityID) {
         return new ListRelatedActivitiesRequest(activityID, getAPI(ActivityRest.class), this);
     }
 
-    public ListActivityZonesRequest listActivityZones(int activityID) {
+    public ListActivityZonesRequest listActivityZones(long activityID) {
         return new ListActivityZonesRequest(activityID, getAPI(ActivityRest.class), this);
     }
 
-    public ListActivityLapsRequest listActivityLaps(int activityID) {
+    public ListActivityLapsRequest listActivityLaps(long activityID) {
         return new ListActivityLapsRequest(activityID, getAPI(ActivityRest.class), this);
     }
 }
diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/activity/api/CommentAPI.java b/lib/src/main/java/com/sweetzpot/stravazpot/activity/api/CommentAPI.java
index 2c062df..9739872 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/activity/api/CommentAPI.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/activity/api/CommentAPI.java
@@ -11,7 +11,7 @@ public CommentAPI(StravaConfig config) {
         super(config);
     }
 
-    public ListActivityCommentsRequest listActivityComments(int activityID) {
+    public ListActivityCommentsRequest listActivityComments(long activityID) {
         return new ListActivityCommentsRequest(activityID, getAPI(CommentsRest.class), this);
     }
 }
diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/activity/api/KudosAPI.java b/lib/src/main/java/com/sweetzpot/stravazpot/activity/api/KudosAPI.java
index 3bf9ecb..4469ab6 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/activity/api/KudosAPI.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/activity/api/KudosAPI.java
@@ -11,7 +11,7 @@ public KudosAPI(StravaConfig config) {
         super(config);
     }
 
-    public ListActivityKudoersRequest listActivityKudoers(int activityID) {
+    public ListActivityKudoersRequest listActivityKudoers(long activityID) {
         return new ListActivityKudoersRequest(activityID, getAPI(KudosRest.class), this);
     }
 }
diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/activity/api/PhotoAPI.java b/lib/src/main/java/com/sweetzpot/stravazpot/activity/api/PhotoAPI.java
index 92795ae..ced29ef 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/activity/api/PhotoAPI.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/activity/api/PhotoAPI.java
@@ -11,7 +11,7 @@ public PhotoAPI(StravaConfig config) {
         super(config);
     }
 
-    public ListActivityPhotosRequest listAcivityPhotos(int activityID) {
+    public ListActivityPhotosRequest listAcivityPhotos(long activityID) {
         return new ListActivityPhotosRequest(activityID, getAPI(PhotosRest.class), this);
     }
 }
diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/activity/request/DeleteActivityRequest.java b/lib/src/main/java/com/sweetzpot/stravazpot/activity/request/DeleteActivityRequest.java
index 4599c53..9fbcf37 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/activity/request/DeleteActivityRequest.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/activity/request/DeleteActivityRequest.java
@@ -7,11 +7,11 @@
 
 public class DeleteActivityRequest {
 
-    private final int activityID;
+    private final long activityID;
     private final ActivityRest restService;
     private final ActivityAPI api;
 
-    public DeleteActivityRequest(int activityID, ActivityRest restService, ActivityAPI api) {
+    public DeleteActivityRequest(long activityID, ActivityRest restService, ActivityAPI api) {
         this.activityID = activityID;
         this.restService = restService;
         this.api = api;
diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/activity/request/GetActivityRequest.java b/lib/src/main/java/com/sweetzpot/stravazpot/activity/request/GetActivityRequest.java
index ee1f5d1..44be9b0 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/activity/request/GetActivityRequest.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/activity/request/GetActivityRequest.java
@@ -8,12 +8,12 @@
 
 public class GetActivityRequest {
 
-    private final int activityID;
+    private final long activityID;
     private final ActivityRest restService;
     private final ActivityAPI api;
     private Boolean includeAllEfforts;
 
-    public GetActivityRequest(int activityID, ActivityRest restService, ActivityAPI api) {
+    public GetActivityRequest(long activityID, ActivityRest restService, ActivityAPI api) {
         this.activityID = activityID;
         this.restService = restService;
         this.api = api;
diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/activity/request/ListActivityCommentsRequest.java b/lib/src/main/java/com/sweetzpot/stravazpot/activity/request/ListActivityCommentsRequest.java
index 1df7b39..d044753 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/activity/request/ListActivityCommentsRequest.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/activity/request/ListActivityCommentsRequest.java
@@ -10,13 +10,13 @@
 
 public class ListActivityCommentsRequest {
 
-    private final int activityID;
+    private final long activityID;
     private final CommentsRest restService;
     private final CommentAPI api;
     private Integer page;
     private Integer perPage;
 
-    public ListActivityCommentsRequest(int activityID, CommentsRest restService, CommentAPI api) {
+    public ListActivityCommentsRequest(long activityID, CommentsRest restService, CommentAPI api) {
         this.activityID = activityID;
         this.restService = restService;
         this.api = api;
diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/activity/request/ListActivityKudoersRequest.java b/lib/src/main/java/com/sweetzpot/stravazpot/activity/request/ListActivityKudoersRequest.java
index 65cdbfe..9245c22 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/activity/request/ListActivityKudoersRequest.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/activity/request/ListActivityKudoersRequest.java
@@ -10,13 +10,13 @@
 
 public class ListActivityKudoersRequest {
 
-    private final int activityID;
+    private final long activityID;
     private final KudosRest restService;
     private final KudosAPI api;
     private Integer page;
     private Integer perPage;
 
-    public ListActivityKudoersRequest(int activityID, KudosRest restService, KudosAPI api) {
+    public ListActivityKudoersRequest(long activityID, KudosRest restService, KudosAPI api) {
         this.activityID = activityID;
         this.restService = restService;
         this.api = api;
diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/activity/request/ListActivityLapsRequest.java b/lib/src/main/java/com/sweetzpot/stravazpot/activity/request/ListActivityLapsRequest.java
index 4480bfd..ef27e15 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/activity/request/ListActivityLapsRequest.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/activity/request/ListActivityLapsRequest.java
@@ -10,11 +10,11 @@
 
 public class ListActivityLapsRequest {
 
-    private final int activityID;
+    private final long activityID;
     private final ActivityRest restService;
     private final ActivityAPI api;
 
-    public ListActivityLapsRequest(int activityID, ActivityRest restService, ActivityAPI api) {
+    public ListActivityLapsRequest(long activityID, ActivityRest restService, ActivityAPI api) {
         this.activityID = activityID;
         this.restService = restService;
         this.api = api;
diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/activity/request/ListActivityPhotosRequest.java b/lib/src/main/java/com/sweetzpot/stravazpot/activity/request/ListActivityPhotosRequest.java
index a1cee7c..81bfc02 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/activity/request/ListActivityPhotosRequest.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/activity/request/ListActivityPhotosRequest.java
@@ -10,11 +10,11 @@
 
 public class ListActivityPhotosRequest {
 
-    private final int activityID;
+    private final long activityID;
     private final PhotosRest restService;
     private final PhotoAPI api;
 
-    public ListActivityPhotosRequest(int activityID, PhotosRest restService, PhotoAPI api) {
+    public ListActivityPhotosRequest(long activityID, PhotosRest restService, PhotoAPI api) {
         this.activityID = activityID;
         this.restService = restService;
         this.api = api;
diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/activity/request/ListActivityZonesRequest.java b/lib/src/main/java/com/sweetzpot/stravazpot/activity/request/ListActivityZonesRequest.java
index ef3147e..646a5c0 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/activity/request/ListActivityZonesRequest.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/activity/request/ListActivityZonesRequest.java
@@ -10,11 +10,11 @@
 
 public class ListActivityZonesRequest {
 
-    private final int activityID;
+    private final long activityID;
     private final ActivityRest restService;
     private final ActivityAPI api;
 
-    public ListActivityZonesRequest(int activityID, ActivityRest restService, ActivityAPI api) {
+    public ListActivityZonesRequest(long activityID, ActivityRest restService, ActivityAPI api) {
         this.activityID = activityID;
         this.restService = restService;
         this.api = api;
diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/activity/request/ListRelatedActivitiesRequest.java b/lib/src/main/java/com/sweetzpot/stravazpot/activity/request/ListRelatedActivitiesRequest.java
index 5efb3a4..3e651a0 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/activity/request/ListRelatedActivitiesRequest.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/activity/request/ListRelatedActivitiesRequest.java
@@ -10,13 +10,13 @@
 
 public class ListRelatedActivitiesRequest {
 
-    private final int activityID;
+    private final long activityID;
     private final ActivityRest restService;
     private final ActivityAPI api;
     private Integer page;
     private Integer perPage;
 
-    public ListRelatedActivitiesRequest(int activityID, ActivityRest restService, ActivityAPI api) {
+    public ListRelatedActivitiesRequest(long activityID, ActivityRest restService, ActivityAPI api) {
         this.activityID = activityID;
         this.restService = restService;
         this.api = api;
diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/activity/request/UpdateActivityRequest.java b/lib/src/main/java/com/sweetzpot/stravazpot/activity/request/UpdateActivityRequest.java
index 86538b2..6c6f193 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/activity/request/UpdateActivityRequest.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/activity/request/UpdateActivityRequest.java
@@ -9,7 +9,7 @@
 
 public class UpdateActivityRequest {
 
-    private final int activityID;
+    private final long activityID;
     private final ActivityRest restService;
     private final ActivityAPI api;
     private String name;
@@ -20,7 +20,7 @@ public class UpdateActivityRequest {
     private String gearID;
     private String description;
 
-    public UpdateActivityRequest(int activityID, ActivityRest restService, ActivityAPI api) {
+    public UpdateActivityRequest(long activityID, ActivityRest restService, ActivityAPI api) {
         this.activityID = activityID;
         this.restService = restService;
         this.api = api;
diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/activity/rest/ActivityRest.java b/lib/src/main/java/com/sweetzpot/stravazpot/activity/rest/ActivityRest.java
index 458decc..2548575 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/activity/rest/ActivityRest.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/activity/rest/ActivityRest.java
@@ -34,12 +34,12 @@ Call<Activity> createActivity(
 
     @GET("activities/{id}")
     Call<Activity> getActivity(
-            @Path("id") Integer id,
+            @Path("id") Long id,
             @Query("include_all_efforts") Boolean includeAllEfforts);
 
     @PUT("activities/{id}") @FormUrlEncoded
     Call<Activity> updateActivity(
-            @Path("id") Integer id,
+            @Path("id") Long id,
             @Field("name") String name,
             @Field("type") ActivityType type,
             @Field("private") Boolean isPrivate,
@@ -49,7 +49,7 @@ Call<Activity> updateActivity(
             @Field("description") String description);
 
     @DELETE("activities/{id}")
-    Call<Void> deleteActivity(@Path("id") Integer id);
+    Call<Void> deleteActivity(@Path("id") Long id);
 
     @GET("athlete/activities")
     Call<List<Activity>> getMyActivities(
@@ -66,13 +66,13 @@ Call<List<Activity>> getFriendsActivities(
 
     @GET("activities/{id}/related")
     Call<List<Activity>> getRelatedActivities(
-            @Path("id") Integer id,
+            @Path("id") Long id,
             @Query("page") Integer page,
             @Query("per_page") Integer perPage);
 
     @GET("activities/{id}/zones")
-    Call<List<ActivityZone>> getActivityZones(@Path("id") Integer id);
+    Call<List<ActivityZone>> getActivityZones(@Path("id") Long id);
 
     @GET("activities/{id}/laps")
-    Call<List<ActivityLap>> getActivityLaps(@Path("id") Integer id);
+    Call<List<ActivityLap>> getActivityLaps(@Path("id") Long id);
 }
diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/activity/rest/CommentsRest.java b/lib/src/main/java/com/sweetzpot/stravazpot/activity/rest/CommentsRest.java
index edee8c9..1967a93 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/activity/rest/CommentsRest.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/activity/rest/CommentsRest.java
@@ -12,7 +12,7 @@
 public interface CommentsRest {
     @GET("activities/{id}/comments")
     Call<List<Comment>> getActivityComments(
-            @Path("id") Integer id,
+            @Path("id") Long id,
             @Query("page") Integer page,
             @Query("per_page") Integer perPage);
 }
diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/activity/rest/KudosRest.java b/lib/src/main/java/com/sweetzpot/stravazpot/activity/rest/KudosRest.java
index cc18dda..8377d58 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/activity/rest/KudosRest.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/activity/rest/KudosRest.java
@@ -12,7 +12,7 @@
 public interface KudosRest {
     @GET("activities/{id}/kudos")
     Call<List<Athlete>> getActivityKudos(
-            @Path("id") Integer id,
+            @Path("id") Long id,
             @Query("page") Integer page,
             @Query("per_page") Integer perPage);
 }
diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/activity/rest/PhotosRest.java b/lib/src/main/java/com/sweetzpot/stravazpot/activity/rest/PhotosRest.java
index b84521a..c1564fc 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/activity/rest/PhotosRest.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/activity/rest/PhotosRest.java
@@ -12,6 +12,6 @@
 public interface PhotosRest {
     @GET("activities/{id}/photos")
     Call<List<Photo>> getActivityPhotos(
-            @Path("id") Integer id,
+            @Path("id") Long id,
             @Query("photo_sources") Boolean photoSources);
 }
diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/athlete/api/AthleteAPI.java b/lib/src/main/java/com/sweetzpot/stravazpot/athlete/api/AthleteAPI.java
index fbcedd4..3b7ee2e 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/athlete/api/AthleteAPI.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/athlete/api/AthleteAPI.java
@@ -20,7 +20,7 @@ public CurrentAthleteRequest retrieveCurrentAthlete() {
         return new CurrentAthleteRequest(getAPI(AthleteRest.class), this);
     }
 
-    public AthleteRequest retrieveAthlete(int athleteID) {
+    public AthleteRequest retrieveAthlete(long athleteID) {
         return new AthleteRequest(athleteID, getAPI(AthleteRest.class), this);
     }
 
@@ -32,11 +32,11 @@ public GetZonesRequest getAthleteZones() {
         return new GetZonesRequest(getAPI(AthleteRest.class), this);
     }
 
-    public GetTotalsAndStatsRequest getAthleteTotalsAndStats(int athleteID) {
+    public GetTotalsAndStatsRequest getAthleteTotalsAndStats(long athleteID) {
         return new GetTotalsAndStatsRequest(athleteID, getAPI(AthleteRest.class), this);
     }
 
-    public ListAthleteKOMSRequest listAthleteKOMS(int athleteID) {
+    public ListAthleteKOMSRequest listAthleteKOMS(long athleteID) {
         return new ListAthleteKOMSRequest(athleteID, getAPI(AthleteRest.class), this);
     }
 }
diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/athlete/api/FriendAPI.java b/lib/src/main/java/com/sweetzpot/stravazpot/athlete/api/FriendAPI.java
index a4d5bd6..5d7c849 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/athlete/api/FriendAPI.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/athlete/api/FriendAPI.java
@@ -19,7 +19,7 @@ public GetMyFriendsRequest getMyFriends() {
         return new GetMyFriendsRequest(getAPI(FriendRest.class), this);
     }
 
-    public GetAthleteFriendsRequest getAthleteFriends(int athleteID) {
+    public GetAthleteFriendsRequest getAthleteFriends(long athleteID) {
         return new GetAthleteFriendsRequest(athleteID, getAPI(FriendRest.class), this);
     }
 
@@ -27,11 +27,11 @@ public GetMyFollowersRequest getMyFollowers() {
         return new GetMyFollowersRequest(getAPI(FriendRest.class), this);
     }
 
-    public GetAthleteFollowersRequest getAthleteFollowers(int athleteID) {
+    public GetAthleteFollowersRequest getAthleteFollowers(long athleteID) {
         return new GetAthleteFollowersRequest(athleteID, getAPI(FriendRest.class), this);
     }
 
-    public GetBothFollowingRequest getBothFollowing(int athleteID) {
+    public GetBothFollowingRequest getBothFollowing(long athleteID) {
         return new GetBothFollowingRequest(athleteID, getAPI(FriendRest.class), this);
     }
 }
diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/athlete/request/AthleteRequest.java b/lib/src/main/java/com/sweetzpot/stravazpot/athlete/request/AthleteRequest.java
index a77b6cb..028839d 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/athlete/request/AthleteRequest.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/athlete/request/AthleteRequest.java
@@ -7,11 +7,11 @@
 import retrofit2.Call;
 
 public class AthleteRequest {
-    private final int athleteID;
+    private final long athleteID;
     private final AthleteRest restService;
     private final AthleteAPI api;
 
-    public AthleteRequest(int athleteID, AthleteRest restService, AthleteAPI api) {
+    public AthleteRequest(long athleteID, AthleteRest restService, AthleteAPI api) {
         this.athleteID = athleteID;
         this.restService = restService;
         this.api = api;
diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/athlete/request/GetAthleteFollowersRequest.java b/lib/src/main/java/com/sweetzpot/stravazpot/athlete/request/GetAthleteFollowersRequest.java
index 858b383..e169772 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/athlete/request/GetAthleteFollowersRequest.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/athlete/request/GetAthleteFollowersRequest.java
@@ -10,13 +10,13 @@
 
 public class GetAthleteFollowersRequest {
 
-    private final int athleteID;
+    private final long athleteID;
     private final FriendRest restService;
     private final FriendAPI api;
     private Integer page;
     private Integer perPage;
 
-    public GetAthleteFollowersRequest(int athleteID, FriendRest restService, FriendAPI api) {
+    public GetAthleteFollowersRequest(long athleteID, FriendRest restService, FriendAPI api) {
         this.athleteID = athleteID;
         this.restService = restService;
         this.api = api;
diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/athlete/request/GetAthleteFriendsRequest.java b/lib/src/main/java/com/sweetzpot/stravazpot/athlete/request/GetAthleteFriendsRequest.java
index b34ccdf..881a952 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/athlete/request/GetAthleteFriendsRequest.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/athlete/request/GetAthleteFriendsRequest.java
@@ -10,13 +10,13 @@
 
 public class GetAthleteFriendsRequest {
 
-    private final int athleteID;
+    private final long athleteID;
     private final FriendRest restService;
     private final FriendAPI api;
     private Integer page;
     private Integer perPage;
 
-    public GetAthleteFriendsRequest(int athleteID, FriendRest restService, FriendAPI api) {
+    public GetAthleteFriendsRequest(long athleteID, FriendRest restService, FriendAPI api) {
         this.athleteID = athleteID;
         this.restService = restService;
         this.api = api;
diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/athlete/request/GetBothFollowingRequest.java b/lib/src/main/java/com/sweetzpot/stravazpot/athlete/request/GetBothFollowingRequest.java
index 968d576..e2ca3e5 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/athlete/request/GetBothFollowingRequest.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/athlete/request/GetBothFollowingRequest.java
@@ -10,13 +10,13 @@
 
 public class GetBothFollowingRequest {
 
-    private final int athleteID;
+    private final long athleteID;
     private final FriendRest restService;
     private final FriendAPI api;
     private Integer page;
     private Integer perPage;
 
-    public GetBothFollowingRequest(int athleteID, FriendRest restService, FriendAPI api) {
+    public GetBothFollowingRequest(long athleteID, FriendRest restService, FriendAPI api) {
         this.athleteID = athleteID;
         this.restService = restService;
         this.api = api;
diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/athlete/request/GetTotalsAndStatsRequest.java b/lib/src/main/java/com/sweetzpot/stravazpot/athlete/request/GetTotalsAndStatsRequest.java
index 1f99e11..7b1f530 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/athlete/request/GetTotalsAndStatsRequest.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/athlete/request/GetTotalsAndStatsRequest.java
@@ -8,11 +8,11 @@
 
 public class GetTotalsAndStatsRequest {
 
-    private final int athleteID;
+    private final long athleteID;
     private final AthleteRest restService;
     private final AthleteAPI api;
 
-    public GetTotalsAndStatsRequest(int athleteID, AthleteRest restService, AthleteAPI api) {
+    public GetTotalsAndStatsRequest(long athleteID, AthleteRest restService, AthleteAPI api) {
         this.athleteID = athleteID;
         this.restService = restService;
         this.api = api;
diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/athlete/request/ListAthleteKOMSRequest.java b/lib/src/main/java/com/sweetzpot/stravazpot/athlete/request/ListAthleteKOMSRequest.java
index 6ff3f4a..5c63b01 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/athlete/request/ListAthleteKOMSRequest.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/athlete/request/ListAthleteKOMSRequest.java
@@ -10,13 +10,13 @@
 
 public class ListAthleteKOMSRequest {
 
-    private final int athleteID;
+    private final long athleteID;
     private final AthleteRest restService;
     private final AthleteAPI api;
     private Integer page;
     private Integer perPage;
 
-    public ListAthleteKOMSRequest(int athleteID, AthleteRest restService, AthleteAPI api) {
+    public ListAthleteKOMSRequest(long athleteID, AthleteRest restService, AthleteAPI api) {
         this.athleteID = athleteID;
         this.restService = restService;
         this.api = api;
diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/athlete/rest/AthleteRest.java b/lib/src/main/java/com/sweetzpot/stravazpot/athlete/rest/AthleteRest.java
index 67e8273..bf1c299 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/athlete/rest/AthleteRest.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/athlete/rest/AthleteRest.java
@@ -21,7 +21,7 @@ public interface AthleteRest {
     Call<Athlete> getCurrentAthlete();
 
     @GET("athletes/{id}")
-    Call<Athlete> getAthlete(@Path("id") Integer id);
+    Call<Athlete> getAthlete(@Path("id") Long id);
 
     @PUT("athlete") @FormUrlEncoded
     Call<Athlete> updateAthlete(
@@ -35,11 +35,11 @@ Call<Athlete> updateAthlete(
     Call<Zones> getAthleteZones();
 
     @GET("athletes/{id}/stats")
-    Call<Stats> getAthleteStats(@Path("id") Integer id);
+    Call<Stats> getAthleteStats(@Path("id") Long id);
 
     @GET("athletes/{id}/koms")
     Call<List<SegmentEffort>> listAthleteKOMS(
-            @Path("id") Integer id,
+            @Path("id") Long id,
             @Query("page") Integer page,
             @Query("per_page") Integer perPage);
 }
diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/athlete/rest/FriendRest.java b/lib/src/main/java/com/sweetzpot/stravazpot/athlete/rest/FriendRest.java
index bc50d1b..1dd8905 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/athlete/rest/FriendRest.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/athlete/rest/FriendRest.java
@@ -17,7 +17,7 @@ Call<List<Athlete>> getMyFriends(
 
     @GET("athletes/{id}/friends")
     Call<List<Athlete>> getFriends(
-            @Path("id") Integer id,
+            @Path("id") Long id,
             @Query("page") Integer page,
             @Query("per_page") Integer perPage);
 
@@ -28,13 +28,13 @@ Call<List<Athlete>> getMyFollowers(
 
     @GET("athletes/{id}/followers")
     Call<List<Athlete>> getFollowers(
-            @Path("id") Integer id,
+            @Path("id") Long id,
             @Query("page") Integer page,
             @Query("per_page") Integer perPage);
 
     @GET("athletes/{id}/both-following")
     Call<List<Athlete>> getBothFollowing(
-            @Path("id") Integer id,
+            @Path("id") Long id,
             @Query("page") Integer page,
             @Query("per_page") Integer perPage);
 }
diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/club/api/ClubAPI.java b/lib/src/main/java/com/sweetzpot/stravazpot/club/api/ClubAPI.java
index 4634b96..d67d96a 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/club/api/ClubAPI.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/club/api/ClubAPI.java
@@ -19,15 +19,15 @@ public ClubAPI(StravaConfig config) {
         super(config);
     }
 
-    public GetClubRequest getClub(int clubID) {
+    public GetClubRequest getClub(long clubID) {
         return new GetClubRequest(clubID, getAPI(ClubRest.class), this);
     }
 
-    public ListClubAnnouncementsRequest listClubAnnouncements(int clubID) {
+    public ListClubAnnouncementsRequest listClubAnnouncements(long clubID) {
         return new ListClubAnnouncementsRequest(clubID, getAPI(ClubRest.class), this);
     }
 
-    public ListClubGroupEventsRequest listClubGroupEvents(int clubID) {
+    public ListClubGroupEventsRequest listClubGroupEvents(Long clubID) {
         return new ListClubGroupEventsRequest(clubID, getAPI(ClubRest.class), this);
     }
 
@@ -35,23 +35,23 @@ public ListMyClubsRequest listMyClubs() {
         return new ListMyClubsRequest(getAPI(ClubRest.class), this);
     }
 
-    public ListClubMembersRequest listClubMembers(int clubID) {
+    public ListClubMembersRequest listClubMembers(Long clubID) {
         return new ListClubMembersRequest(clubID, getAPI(ClubRest.class), this);
     }
 
-    public ListClubAdminsRequest listClubAdmins(int clubID) {
+    public ListClubAdminsRequest listClubAdmins(Long clubID) {
         return new ListClubAdminsRequest(clubID, getAPI(ClubRest.class), this);
     }
 
-    public ListClubActivitiesRequest listClubActivities(int clubID) {
+    public ListClubActivitiesRequest listClubActivities(Long clubID) {
         return new ListClubActivitiesRequest(clubID, getAPI(ClubRest.class), this);
     }
 
-    public JoinClubRequest joinClub(int clubID) {
+    public JoinClubRequest joinClub(Long clubID) {
         return new JoinClubRequest(clubID, getAPI(ClubRest.class), this);
     }
 
-    public LeaveClubRequest leaveClub(int clubID) {
+    public LeaveClubRequest leaveClub(Long clubID) {
         return new LeaveClubRequest(clubID, getAPI(ClubRest.class), this);
     }
 }
diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/club/request/GetClubRequest.java b/lib/src/main/java/com/sweetzpot/stravazpot/club/request/GetClubRequest.java
index dcfd4a3..a3e2059 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/club/request/GetClubRequest.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/club/request/GetClubRequest.java
@@ -8,11 +8,11 @@
 
 public class GetClubRequest {
 
-    private final int clubID;
+    private final long clubID;
     private final ClubRest restService;
     private final ClubAPI api;
 
-    public GetClubRequest(int clubID, ClubRest restService, ClubAPI api) {
+    public GetClubRequest(long clubID, ClubRest restService, ClubAPI api) {
         this.clubID = clubID;
         this.restService = restService;
         this.api = api;
diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/club/request/JoinClubRequest.java b/lib/src/main/java/com/sweetzpot/stravazpot/club/request/JoinClubRequest.java
index 9571b02..746ece1 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/club/request/JoinClubRequest.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/club/request/JoinClubRequest.java
@@ -8,11 +8,11 @@
 
 public class JoinClubRequest {
 
-    private final int clubID;
+    private final long clubID;
     private final ClubRest restService;
     private final ClubAPI api;
 
-    public JoinClubRequest(int clubID, ClubRest restService, ClubAPI api) {
+    public JoinClubRequest(long clubID, ClubRest restService, ClubAPI api) {
         this.clubID = clubID;
         this.restService = restService;
         this.api = api;
diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/club/request/LeaveClubRequest.java b/lib/src/main/java/com/sweetzpot/stravazpot/club/request/LeaveClubRequest.java
index 577f389..3e53a4b 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/club/request/LeaveClubRequest.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/club/request/LeaveClubRequest.java
@@ -8,11 +8,11 @@
 
 public class LeaveClubRequest {
 
-    private final int clubID;
+    private final long clubID;
     private final ClubRest restService;
     private final ClubAPI api;
 
-    public LeaveClubRequest(int clubID, ClubRest restService, ClubAPI api) {
+    public LeaveClubRequest(long clubID, ClubRest restService, ClubAPI api) {
         this.clubID = clubID;
         this.restService = restService;
         this.api = api;
diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/club/request/ListClubActivitiesRequest.java b/lib/src/main/java/com/sweetzpot/stravazpot/club/request/ListClubActivitiesRequest.java
index 7b59bff..a42a3b0 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/club/request/ListClubActivitiesRequest.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/club/request/ListClubActivitiesRequest.java
@@ -10,14 +10,14 @@
 
 public class ListClubActivitiesRequest {
 
-    private final int clubID;
+    private final long clubID;
     private final ClubRest restService;
     private final ClubAPI api;
     private Integer before;
     private Integer page;
     private Integer perPage;
 
-    public ListClubActivitiesRequest(int clubID, ClubRest restService, ClubAPI api) {
+    public ListClubActivitiesRequest(long clubID, ClubRest restService, ClubAPI api) {
         this.clubID = clubID;
         this.restService = restService;
         this.api = api;
diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/club/request/ListClubAdminsRequest.java b/lib/src/main/java/com/sweetzpot/stravazpot/club/request/ListClubAdminsRequest.java
index 8055805..3c81a0e 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/club/request/ListClubAdminsRequest.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/club/request/ListClubAdminsRequest.java
@@ -10,13 +10,13 @@
 
 public class ListClubAdminsRequest {
 
-    private final int clubID;
+    private final long clubID;
     private final ClubRest restService;
     private final ClubAPI api;
     private Integer page;
     private Integer perPage;
 
-    public ListClubAdminsRequest(int clubID, ClubRest restService, ClubAPI api) {
+    public ListClubAdminsRequest(long clubID, ClubRest restService, ClubAPI api) {
         this.clubID = clubID;
         this.restService = restService;
         this.api = api;
diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/club/request/ListClubAnnouncementsRequest.java b/lib/src/main/java/com/sweetzpot/stravazpot/club/request/ListClubAnnouncementsRequest.java
index 4b5f6df..ec5bd12 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/club/request/ListClubAnnouncementsRequest.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/club/request/ListClubAnnouncementsRequest.java
@@ -10,11 +10,11 @@
 
 public class ListClubAnnouncementsRequest {
 
-    private final int clubID;
+    private final long clubID;
     private final ClubRest restService;
     private final ClubAPI api;
 
-    public ListClubAnnouncementsRequest(int clubID, ClubRest restService, ClubAPI api) {
+    public ListClubAnnouncementsRequest(long clubID, ClubRest restService, ClubAPI api) {
         this.clubID = clubID;
         this.restService = restService;
         this.api = api;
diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/club/request/ListClubGroupEventsRequest.java b/lib/src/main/java/com/sweetzpot/stravazpot/club/request/ListClubGroupEventsRequest.java
index b74d2ba..719d7dd 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/club/request/ListClubGroupEventsRequest.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/club/request/ListClubGroupEventsRequest.java
@@ -10,11 +10,11 @@
 
 public class ListClubGroupEventsRequest {
 
-    private final int clubID;
+    private final long clubID;
     private final ClubRest restService;
     private final ClubAPI api;
 
-    public ListClubGroupEventsRequest(int clubID, ClubRest restService, ClubAPI api) {
+    public ListClubGroupEventsRequest(long clubID, ClubRest restService, ClubAPI api) {
         this.clubID = clubID;
         this.restService = restService;
         this.api = api;
diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/club/request/ListClubMembersRequest.java b/lib/src/main/java/com/sweetzpot/stravazpot/club/request/ListClubMembersRequest.java
index cff2777..2225879 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/club/request/ListClubMembersRequest.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/club/request/ListClubMembersRequest.java
@@ -10,13 +10,13 @@
 
 public class ListClubMembersRequest {
 
-    private final int clubID;
+    private final long clubID;
     private final ClubRest restService;
     private final ClubAPI api;
     private Integer page;
     private Integer perPage;
 
-    public ListClubMembersRequest(int clubID, ClubRest restService, ClubAPI api) {
+    public ListClubMembersRequest(long clubID, ClubRest restService, ClubAPI api) {
         this.clubID = clubID;
         this.restService = restService;
         this.api = api;
diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/club/rest/ClubRest.java b/lib/src/main/java/com/sweetzpot/stravazpot/club/rest/ClubRest.java
index 1d735d7..d6544c8 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/club/rest/ClubRest.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/club/rest/ClubRest.java
@@ -18,39 +18,39 @@
 
 public interface ClubRest {
     @GET("clubs/{id}")
-    Call<Club> getClub(@Path("id") Integer id);
+    Call<Club> getClub(@Path("id") Long id);
 
     @GET("clubs/{id}/announcements")
-    Call<List<Announcement>> getClubAnnouncements(@Path("id") Integer id);
+    Call<List<Announcement>> getClubAnnouncements(@Path("id") Long id);
 
     @GET("clubs/{id}/group_events")
-    Call<List<Event>> getClubGroupEvents(@Path("id") Integer id);
+    Call<List<Event>> getClubGroupEvents(@Path("id") Long id);
 
     @GET("athlete/clubs")
     Call<List<Club>> getMyClubs();
 
     @GET("clubs/{id}/members")
     Call<List<Athlete>> getClubMembers(
-            @Path("id") Integer id,
+            @Path("id") Long id,
             @Query("page") Integer page,
             @Query("per_page") Integer perPage);
 
     @GET("clubs/{id}/admins")
     Call<List<Athlete>> getClubAdmins(
-            @Path("id") Integer id,
+            @Path("id") Long id,
             @Query("page") Integer page,
             @Query("per_page") Integer perPage);
 
     @GET("clubs/{id}/activities")
     Call<List<Activity>> getClubActivities(
-            @Path("id") Integer id,
+            @Path("id") Long id,
             @Query("before") Integer before,
             @Query("page") Integer page,
             @Query("per_page") Integer perPage);
 
     @POST("clubs/{id}/join")
-    Call<JoinResult> joinClub(@Path("id") Integer id);
+    Call<JoinResult> joinClub(@Path("id") Long id);
 
     @POST("clubs/{id}/leave")
-    Call<LeaveResult> leaveClub(@Path("id") Integer id);
+    Call<LeaveResult> leaveClub(@Path("id") Long id);
 }
diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/route/api/RouteAPI.java b/lib/src/main/java/com/sweetzpot/stravazpot/route/api/RouteAPI.java
index 9339616..81647e3 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/route/api/RouteAPI.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/route/api/RouteAPI.java
@@ -12,11 +12,11 @@ public RouteAPI(StravaConfig config) {
         super(config);
     }
 
-    public GetRouteRequest getRoute(int routeID) {
+    public GetRouteRequest getRoute(long routeID) {
         return new GetRouteRequest(routeID, getAPI(RouteRest.class), this);
     }
 
-    public ListRoutesRequest listRoutes(int athleteID) {
+    public ListRoutesRequest listRoutes(long athleteID) {
         return new ListRoutesRequest(athleteID, getAPI(RouteRest.class), this);
     }
 }
diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/route/request/GetRouteRequest.java b/lib/src/main/java/com/sweetzpot/stravazpot/route/request/GetRouteRequest.java
index 84ae47b..3e50038 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/route/request/GetRouteRequest.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/route/request/GetRouteRequest.java
@@ -8,11 +8,11 @@
 
 public class GetRouteRequest {
 
-    private final int routeID;
+    private final long routeID;
     private final RouteRest restService;
     private final RouteAPI api;
 
-    public GetRouteRequest(int routeID, RouteRest restService, RouteAPI api) {
+    public GetRouteRequest(long routeID, RouteRest restService, RouteAPI api) {
         this.routeID = routeID;
         this.restService = restService;
         this.api = api;
diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/route/request/ListRoutesRequest.java b/lib/src/main/java/com/sweetzpot/stravazpot/route/request/ListRoutesRequest.java
index dd25d46..d5b61ec 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/route/request/ListRoutesRequest.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/route/request/ListRoutesRequest.java
@@ -10,11 +10,11 @@
 
 public class ListRoutesRequest {
 
-    private final int athleteID;
+    private final long athleteID;
     private final RouteRest restService;
     private final RouteAPI api;
 
-    public ListRoutesRequest(int athleteID, RouteRest restService, RouteAPI api) {
+    public ListRoutesRequest(long athleteID, RouteRest restService, RouteAPI api) {
         this.athleteID = athleteID;
         this.restService = restService;
         this.api = api;
diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/route/rest/RouteRest.java b/lib/src/main/java/com/sweetzpot/stravazpot/route/rest/RouteRest.java
index 0b75086..cd0740d 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/route/rest/RouteRest.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/route/rest/RouteRest.java
@@ -10,8 +10,8 @@
 
 public interface RouteRest {
     @GET("routes/{id}")
-    Call<Route> getRoute(@Path("id") Integer id);
+    Call<Route> getRoute(@Path("id") Long id);
 
     @GET("athletes/{id}/routes")
-    Call<List<Route>> getAthleteRoutes(@Path("id") Integer id);
+    Call<List<Route>> getAthleteRoutes(@Path("id") Long id);
 }
diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/segment/request/GetSegmentLeaderboardRequest.java b/lib/src/main/java/com/sweetzpot/stravazpot/segment/request/GetSegmentLeaderboardRequest.java
index 11bc751..655438f 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/segment/request/GetSegmentLeaderboardRequest.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/segment/request/GetSegmentLeaderboardRequest.java
@@ -12,20 +12,20 @@
 
 public class GetSegmentLeaderboardRequest {
 
-    private final int segmentID;
+    private final long segmentID;
     private final SegmentRest restService;
     private final SegmentAPI api;
     private Gender gender;
     private AgeGroup ageGroup;
     private WeightClass weightClass;
     private Boolean following;
-    private Integer clubID;
+    private Long clubID;
     private DateRange dateRange;
     private Integer contextEntries;
     private Integer page;
     private Integer perPage;
 
-    public GetSegmentLeaderboardRequest(int segmentID, SegmentRest restService, SegmentAPI api) {
+    public GetSegmentLeaderboardRequest(long segmentID, SegmentRest restService, SegmentAPI api) {
         this.segmentID = segmentID;
         this.restService = restService;
         this.api = api;
@@ -51,7 +51,7 @@ public GetSegmentLeaderboardRequest following(boolean following) {
         return this;
     }
 
-    public GetSegmentLeaderboardRequest inClub(int clubID) {
+    public GetSegmentLeaderboardRequest inClub(long clubID) {
         this.clubID = clubID;
         return this;
     }
diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/segment/request/GetSegmentRequest.java b/lib/src/main/java/com/sweetzpot/stravazpot/segment/request/GetSegmentRequest.java
index 2956584..0c4740c 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/segment/request/GetSegmentRequest.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/segment/request/GetSegmentRequest.java
@@ -8,11 +8,11 @@
 
 public class GetSegmentRequest {
 
-    private final int segmentID;
+    private final long segmentID;
     private final SegmentRest restService;
     private final SegmentAPI api;
 
-    public GetSegmentRequest(int segmentID, SegmentRest restService, SegmentAPI api) {
+    public GetSegmentRequest(long segmentID, SegmentRest restService, SegmentAPI api) {
         this.segmentID = segmentID;
         this.restService = restService;
         this.api = api;
diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/segment/request/ListAthleteStarredSegmentsRequest.java b/lib/src/main/java/com/sweetzpot/stravazpot/segment/request/ListAthleteStarredSegmentsRequest.java
index 85f070f..a59bf97 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/segment/request/ListAthleteStarredSegmentsRequest.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/segment/request/ListAthleteStarredSegmentsRequest.java
@@ -10,13 +10,13 @@
 
 public class ListAthleteStarredSegmentsRequest {
 
-    private final int athleteID;
+    private final long athleteID;
     private final SegmentRest restService;
     private final SegmentAPI api;
     private Integer page;
     private Integer perPage;
 
-    public ListAthleteStarredSegmentsRequest(int athleteID, SegmentRest restService, SegmentAPI api) {
+    public ListAthleteStarredSegmentsRequest(long athleteID, SegmentRest restService, SegmentAPI api) {
         this.athleteID = athleteID;
         this.restService = restService;
         this.api = api;
diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/segment/request/ListSegmentEffortsRequest.java b/lib/src/main/java/com/sweetzpot/stravazpot/segment/request/ListSegmentEffortsRequest.java
index 5c23208..fc2ecdc 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/segment/request/ListSegmentEffortsRequest.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/segment/request/ListSegmentEffortsRequest.java
@@ -14,22 +14,22 @@
 public class ListSegmentEffortsRequest {
 
     private final DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
-    private final int segmentID;
+    private final long segmentID;
     private final SegmentRest restService;
     private final SegmentAPI api;
-    private Integer athleteID;
+    private Long athleteID;
     private Date startDateLocal;
     private Date endDateLocal;
     private Integer page;
     private Integer perPage;
 
-    public ListSegmentEffortsRequest(int segmentID, SegmentRest restService, SegmentAPI api) {
+    public ListSegmentEffortsRequest(long segmentID, SegmentRest restService, SegmentAPI api) {
         this.segmentID = segmentID;
         this.restService = restService;
         this.api = api;
     }
 
-    public ListSegmentEffortsRequest forAthlete(int athleteID) {
+    public ListSegmentEffortsRequest forAthlete(long athleteID) {
         this.athleteID = athleteID;
         return this;
     }
diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/segment/request/StarSegmentRequest.java b/lib/src/main/java/com/sweetzpot/stravazpot/segment/request/StarSegmentRequest.java
index a683c36..8cfdfc9 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/segment/request/StarSegmentRequest.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/segment/request/StarSegmentRequest.java
@@ -8,12 +8,12 @@
 
 public class StarSegmentRequest {
 
-    private final int segmentID;
+    private final long segmentID;
     private final boolean star;
     private final SegmentRest restService;
     private final SegmentAPI api;
 
-    public StarSegmentRequest(int segmentID, boolean star, SegmentRest restService, SegmentAPI api) {
+    public StarSegmentRequest(long segmentID, boolean star, SegmentRest restService, SegmentAPI api) {
         this.segmentID = segmentID;
         this.star = star;
         this.restService = restService;
diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/segment/rest/SegmentRest.java b/lib/src/main/java/com/sweetzpot/stravazpot/segment/rest/SegmentRest.java
index 4f251bd..c21292c 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/segment/rest/SegmentRest.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/segment/rest/SegmentRest.java
@@ -22,7 +22,7 @@
 
 public interface SegmentRest {
     @GET("segments/{id}")
-    Call<Segment> getSegment(@Path("id") Integer id);
+    Call<Segment> getSegment(@Path("id") Long id);
 
     @GET("segments/starred")
     Call<List<Segment>> getMyStarredSegments(
@@ -31,19 +31,19 @@ Call<List<Segment>> getMyStarredSegments(
 
     @GET("athletes/{id}/segments/starred")
     Call<List<Segment>> getAthleteStarredSegments(
-            @Path("id") Integer id,
+            @Path("id") Long id,
             @Query("page") Integer page,
             @Query("per_page") Integer perPage);
 
     @PUT("segments/{id}/starred") @FormUrlEncoded
     Call<Segment> starSegment(
-            @Path("id") Integer id,
+            @Path("id") Long id,
             @Field("starred") Boolean starred);
 
     @GET("segments/{id}/all_efforts")
     Call<List<SegmentEffort>> getSegmentEfforts(
-            @Path("id") Integer id,
-            @Query("athlete_id") Integer athleteID,
+            @Path("id") Long id,
+            @Query("athlete_id") Long athleteID,
             @Query("start_date_local") String startDate,
             @Query("end_date_local") String endDate,
             @Query("page") Integer page,
@@ -51,12 +51,12 @@ Call<List<SegmentEffort>> getSegmentEfforts(
 
     @GET("segments/{id}/leaderboard")
     Call<Leaderboard> getSegmentLeaderboard(
-            @Path("id") Integer id,
+            @Path("id") Long id,
             @Query("gender") Gender gender,
             @Query("age_group") AgeGroup ageGroup,
             @Query("weight_class") WeightClass weightClass,
             @Query("following") Boolean following,
-            @Query("club_id") Integer clubID,
+            @Query("club_id") Long clubID,
             @Query("date_range") DateRange dateRange,
             @Query("context_entries") Integer contextEntries,
             @Query("page") Integer page,
diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/stream/api/StreamAPI.java b/lib/src/main/java/com/sweetzpot/stravazpot/stream/api/StreamAPI.java
index a7e8604..27e312b 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/stream/api/StreamAPI.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/stream/api/StreamAPI.java
@@ -14,7 +14,7 @@ public StreamAPI(StravaConfig config) {
         super(config);
     }
 
-    public GetActivityStreamsRequest getActivityStreams(int activityID) {
+    public GetActivityStreamsRequest getActivityStreams(long activityID) {
         return new GetActivityStreamsRequest(activityID, getAPI(StreamRest.class), this);
     }
 
diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/stream/request/GetActivityStreamsRequest.java b/lib/src/main/java/com/sweetzpot/stravazpot/stream/request/GetActivityStreamsRequest.java
index 0e02a52..6d0ed3c 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/stream/request/GetActivityStreamsRequest.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/stream/request/GetActivityStreamsRequest.java
@@ -13,14 +13,14 @@
 
 public class GetActivityStreamsRequest {
 
-    private final int activityID;
+    private final long activityID;
     private final StreamRest restService;
     private final StreamAPI api;
     private StreamType[] types;
     private Resolution resolution;
     private SeriesType seriesType;
 
-    public GetActivityStreamsRequest(int activityID, StreamRest restService, StreamAPI api) {
+    public GetActivityStreamsRequest(long activityID, StreamRest restService, StreamAPI api) {
         this.activityID = activityID;
         this.restService = restService;
         this.api = api;
diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/stream/request/GetRouteStreamsRequest.java b/lib/src/main/java/com/sweetzpot/stravazpot/stream/request/GetRouteStreamsRequest.java
index b13afd0..26da706 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/stream/request/GetRouteStreamsRequest.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/stream/request/GetRouteStreamsRequest.java
@@ -10,11 +10,11 @@
 
 public class GetRouteStreamsRequest {
 
-    private final int routeID;
+    private final long routeID;
     private final StreamRest restService;
     private final StreamAPI api;
 
-    public GetRouteStreamsRequest(int routeID, StreamRest restService, StreamAPI api) {
+    public GetRouteStreamsRequest(long routeID, StreamRest restService, StreamAPI api) {
         this.routeID = routeID;
         this.restService = restService;
         this.api = api;
diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/stream/request/GetSegmentStreamsRequest.java b/lib/src/main/java/com/sweetzpot/stravazpot/stream/request/GetSegmentStreamsRequest.java
index 93b4304..d5aa398 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/stream/request/GetSegmentStreamsRequest.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/stream/request/GetSegmentStreamsRequest.java
@@ -13,14 +13,14 @@
 
 public class GetSegmentStreamsRequest {
 
-    private final int segmentID;
+    private final long segmentID;
     private final StreamRest restService;
     private final StreamAPI api;
     private StreamType[] types;
     private Resolution resolution;
     private SeriesType seriesType;
 
-    public GetSegmentStreamsRequest(int segmentID, StreamRest restService, StreamAPI api) {
+    public GetSegmentStreamsRequest(long segmentID, StreamRest restService, StreamAPI api) {
         this.segmentID = segmentID;
         this.restService = restService;
         this.api = api;
diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/stream/rest/StreamRest.java b/lib/src/main/java/com/sweetzpot/stravazpot/stream/rest/StreamRest.java
index 11e9f80..a5c3b92 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/stream/rest/StreamRest.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/stream/rest/StreamRest.java
@@ -14,7 +14,7 @@
 public interface StreamRest {
     @GET("activities/{id}/streams/{types}")
     Call<List<Stream>> getActivityStreams(
-            @Path("id") Integer id,
+            @Path("id") Long id,
             @Path("types") String types,
             @Query("resolution") Resolution resolution,
             @Query("series_type") SeriesType seriesType);
@@ -28,11 +28,11 @@ Call<List<Stream>> getSegmentEffortStreams(
 
     @GET("segments/{id}/streams/{types}")
     Call<List<Stream>> getSegmentStreams(
-            @Path("id") Integer id,
+            @Path("id") Long id,
             @Path("types") String types,
             @Query("resolution") Resolution resolution,
             @Query("series_type") SeriesType seriesType);
 
     @GET("routes/{id}/streams")
-    Call<List<Stream>> getRouteStreams(@Path("id") Integer id);
+    Call<List<Stream>> getRouteStreams(@Path("id") Long id);
 }
diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/upload/request/CheckUploadStatusRequest.java b/lib/src/main/java/com/sweetzpot/stravazpot/upload/request/CheckUploadStatusRequest.java
index 71a1360..2980525 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/upload/request/CheckUploadStatusRequest.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/upload/request/CheckUploadStatusRequest.java
@@ -8,11 +8,11 @@
 
 public class CheckUploadStatusRequest {
 
-    private final int id;
+    private final long id;
     private final UploadRest uploadRest;
     private final UploadAPI uploadAPI;
 
-    public CheckUploadStatusRequest(int id, UploadRest uploadRest, UploadAPI uploadAPI) {
+    public CheckUploadStatusRequest(long id, UploadRest uploadRest, UploadAPI uploadAPI) {
         this.id = id;
         this.uploadRest = uploadRest;
         this.uploadAPI = uploadAPI;
diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/upload/rest/UploadRest.java b/lib/src/main/java/com/sweetzpot/stravazpot/upload/rest/UploadRest.java
index e527bae..b70c075 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/upload/rest/UploadRest.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/upload/rest/UploadRest.java
@@ -26,5 +26,5 @@ Call<UploadStatus> upload(
             @Part MultipartBody.Part file);
 
     @GET("uploads/{id}")
-    Call<UploadStatus> checkUploadStatus(@Path("id") int id);
+    Call<UploadStatus> checkUploadStatus(@Path("id") long id);
 }

From 9d6a545d187f622a5e47eabc40206446a66914f1 Mon Sep 17 00:00:00 2001
From: Alessio Nunzi <alessio.nunzi@gmail.com>
Date: Thu, 18 Jul 2019 01:15:02 +0100
Subject: [PATCH 5/6] fixing tests for use long data type

---
 .../authenticaton/model/AppCredentials.java      |  8 ++++----
 .../stravazpot/segment/api/SegmentAPI.java       | 12 ++++++------
 .../stravazpot/stream/api/StreamAPI.java         |  4 ++--
 .../stravazpot/upload/api/UploadAPI.java         |  2 +-
 .../stravazpot/activity/api/ActivityAPITest.java | 12 ++++++------
 .../stravazpot/activity/api/CommentAPITest.java  |  2 +-
 .../stravazpot/activity/api/ExceptionsTest.java  |  8 ++++----
 .../stravazpot/activity/api/KudosAPITest.java    |  2 +-
 .../stravazpot/activity/api/PhotoAPITest.java    |  2 +-
 .../stravazpot/athlete/api/AthleteAPITest.java   |  8 ++++----
 .../stravazpot/athlete/api/FriendAPITest.java    |  6 +++---
 .../authenticaton/api/AuthenticationAPITest.java |  2 +-
 .../stravazpot/club/api/ClubAPITest.java         | 16 ++++++++--------
 .../stravazpot/route/api/RouteAPITest.java       |  4 ++--
 .../stravazpot/segment/api/SegmentAPITest.java   | 16 ++++++++--------
 .../segment/api/SegmentEffortAPITest.java        |  2 +-
 .../stravazpot/stream/api/StreamAPITest.java     |  6 +++---
 .../stravazpot/upload/api/UploadAPITest.java     |  2 +-
 18 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/authenticaton/model/AppCredentials.java b/lib/src/main/java/com/sweetzpot/stravazpot/authenticaton/model/AppCredentials.java
index 8c5ef1c..cdfa4e2 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/authenticaton/model/AppCredentials.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/authenticaton/model/AppCredentials.java
@@ -2,19 +2,19 @@
 
 public class AppCredentials {
 
-    private final int clientID;
+    private final long clientID;
     private final String clientSecret;
 
-    public static AppCredentials with(int clientID, String clientSecret) {
+    public static AppCredentials with(long clientID, String clientSecret) {
         return new AppCredentials(clientID, clientSecret);
     }
 
-    public AppCredentials(int clientID, String clientSecret) {
+    public AppCredentials(long clientID, String clientSecret) {
         this.clientID = clientID;
         this.clientSecret = clientSecret;
     }
 
-    public int getClientID() {
+    public long getClientID() {
         return clientID;
     }
 
diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/segment/api/SegmentAPI.java b/lib/src/main/java/com/sweetzpot/stravazpot/segment/api/SegmentAPI.java
index 34d4a9c..bb80636 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/segment/api/SegmentAPI.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/segment/api/SegmentAPI.java
@@ -18,7 +18,7 @@ public SegmentAPI(StravaConfig config) {
         super(config);
     }
 
-    public GetSegmentRequest getSegment(int segmentID) {
+    public GetSegmentRequest getSegment(long segmentID) {
         return new GetSegmentRequest(segmentID, getAPI(SegmentRest.class), this);
     }
 
@@ -26,23 +26,23 @@ public ListMyStarredSegmentsRequest listMyStarredSegments() {
         return new ListMyStarredSegmentsRequest(getAPI(SegmentRest.class), this);
     }
 
-    public ListAthleteStarredSegmentsRequest listStarredSegmentsByAthlete(int athleteID) {
+    public ListAthleteStarredSegmentsRequest listStarredSegmentsByAthlete(long athleteID) {
         return new ListAthleteStarredSegmentsRequest(athleteID, getAPI(SegmentRest.class), this);
     }
 
-    public StarSegmentRequest starSegment(int segmentID) {
+    public StarSegmentRequest starSegment(long segmentID) {
         return new StarSegmentRequest(segmentID, true, getAPI(SegmentRest.class), this);
     }
 
-    public StarSegmentRequest unstarSegment(int segmentID) {
+    public StarSegmentRequest unstarSegment(long segmentID) {
         return new StarSegmentRequest(segmentID, false, getAPI(SegmentRest.class), this);
     }
 
-    public ListSegmentEffortsRequest listSegmentEfforts(int segmentID) {
+    public ListSegmentEffortsRequest listSegmentEfforts(long segmentID) {
         return new ListSegmentEffortsRequest(segmentID, getAPI(SegmentRest.class), this);
     }
 
-    public GetSegmentLeaderboardRequest getLeaderboardForSegment(int segmentID) {
+    public GetSegmentLeaderboardRequest getLeaderboardForSegment(long segmentID) {
         return new GetSegmentLeaderboardRequest(segmentID, getAPI(SegmentRest.class), this);
     }
 
diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/stream/api/StreamAPI.java b/lib/src/main/java/com/sweetzpot/stravazpot/stream/api/StreamAPI.java
index 27e312b..aec94c4 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/stream/api/StreamAPI.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/stream/api/StreamAPI.java
@@ -22,11 +22,11 @@ public GetSegmentEffortStreamsRequest getSegmentEffortStreams(long segmentEffort
         return new GetSegmentEffortStreamsRequest(segmentEffortID, getAPI(StreamRest.class), this);
     }
 
-    public GetSegmentStreamsRequest getSegmentStreams(int segmentID) {
+    public GetSegmentStreamsRequest getSegmentStreams(long segmentID) {
         return new GetSegmentStreamsRequest(segmentID, getAPI(StreamRest.class), this);
     }
 
-    public GetRouteStreamsRequest getRouteStreams(int routeID) {
+    public GetRouteStreamsRequest getRouteStreams(long routeID) {
         return new GetRouteStreamsRequest(routeID, getAPI(StreamRest.class), this);
     }
 }
diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/upload/api/UploadAPI.java b/lib/src/main/java/com/sweetzpot/stravazpot/upload/api/UploadAPI.java
index 8c49e13..796f326 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/upload/api/UploadAPI.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/upload/api/UploadAPI.java
@@ -18,7 +18,7 @@ public UploadFileRequest uploadFile(File file) {
         return new UploadFileRequest(file, getAPI(UploadRest.class), this);
     }
 
-    public CheckUploadStatusRequest checkUploadStatus(int id) {
+    public CheckUploadStatusRequest checkUploadStatus(long id) {
         return new CheckUploadStatusRequest(id, getAPI(UploadRest.class), this);
     }
 }
diff --git a/lib/src/test/java/com/sweetzpot/stravazpot/activity/api/ActivityAPITest.java b/lib/src/test/java/com/sweetzpot/stravazpot/activity/api/ActivityAPITest.java
index 6738e51..f862d0c 100644
--- a/lib/src/test/java/com/sweetzpot/stravazpot/activity/api/ActivityAPITest.java
+++ b/lib/src/test/java/com/sweetzpot/stravazpot/activity/api/ActivityAPITest.java
@@ -66,7 +66,7 @@ public void shouldRetrieveAnActivity() throws Exception {
         enqueueActivity();
         ActivityAPI activityAPI = givenAnActivityAPI();
 
-        Activity activity = activityAPI.getActivity(321934)
+        Activity activity = activityAPI.getActivity(321934L)
                                         .includeAllEfforts(true)
                                         .execute();
 
@@ -82,7 +82,7 @@ public void shoudlUpdateAnActivity() throws Exception {
         enqueueActivity();
         ActivityAPI activityAPI = givenAnActivityAPI();
 
-        Activity activity = activityAPI.updateActivity(321934)
+        Activity activity = activityAPI.updateActivity(321934L)
                                         .changeName("Afternoon ride")
                                         .changeType(ActivityType.RIDE)
                                         .changePrivate(true)
@@ -108,7 +108,7 @@ public void shouldDeleteAnActivity() throws Exception {
         enqueueResponse(204, "");
         ActivityAPI activityAPI = givenAnActivityAPI();
 
-        activityAPI.deleteActivity(321934)
+        activityAPI.deleteActivity(321934L)
                     .execute();
 
         assertRequestPathContains("/activities/321934");
@@ -159,7 +159,7 @@ public void shouldListRelatedActivities() throws Exception {
         enqueueResponse("[]");
         ActivityAPI activityAPI = givenAnActivityAPI();
 
-        List<Activity> activities = activityAPI.listRelatedActivities(321934)
+        List<Activity> activities = activityAPI.listRelatedActivities(321934L)
                                                 .inPage(2)
                                                 .perPage(10)
                                                 .execute();
@@ -176,7 +176,7 @@ public void shouldListActivityZones() throws Exception {
         enqueueActivityZones();
         ActivityAPI activityAPI = givenAnActivityAPI();
 
-        List<ActivityZone> activityZones = activityAPI.listActivityZones(321934)
+        List<ActivityZone> activityZones = activityAPI.listActivityZones(321934L)
                                                         .execute();
 
         assertRequestPathContains("/activities/321934/zones");
@@ -188,7 +188,7 @@ public void shouldListActivityLaps() throws Exception {
         enqueueActivityLaps();
         ActivityAPI activityAPI = givenAnActivityAPI();
 
-        List<ActivityLap> laps = activityAPI.listActivityLaps(321934)
+        List<ActivityLap> laps = activityAPI.listActivityLaps(321934L)
                                             .execute();
 
         assertRequestPathContains("/activities/321934/laps");
diff --git a/lib/src/test/java/com/sweetzpot/stravazpot/activity/api/CommentAPITest.java b/lib/src/test/java/com/sweetzpot/stravazpot/activity/api/CommentAPITest.java
index 9e3acc2..ab64cb5 100644
--- a/lib/src/test/java/com/sweetzpot/stravazpot/activity/api/CommentAPITest.java
+++ b/lib/src/test/java/com/sweetzpot/stravazpot/activity/api/CommentAPITest.java
@@ -22,7 +22,7 @@ public void shouldListActivityComments() throws Exception {
         enqueueComments();
         CommentAPI commentAPI = givenACommentAPI();
 
-        List<Comment> comments = commentAPI.listActivityComments(123)
+        List<Comment> comments = commentAPI.listActivityComments(123L)
                                             .inPage(2)
                                             .perPage(10)
                                             .execute();
diff --git a/lib/src/test/java/com/sweetzpot/stravazpot/activity/api/ExceptionsTest.java b/lib/src/test/java/com/sweetzpot/stravazpot/activity/api/ExceptionsTest.java
index 98b65b4..9f686a2 100644
--- a/lib/src/test/java/com/sweetzpot/stravazpot/activity/api/ExceptionsTest.java
+++ b/lib/src/test/java/com/sweetzpot/stravazpot/activity/api/ExceptionsTest.java
@@ -21,7 +21,7 @@ public void shouldThrowAnExceptionWhenOperationIsNotAuthorized() throws Exceptio
 
         thrown.expect(StravaUnauthorizedException.class);
 
-        activityAPI.getActivity(123456).execute();
+        activityAPI.getActivity(123456L).execute();
     }
 
     @Test
@@ -31,7 +31,7 @@ public void shoudlThrowAnExceptionIfConfigurationIsNotValid() throws Exception {
 
         thrown.expect(StravaAPIException.class);
 
-        activityAPI.getActivity(123456).execute();
+        activityAPI.getActivity(123456L).execute();
     }
 
     @Test
@@ -41,7 +41,7 @@ public void shouldThrowAnExceptionIfResultJSONIsWrong() throws Exception {
 
         thrown.expect(StravaAPIException.class);
 
-        activityAPI.getActivity(123456).execute();
+        activityAPI.getActivity(123456L).execute();
     }
 
     @Test
@@ -51,7 +51,7 @@ public void shouldThrowAnExceptionIfResponseCodeIsNotSuccessful() throws Excepti
 
         thrown.expect(StravaAPIException.class);
         
-        activityAPI.getActivity(123456).execute();
+        activityAPI.getActivity(123456L).execute();
     }
 
     private ActivityAPI givenAWronglyConfiguredActivityAPI() {
diff --git a/lib/src/test/java/com/sweetzpot/stravazpot/activity/api/KudosAPITest.java b/lib/src/test/java/com/sweetzpot/stravazpot/activity/api/KudosAPITest.java
index b02e2b7..e9d476d 100644
--- a/lib/src/test/java/com/sweetzpot/stravazpot/activity/api/KudosAPITest.java
+++ b/lib/src/test/java/com/sweetzpot/stravazpot/activity/api/KudosAPITest.java
@@ -14,7 +14,7 @@ public void shouldListActivityKudoers() throws Exception {
         enqueueResponse("[]");
         KudosAPI kudosAPI = givenAKudosAPI();
 
-        List<Athlete> athletes = kudosAPI.listActivityKudoers(123456)
+        List<Athlete> athletes = kudosAPI.listActivityKudoers(123456L)
                                             .inPage(2)
                                             .perPage(10)
                                             .execute();
diff --git a/lib/src/test/java/com/sweetzpot/stravazpot/activity/api/PhotoAPITest.java b/lib/src/test/java/com/sweetzpot/stravazpot/activity/api/PhotoAPITest.java
index 7374833..a13a7df 100644
--- a/lib/src/test/java/com/sweetzpot/stravazpot/activity/api/PhotoAPITest.java
+++ b/lib/src/test/java/com/sweetzpot/stravazpot/activity/api/PhotoAPITest.java
@@ -22,7 +22,7 @@ public void shouldRetrieveActivityPhotos() throws Exception {
         enqueuePhotos();
         PhotoAPI photoAPI = givenAPhotoAPI();
 
-        List<Photo> photos = photoAPI.listAcivityPhotos(81121657)
+        List<Photo> photos = photoAPI.listAcivityPhotos(81121657L)
                                         .execute();
 
         assertRequestPathContains(
diff --git a/lib/src/test/java/com/sweetzpot/stravazpot/athlete/api/AthleteAPITest.java b/lib/src/test/java/com/sweetzpot/stravazpot/athlete/api/AthleteAPITest.java
index b5876da..6199d14 100644
--- a/lib/src/test/java/com/sweetzpot/stravazpot/athlete/api/AthleteAPITest.java
+++ b/lib/src/test/java/com/sweetzpot/stravazpot/athlete/api/AthleteAPITest.java
@@ -45,7 +45,7 @@ public void shouldRetrieveAthlete() throws Exception {
         enqueueAthlete();
         AthleteAPI athleteAPI = givenAnAthleteAPI();
 
-        Athlete athlete = athleteAPI.retrieveAthlete(227615)
+        Athlete athlete = athleteAPI.retrieveAthlete(227615L)
                                     .execute();
 
         assertRequestSentTo("/athletes/227615");
@@ -91,7 +91,7 @@ public void shouldRetrieveAthleteTotalsAndStats() throws Exception {
         enqueueTotalsAndStats();
         AthleteAPI athleteAPI = givenAnAthleteAPI();
 
-        Stats stats = athleteAPI.getAthleteTotalsAndStats(227615)
+        Stats stats = athleteAPI.getAthleteTotalsAndStats(227615L)
                                 .execute();
 
         assertRequestSentTo("/athletes/227615/stats");
@@ -103,7 +103,7 @@ public void shouldListAthleteKOMS() throws Exception {
         enqueueResponse("[]");
         AthleteAPI athleteAPI = givenAnAthleteAPI();
 
-        List<SegmentEffort> koms = athleteAPI.listAthleteKOMS(227615)
+        List<SegmentEffort> koms = athleteAPI.listAthleteKOMS(227615L)
                                             .inPage(2)
                                             .perPage(10)
                                             .execute();
@@ -120,7 +120,7 @@ public void shouldNotCrashWithEmptyStats() throws Exception {
         enqueueEmptyTotalsAndStats();
         AthleteAPI athleteAPI = givenAnAthleteAPI();
 
-        Stats stats = athleteAPI.getAthleteTotalsAndStats(227615)
+        Stats stats = athleteAPI.getAthleteTotalsAndStats(227615L)
                                 .execute();
 
         assertThat(stats, is(notNullValue()));
diff --git a/lib/src/test/java/com/sweetzpot/stravazpot/athlete/api/FriendAPITest.java b/lib/src/test/java/com/sweetzpot/stravazpot/athlete/api/FriendAPITest.java
index ea22b38..5dd5220 100644
--- a/lib/src/test/java/com/sweetzpot/stravazpot/athlete/api/FriendAPITest.java
+++ b/lib/src/test/java/com/sweetzpot/stravazpot/athlete/api/FriendAPITest.java
@@ -31,7 +31,7 @@ public void shouldRetrieveAthleteFriends() throws Exception {
         enqueueResponse("[]");
         FriendAPI friendAPI = givenAFriendAPI();
 
-        List<Athlete> friends = friendAPI.getAthleteFriends(123456)
+        List<Athlete> friends = friendAPI.getAthleteFriends(123456L)
                                         .inPage(2)
                                         .perPage(10)
                                         .execute();
@@ -65,7 +65,7 @@ public void shouldRetrieveAthleteFollowers() throws Exception {
         enqueueResponse("[]");
         FriendAPI friendAPI = givenAFriendAPI();
 
-        List<Athlete> followers = friendAPI.getAthleteFollowers(123456)
+        List<Athlete> followers = friendAPI.getAthleteFollowers(123456L)
                                             .inPage(2)
                                             .perPage(10)
                                             .execute();
@@ -82,7 +82,7 @@ public void shouldRetrieveCommonFollowersWithAnotherUser() throws Exception {
         enqueueResponse("[]");
         FriendAPI friendAPI = givenAFriendAPI();
 
-        List<Athlete> followers = friendAPI.getBothFollowing(123456)
+        List<Athlete> followers = friendAPI.getBothFollowing(123456L)
                                             .inPage(2)
                                             .perPage(10)
                                             .execute();
diff --git a/lib/src/test/java/com/sweetzpot/stravazpot/authenticaton/api/AuthenticationAPITest.java b/lib/src/test/java/com/sweetzpot/stravazpot/authenticaton/api/AuthenticationAPITest.java
index 30ef8f7..8a101c2 100644
--- a/lib/src/test/java/com/sweetzpot/stravazpot/authenticaton/api/AuthenticationAPITest.java
+++ b/lib/src/test/java/com/sweetzpot/stravazpot/authenticaton/api/AuthenticationAPITest.java
@@ -13,7 +13,7 @@
 
 public class AuthenticationAPITest extends StravaAPITest {
 
-    private static final int ANY_CLIENT_ID = 1234;
+    private static final long ANY_CLIENT_ID = 1234;
     private static final String ANY_CLIENT_SECRET = "any_secret";
     private static final String ANY_CODE = "any_code";
 
diff --git a/lib/src/test/java/com/sweetzpot/stravazpot/club/api/ClubAPITest.java b/lib/src/test/java/com/sweetzpot/stravazpot/club/api/ClubAPITest.java
index 6a01f25..714781b 100644
--- a/lib/src/test/java/com/sweetzpot/stravazpot/club/api/ClubAPITest.java
+++ b/lib/src/test/java/com/sweetzpot/stravazpot/club/api/ClubAPITest.java
@@ -34,7 +34,7 @@ public void shouldRetrieveAClub() throws Exception {
         enqueueClub();
         ClubAPI clubAPI = givenAClubAPI();
 
-        Club club = clubAPI.getClub(1)
+        Club club = clubAPI.getClub(1L)
                         .execute();
 
         assertRequestPathContains("/clubs/1");
@@ -46,7 +46,7 @@ public void shouldListClubAnnouncements() throws Exception {
         enqueueAnnouncements();
         ClubAPI clubAPI = givenAClubAPI();
 
-        List<Announcement> announcements = clubAPI.listClubAnnouncements(109984)
+        List<Announcement> announcements = clubAPI.listClubAnnouncements(109984L)
                                                     .execute();
 
         assertRequestPathContains("/clubs/109984/announcements");
@@ -58,7 +58,7 @@ public void shouldListClubGroupEvents() throws Exception {
         enqueueGroupEvents();
         ClubAPI clubAPI = givenAClubAPI();
 
-        List<Event> events = clubAPI.listClubGroupEvents(1)
+        List<Event> events = clubAPI.listClubGroupEvents(1L)
                                     .execute();
 
         assertRequestPathContains("/clubs/1/group_events");
@@ -81,7 +81,7 @@ public void shouldListClubMembers() throws Exception {
         enqueueResponse("[]");
         ClubAPI clubAPI = givenAClubAPI();
 
-        List<Athlete> athletes = clubAPI.listClubMembers(123456)
+        List<Athlete> athletes = clubAPI.listClubMembers(123456L)
                                         .inPage(2)
                                         .perPage(10)
                                         .execute();
@@ -98,7 +98,7 @@ public void shouldListClubAdmins() throws Exception {
         enqueueResponse("[]");
         ClubAPI clubAPI = givenAClubAPI();
 
-        List<Athlete> athletes = clubAPI.listClubAdmins(123456)
+        List<Athlete> athletes = clubAPI.listClubAdmins(123456L)
                 .inPage(2)
                 .perPage(10)
                 .execute();
@@ -115,7 +115,7 @@ public void shouldListClubActivities() throws Exception {
         enqueueResponse("[]");
         ClubAPI clubAPI = givenAClubAPI();
 
-        List<Activity> activities = clubAPI.listClubActivities(123456)
+        List<Activity> activities = clubAPI.listClubActivities(123456L)
                                             .before(12598723)
                                             .inPage(2)
                                             .perPage(10)
@@ -134,7 +134,7 @@ public void shouldJoinAClub() throws Exception {
         enqueueJoinResult();
         ClubAPI clubAPI = givenAClubAPI();
 
-        JoinResult joinResult = clubAPI.joinClub(123456)
+        JoinResult joinResult = clubAPI.joinClub(123456L)
                                         .execute();
 
         assertRequestPathContains("/clubs/123456/join");
@@ -146,7 +146,7 @@ public void shouldLeaveAClub() throws Exception {
         enqueueLeaveResult();
         ClubAPI clubAPI = givenAClubAPI();
 
-        LeaveResult leaveResult = clubAPI.leaveClub(123456)
+        LeaveResult leaveResult = clubAPI.leaveClub(123456L)
                                             .execute();
 
         assertRequestPathContains("/clubs/123456/leave");
diff --git a/lib/src/test/java/com/sweetzpot/stravazpot/route/api/RouteAPITest.java b/lib/src/test/java/com/sweetzpot/stravazpot/route/api/RouteAPITest.java
index da711fa..2e20637 100644
--- a/lib/src/test/java/com/sweetzpot/stravazpot/route/api/RouteAPITest.java
+++ b/lib/src/test/java/com/sweetzpot/stravazpot/route/api/RouteAPITest.java
@@ -23,7 +23,7 @@ public void shouldRetrieveRoute() throws Exception {
         enqueueRoute();
         RouteAPI routeAPI = givenARouteAPI();
 
-        Route route = routeAPI.getRoute(1263727)
+        Route route = routeAPI.getRoute(1263727L)
                                 .execute();
 
         assertRequestSentTo("/routes/1263727");
@@ -35,7 +35,7 @@ public void shouldListRoutes() throws Exception {
         enqueueResponse("[]");
         RouteAPI routeAPI = givenARouteAPI();
 
-        List<Route> routes = routeAPI.listRoutes(123456)
+        List<Route> routes = routeAPI.listRoutes(123456L)
                                 .execute();
 
         assertRequestSentTo("/athletes/123456/routes");
diff --git a/lib/src/test/java/com/sweetzpot/stravazpot/segment/api/SegmentAPITest.java b/lib/src/test/java/com/sweetzpot/stravazpot/segment/api/SegmentAPITest.java
index ccea5b3..89e86a0 100644
--- a/lib/src/test/java/com/sweetzpot/stravazpot/segment/api/SegmentAPITest.java
+++ b/lib/src/test/java/com/sweetzpot/stravazpot/segment/api/SegmentAPITest.java
@@ -37,7 +37,7 @@ public void shouldRetrieveASegment() throws Exception {
         enqueueSegment();
         SegmentAPI segmentAPI = givenASegmentAPI();
 
-        Segment segment = segmentAPI.getSegment(229781)
+        Segment segment = segmentAPI.getSegment(229781L)
                                     .execute();
 
         assertRequestSentTo("/segments/229781");
@@ -66,7 +66,7 @@ public void shouldListAthleteStarredSegments() throws Exception {
         enqueueResponse("[]");
         SegmentAPI segmentAPI = givenASegmentAPI();
 
-        List<Segment> segments = segmentAPI.listStarredSegmentsByAthlete(123456)
+        List<Segment> segments = segmentAPI.listStarredSegmentsByAthlete(123456L)
                                             .inPage(2)
                                             .perPage(10)
                                             .execute();
@@ -83,7 +83,7 @@ public void shouldStarASegmentWithCorrectID() throws Exception {
         enqueueSegment();
         SegmentAPI segmentAPI = givenASegmentAPI();
 
-        Segment segment = segmentAPI.starSegment(229781)
+        Segment segment = segmentAPI.starSegment(229781L)
                 .execute();
 
         assertRequestPathContains("/segments/229781/starred");
@@ -94,7 +94,7 @@ public void shouldStarASegment() throws Exception {
         enqueueSegment();
         SegmentAPI segmentAPI = givenASegmentAPI();
 
-        Segment segment = segmentAPI.starSegment(229781)
+        Segment segment = segmentAPI.starSegment(229781L)
                                     .execute();
 
         assertRequestBodyContains("starred=true");
@@ -105,7 +105,7 @@ public void shouldUnstarASegment() throws Exception {
         enqueueSegment();
         SegmentAPI segmentAPI = givenASegmentAPI();
 
-        Segment segment = segmentAPI.unstarSegment(229781)
+        Segment segment = segmentAPI.unstarSegment(229781L)
                 .execute();
 
         assertRequestBodyContains("starred=false");
@@ -116,8 +116,8 @@ public void shouldListSegmentEfforts() throws Exception {
         enqueueResponse("[]");
         SegmentAPI segmentAPI = givenASegmentAPI();
 
-        List<SegmentEffort> efforts = segmentAPI.listSegmentEfforts(123456)
-                                                .forAthlete(98765)
+        List<SegmentEffort> efforts = segmentAPI.listSegmentEfforts(123456L)
+                                                .forAthlete(98765L)
                                                 .startingOn(makeDate(20, Calendar.JANUARY, 2015, 12, 33, 50))
                                                 .endingOn(makeDate(12, Calendar.SEPTEMBER, 2016, 22, 0, 59))
                                                 .inPage(2)
@@ -139,7 +139,7 @@ public void shouldRetrieveSegmentLeaderboard() throws Exception {
         enqueueLeaderboard();
         SegmentAPI segmentAPI = givenASegmentAPI();
 
-        Leaderboard leaderboard = segmentAPI.getLeaderboardForSegment(123456)
+        Leaderboard leaderboard = segmentAPI.getLeaderboardForSegment(123456L)
                                             .withGender(FEMALE)
                                             .inAgeGroup(AGE_25_34)
                                             .inWeightClass(KG_75_84)
diff --git a/lib/src/test/java/com/sweetzpot/stravazpot/segment/api/SegmentEffortAPITest.java b/lib/src/test/java/com/sweetzpot/stravazpot/segment/api/SegmentEffortAPITest.java
index f7bf8e5..90c8df0 100644
--- a/lib/src/test/java/com/sweetzpot/stravazpot/segment/api/SegmentEffortAPITest.java
+++ b/lib/src/test/java/com/sweetzpot/stravazpot/segment/api/SegmentEffortAPITest.java
@@ -24,7 +24,7 @@ public void shouldRetrieveSegmentEffort() throws Exception {
         enqueueSegmentEffort();
         SegmentEffortAPI segmentEffortAPI = givenASegmentEfforAPI();
 
-        SegmentEffort segmentEffort = segmentEffortAPI.getSegmentEffort(269990681)
+        SegmentEffort segmentEffort = segmentEffortAPI.getSegmentEffort(269990681L)
                                                         .execute();
 
         assertRequestPathContains(
diff --git a/lib/src/test/java/com/sweetzpot/stravazpot/stream/api/StreamAPITest.java b/lib/src/test/java/com/sweetzpot/stravazpot/stream/api/StreamAPITest.java
index 88bc27b..a5d15d0 100644
--- a/lib/src/test/java/com/sweetzpot/stravazpot/stream/api/StreamAPITest.java
+++ b/lib/src/test/java/com/sweetzpot/stravazpot/stream/api/StreamAPITest.java
@@ -22,7 +22,7 @@ public void shouldRetrieveActivityStreams() throws Exception {
         enqueueStreams();
         StreamAPI streamAPI = givenAStreamAPI();
 
-        List<Stream> streams = streamAPI.getActivityStreams(123456)
+        List<Stream> streams = streamAPI.getActivityStreams(123456L)
                                         .forTypes(LATLNG, DISTANCE)
                                         .withResolution(LOW)
                                         .withSeriesType(SeriesType.DISTANCE)
@@ -59,7 +59,7 @@ public void shouldRetrieveSegmentStreams() throws Exception {
         enqueueStreams();
         StreamAPI streamAPI = givenAStreamAPI();
 
-        List<Stream> streams = streamAPI.getSegmentStreams(123456)
+        List<Stream> streams = streamAPI.getSegmentStreams(123456L)
                 .forTypes(LATLNG, DISTANCE)
                 .withResolution(LOW)
                 .withSeriesType(SeriesType.DISTANCE)
@@ -77,7 +77,7 @@ public void shouldRetrieveRouteStreams() throws Exception {
         enqueueStreams();
         StreamAPI streamAPI = givenAStreamAPI();
 
-        List<Stream> streams = streamAPI.getRouteStreams(123456)
+        List<Stream> streams = streamAPI.getRouteStreams(123456L)
                                         .execute();
 
         assertRequestPathContains(
diff --git a/lib/src/test/java/com/sweetzpot/stravazpot/upload/api/UploadAPITest.java b/lib/src/test/java/com/sweetzpot/stravazpot/upload/api/UploadAPITest.java
index 49e651f..a6a49a6 100644
--- a/lib/src/test/java/com/sweetzpot/stravazpot/upload/api/UploadAPITest.java
+++ b/lib/src/test/java/com/sweetzpot/stravazpot/upload/api/UploadAPITest.java
@@ -40,7 +40,7 @@ public void shouldCheckUploadStatus() throws Exception {
         enqueueUploadStatus();
         UploadAPI uploadAPI = givenAnUploadAPI();
 
-        UploadStatus uploadStatus = uploadAPI.checkUploadStatus(16486788).execute();
+        UploadStatus uploadStatus = uploadAPI.checkUploadStatus(16486788L).execute();
 
         assertRequestPathContains("uploads/16486788");
     }

From a8793a420972d4c4761c72b64576d0a17d008720 Mon Sep 17 00:00:00 2001
From: Alessio Nunzi <alessio.nunzi@gmail.com>
Date: Thu, 18 Jul 2019 01:20:33 +0100
Subject: [PATCH 6/6] fix building issue

---
 .../stravazpot/authenticaton/rest/AuthenticationRest.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/sweetzpot/stravazpot/authenticaton/rest/AuthenticationRest.java b/lib/src/main/java/com/sweetzpot/stravazpot/authenticaton/rest/AuthenticationRest.java
index 73631d2..841d112 100644
--- a/lib/src/main/java/com/sweetzpot/stravazpot/authenticaton/rest/AuthenticationRest.java
+++ b/lib/src/main/java/com/sweetzpot/stravazpot/authenticaton/rest/AuthenticationRest.java
@@ -12,7 +12,7 @@ public interface AuthenticationRest {
     @POST("/oauth/token")
     @FormUrlEncoded
     Call<LoginResult> token(
-            @Field("client_id") int clientID,
+            @Field("client_id") Long clientID,
             @Field("client_secret") String clientSecret,
             @Field("code") String code);