diff --git a/src/main/java/org/ntlab/citrusserver/resources/AccountsRest.java b/src/main/java/org/ntlab/citrusserver/resources/AccountsRest.java index 7b1759c..fcc7a81 100644 --- a/src/main/java/org/ntlab/citrusserver/resources/AccountsRest.java +++ b/src/main/java/org/ntlab/citrusserver/resources/AccountsRest.java @@ -20,7 +20,7 @@ accountManager = am; } -///accountの一覧を返す + //accountの一覧を返す @GET @Produces(MediaType.APPLICATION_JSON) public Set getAccount(){ @@ -28,19 +28,19 @@ } -//accountの新規作成 + //accountの新規作成 @POST @Consumes(MediaType.APPLICATION_FORM_URLENCODED)//bodyに入力する値がある時 - public String signup(@FormParam("account_id") String account_id, @FormParam("password") String password) { + public String signup(@FormParam("account_id") String accountId, @FormParam("password") String password) { String token; - token = accountManager.newAccount(account_id, password); + token = accountManager.createAccount(accountId, password); return token; } ////////// @Path("/{account_id}") -//account_idの情報を返す”introduction”と[本] + //account_idの情報を返す”introduction”と[本] @GET @Produces(MediaType.APPLICATION_JSON) public Account getAccountInfo(@PathParam("account_id") String accountId){ //account_idを渡してManegerから値が返ってくる @@ -48,33 +48,33 @@ return ac; } - @DELETE +// @DELETE /////// - @Path("/{account_id}/password") +// @Path("/{account_id}/password") //// // @PUT // // ///////// @Path("/accounts/{account_id}/introduction") -//自己紹介を返す + //自己紹介を返す @GET @Produces(MediaType.APPLICATION_JSON) - public String getAccount(@PathParam("account_id") String account_id){ //account_idを渡してintroductionが返ってくる - String ac = accountManager.AccountIntro(account_id); + public String getAccount(@PathParam("account_id") String accountId){ //account_idを渡してintroductionが返ってくる + String ac = accountManager.AccountIntro(accountId); return ac; } - @PUT +// @PUT ///////// // @Path("/accounts/{account_id}/photo") -////画像を返す +// //画像を返す // @GET -// public String getAccount(@PathParam("account_id") String account_id){ //account_idを渡してManegerから値が返ってくる -// Account ac = accountManager.getAccount(account_id); +// public String getAccount(@PathParam("account_id") String accountId){ //account_idを渡してManegerから値が返ってくる +// Account ac = accountManager.getAccount(accountId); // return ac.getPhoto(); // } // @@ -82,31 +82,31 @@ ///////// @Path("/accounts/{account_id}/favorites") -//お気に入りの本のリストを返す + //指定されたIDのお気に入りの本のリストを返す @GET @Produces(MediaType.APPLICATION_JSON) - public ArrayList> favoriteBook(@PathParam("account_id") String account_id, @QueryParam("token")String token){ - return accountManager.favoriteBook(account_id,token); + public ArrayList> favoriteBook(@PathParam("account_id") String accountId, @QueryParam("token")String token){ + return accountManager.favoriteBook(accountId,token); } //////// @Path("/accounts/{account_id}/favorites/{other_account_id}") -//お気に入りの本のリストを返す + //指定されたIDのお気に入りの本のリストを返す(指定した人物) @GET @Produces(MediaType.APPLICATION_JSON) - public ArrayList FavoriteBook(@PathParam("account_id") String account_id,@PathParam("other_account_id") String other_account_id,@QueryParam("token")String token){ //account_idを渡してManegerから値が返ってくる - return accountManager.FavoriteBook(account_id,other_account_id,token); + public ArrayList FavoriteBook(@PathParam("account_id") String accountId,@PathParam("other_account_id") String otherAccountId,@QueryParam("token")String token){ //account_idを渡してManegerから値が返ってくる + return accountManager.FavoriteBook(accountId,otherAccountId,token); } +////////// +// @Path("/accounts/{account_id}/favorites/{other_account_id}/{book_id}") +// @DELETE +// @PUT //////// - @Path("/accounts/{account_id}/favorites/{other_account_id}/{book_id}") - @DELETE - @PUT -//////// - @Path("/accounts/{account_id}/login") - @POST - @Consumes(MediaType.APPLICATION_JSON) - public void login(@PathParam("account_id") String account_id),@FormParam("password") String password) { - accounts.put(account_id, password); - } +// @Path("/accounts/{account_id}/login") +// @POST +// @Consumes(MediaType.APPLICATION_JSON) +// public void login(@PathParam("account_id") String accountId,@FormParam("password") String password) { +// accountManager.put(accountId, password); +// } }