Get followers/following as full

slapperwan · slapperwan · commit 6ad7b5f517c5 · 2011-03-15T10:53:14.000+08:00
diff --git a/core/src/main/java/com/github/api/v2/services/UserService.java b/core/src/main/java/com/github/api/v2/services/UserService.java
@@ -81,7 +81,7 @@ public interface UserService extends GitHubService {
 	 * 
 	 * @return the user followers
 	 */
-	public List<String> getUserFollowers(String userName);
+	public List<User> getUserFollowers(String userName);
 	
 	/**
 	 * Gets the user following.
@@ -91,7 +91,7 @@ public interface UserService extends GitHubService {
 	 * 
 	 * @return the user following
 	 */
-	public List<String> getUserFollowing(String userName);
+	public List<User> getUserFollowing(String userName);
 	
 	/**
 	 * Follow user.
diff --git a/core/src/main/java/com/github/api/v2/services/impl/UserServiceImpl.java b/core/src/main/java/com/github/api/v2/services/impl/UserServiceImpl.java
@@ -147,13 +147,13 @@ public User getUserByUsername(String userName) {
 	 * @see com.github.api.v2.services.UserService#getUserFollowers(java.lang.String)
 	 */
 	@Override
-	public List<String> getUserFollowers(String userName) {
+	public List<User> getUserFollowers(String userName) {
 		GitHubApiUrlBuilder builder = createGitHubApiUrlBuilder(GitHubApiUrls.UserApiUrls.GET_USER_FOLLOWERS_URL);
         String                apiUrl  = builder.withField(ParameterNames.USER_NAME, userName).buildUrl();
         JsonObject json = unmarshall(callApiGet(apiUrl));
         
         try {
-            return unmarshall(new TypeToken<List<String>>(){}, json.get("users"));
+            return unmarshall(new TypeToken<List<User>>(){}, json.get("users"));
         }
         catch (JsonParseException e) {
             throw new GitHubException(e.getMessage(), e);
@@ -164,13 +164,13 @@ public List<String> getUserFollowers(String userName) {
 	 * @see com.github.api.v2.services.UserService#getUserFollowing(java.lang.String)
 	 */
 	@Override
-	public List<String> getUserFollowing(String userName) {
+	public List<User> getUserFollowing(String userName) {
 		GitHubApiUrlBuilder builder = createGitHubApiUrlBuilder(GitHubApiUrls.UserApiUrls.GET_USER_FOLLOWING_URL);
         String                apiUrl  = builder.withField(ParameterNames.USER_NAME, userName).buildUrl();
         JsonObject json = unmarshall(callApiGet(apiUrl));
         
         try {
-            return unmarshall(new TypeToken<List<String>>(){}, json.get("users"));
+            return unmarshall(new TypeToken<List<User>>(){}, json.get("users"));
         }
         catch (JsonParseException e) {
             throw new GitHubException(e.getMessage(), e);
diff --git a/core/src/main/resources/com/github/api/v2/services/constant/GitHubApiUrls.properties b/core/src/main/resources/com/github/api/v2/services/constant/GitHubApiUrls.properties
@@ -12,8 +12,8 @@ com.github.api.v2.services.userService.searchUsersByEmail=http://github.com/api/
 com.github.api.v2.services.userService.getUser=http://github.com/api/{version}/{format}/user/show/{userName}
 com.github.api.v2.services.userService.getCurrentUser=http://github.com/api/{version}/{format}/user/show
 com.github.api.v2.services.userService.updateUser=http://github.com/api/{version}/{format}/user/show/{userName}
-com.github.api.v2.services.userService.getUserFollowers=http://github.com/api/{version}/{format}/user/show/{userName}/followers
-com.github.api.v2.services.userService.getUserFollowing=http://github.com/api/{version}/{format}/user/show/{userName}/following
+com.github.api.v2.services.userService.getUserFollowers=http://github.com/api/{version}/{format}/user/show/{userName}/followers?full=1
+com.github.api.v2.services.userService.getUserFollowing=http://github.com/api/{version}/{format}/user/show/{userName}/following?full=1
 com.github.api.v2.services.userService.followUser=http://github.com/api/{version}/{format}/user/follow/{userName}
 com.github.api.v2.services.userService.unfollowUser=http://github.com/api/{version}/{format}/user/unfollow/{userName}
 com.github.api.v2.services.userService.getWatchedRepositories=http://github.com/api/{version}/{format}/repos/watched/{userName}
