diff --git a/src/main/java/com/ntlab/irisserver/resources/KeywordsRest.java b/src/main/java/com/ntlab/irisserver/resources/KeywordsRest.java new file mode 100644 index 0000000..3bdc387 --- /dev/null +++ b/src/main/java/com/ntlab/irisserver/resources/KeywordsRest.java @@ -0,0 +1,27 @@ +package com.ntlab.irisserver.resources; + +import org.springframework.stereotype.Component; +import com.ntlab.irisserver.models.KeywordManager; + + +import javax.ws.rs.*; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; + + +@Component +@Path("/keywords") + +public class KeywordsRest { + + @GET + @Produces(MediaType.APPLICATION_JSON) + public String[] getKeywords(){ + KeywordManager km = KeywordManager.getInstance(); + String[] keywords = km.getKeywords(); + + return keywords; + } + + +} diff --git a/src/main/java/com/ntlab/irisserver/resources/StateRest.java b/src/main/java/com/ntlab/irisserver/resources/StateRest.java index 5f6e482..fabad30 100644 --- a/src/main/java/com/ntlab/irisserver/resources/StateRest.java +++ b/src/main/java/com/ntlab/irisserver/resources/StateRest.java @@ -15,7 +15,9 @@ public class StateRest { @GET//部屋の情報を入手 + @Path("/{rid}/state") + public int getState(@PathParam("rid") String rid) { RoomManager rm = RoomManager.getInstance(); Room room = rm.getRoom(rid); @@ -30,7 +32,9 @@ } //---------------------------------------------------------------------------------------------------------------------------------- @PUT//部屋の情報を変更する + @Path("/{rid}/state") + //rid,nickname,stateを引数として持ってくる public void putState(@PathParam("rid") String rid,@FormParam("nickname") String nickname,@FormParam("state") Integer state) {