diff --git a/app/src/main/java/org/ntlab/acanthus_client/entities/FollowJson.java b/app/src/main/java/org/ntlab/acanthus_client/entities/FollowJson.java new file mode 100644 index 0000000..0ed8392 --- /dev/null +++ b/app/src/main/java/org/ntlab/acanthus_client/entities/FollowJson.java @@ -0,0 +1,16 @@ +package org.ntlab.acanthus_client.entities; + +import java.util.HashMap; + +public class FollowJson { + private HashMap follows = new HashMap<>(); + + public HashMap getFollows() { + return follows; + } + + public void setFollows(HashMap follows) { + this.follows = follows; + } + +} diff --git a/app/src/main/java/org/ntlab/acanthus_client/entities/FollowUidJson.java b/app/src/main/java/org/ntlab/acanthus_client/entities/FollowUidJson.java deleted file mode 100644 index f116fc9..0000000 --- a/app/src/main/java/org/ntlab/acanthus_client/entities/FollowUidJson.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.ntlab.acanthus_client.entities; - -import java.util.ArrayList; -import java.util.Collection; - -public class FollowUidJson { - private ArrayList followsUid = new ArrayList<>(); - - public Collection getFollowsUid() { - return followsUid; - } - - public void setFollowsUid(ArrayList followsUid) { - this.followsUid = followsUid; - } - -} diff --git a/app/src/main/java/org/ntlab/acanthus_client/entities/FollowerJson.java b/app/src/main/java/org/ntlab/acanthus_client/entities/FollowerJson.java new file mode 100644 index 0000000..bfbcf0b --- /dev/null +++ b/app/src/main/java/org/ntlab/acanthus_client/entities/FollowerJson.java @@ -0,0 +1,16 @@ +package org.ntlab.acanthus_client.entities; + +import java.util.HashMap; + +public class FollowerJson { + private HashMap followers = new HashMap<>(); + + public HashMap getFollowers() { + return followers; + } + + public void setFollowers(HashMap followers) { + this.followers = followers; + } + +} diff --git a/app/src/main/java/org/ntlab/acanthus_client/entities/FollowerUidJson.java b/app/src/main/java/org/ntlab/acanthus_client/entities/FollowerUidJson.java deleted file mode 100644 index 6893048..0000000 --- a/app/src/main/java/org/ntlab/acanthus_client/entities/FollowerUidJson.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.ntlab.acanthus_client.entities; - -import java.util.ArrayList; -import java.util.Collection; - -public class FollowerUidJson { - private ArrayList followersUid = new ArrayList<>(); - - public Collection getFollowersUid() { - return followersUid; - } - - public void setFollowersUid(ArrayList followersUid) { - this.followersUid = followersUid; - } - -} diff --git a/app/src/main/java/org/ntlab/acanthus_client/resources/accounts/FollowersRest.java b/app/src/main/java/org/ntlab/acanthus_client/resources/accounts/FollowersRest.java index b5d7e75..b6e99d2 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/resources/accounts/FollowersRest.java +++ b/app/src/main/java/org/ntlab/acanthus_client/resources/accounts/FollowersRest.java @@ -1,18 +1,17 @@ package org.ntlab.acanthus_client.resources.accounts; -import org.ntlab.acanthus_client.entities.FollowerUidJson; +import org.ntlab.acanthus_client.entities.FollowerJson; import retrofit2.Call; import retrofit2.http.GET; import retrofit2.http.Path; -import retrofit2.http.Query; public interface FollowersRest { //アカウント別のフォロワー情報を取得するメソッド @GET("accounts/{uid}/followers") - Call getFollowers( + Call getFollowers( @Path("uid") Integer uid ); diff --git a/app/src/main/java/org/ntlab/acanthus_client/resources/accounts/FollowsRest.java b/app/src/main/java/org/ntlab/acanthus_client/resources/accounts/FollowsRest.java index 79d6bab..836f2af 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/resources/accounts/FollowsRest.java +++ b/app/src/main/java/org/ntlab/acanthus_client/resources/accounts/FollowsRest.java @@ -1,7 +1,7 @@ package org.ntlab.acanthus_client.resources.accounts; import org.ntlab.acanthus_client.entities.FollowAddJson; -import org.ntlab.acanthus_client.entities.FollowUidJson; +import org.ntlab.acanthus_client.entities.FollowJson; import retrofit2.Call; import retrofit2.http.DELETE; @@ -17,7 +17,7 @@ //アカウント別のフォロー情報を取得するメソッド @GET("accounts/{uid}/follows") - Call getFollows( + Call getFollows( @Path("uid") Integer uid );