diff --git a/src/main/java/algoLike/push/AttackerA.java b/src/main/java/algoLike/push/AttackerA.java index 5bd76a8..c29cb71 100644 --- a/src/main/java/algoLike/push/AttackerA.java +++ b/src/main/java/algoLike/push/AttackerA.java @@ -7,17 +7,25 @@ import org.springframework.stereotype.Component; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.core.JsonProcessingException; +import pushPullRefactor.Getter; +import pushPullRefactor.Message; +import pushPullRefactor.Resource; +import pushPullRefactor.State; @Path("/attackerA") @Component +@Resource("attackerA") public class AttackerA { + @State private int value; @PUT + @Message({}) public void setAttackerA(@FormParam("a") int a) { this.value = a; } @Produces(MediaType.APPLICATION_JSON) @GET + @Getter public int getValue() { return value; } diff --git a/src/main/java/algoLike/push/AttackerB.java b/src/main/java/algoLike/push/AttackerB.java index 217b861..5d308f3 100644 --- a/src/main/java/algoLike/push/AttackerB.java +++ b/src/main/java/algoLike/push/AttackerB.java @@ -7,17 +7,25 @@ import org.springframework.stereotype.Component; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.core.JsonProcessingException; +import pushPullRefactor.Getter; +import pushPullRefactor.Message; +import pushPullRefactor.Resource; +import pushPullRefactor.State; @Path("/attackerB") @Component +@Resource("attackerB") public class AttackerB { + @State private int value; @PUT + @Message({}) public void setAttackerB(@FormParam("b") int b) { this.value = b; } @Produces(MediaType.APPLICATION_JSON) @GET + @Getter public int getValue() { return value; } diff --git a/src/main/java/algoLike/push/Deck.java b/src/main/java/algoLike/push/Deck.java index 88c9162..ff3fc89 100644 --- a/src/main/java/algoLike/push/Deck.java +++ b/src/main/java/algoLike/push/Deck.java @@ -7,15 +7,22 @@ import org.springframework.stereotype.Component; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.core.JsonProcessingException; +import pushPullRefactor.Getter; +import pushPullRefactor.Message; +import pushPullRefactor.Resource; +import pushPullRefactor.State; @Path("/deck") @Component +@Resource("deck") public class Deck { private Map.Entry resultByDrawingA; private Map.Entry resultByDrawingB; + @State private List> value = new ArrayList>(); @Path("/resultByDrawingA") @POST + @Message({"resultByDrawingA"}) public void updateResultByDrawingA(@FormParam("resultByDrawingA") String resultByDrawingA_json) throws JsonProcessingException { Map.Entry resultByDrawingA; { @@ -27,6 +34,7 @@ } @Path("/resultByDrawingB") @POST + @Message({"resultByDrawingB"}) public void updateResultByDrawingB(@FormParam("resultByDrawingB") String resultByDrawingB_json) throws JsonProcessingException { Map.Entry resultByDrawingB; { @@ -42,6 +50,7 @@ } @Produces(MediaType.APPLICATION_JSON) @GET + @Getter public List> getValue() { return value; } diff --git a/src/main/java/algoLike/push/GuessA.java b/src/main/java/algoLike/push/GuessA.java index 9e31cf3..f965a01 100644 --- a/src/main/java/algoLike/push/GuessA.java +++ b/src/main/java/algoLike/push/GuessA.java @@ -7,10 +7,15 @@ import org.springframework.stereotype.Component; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.core.JsonProcessingException; +import pushPullRefactor.Getter; +import pushPullRefactor.Resource; +import pushPullRefactor.State; @Path("/guessA") @Component +@Resource("guessA") public class GuessA { + @State private int value = 0; @PUT public void setGuessA(@FormParam("a") int a) { @@ -18,6 +23,7 @@ } @Produces(MediaType.APPLICATION_JSON) @GET + @Getter public int getValue() { return value; } diff --git a/src/main/java/algoLike/push/GuessB.java b/src/main/java/algoLike/push/GuessB.java index efa8856..958c492 100644 --- a/src/main/java/algoLike/push/GuessB.java +++ b/src/main/java/algoLike/push/GuessB.java @@ -7,17 +7,25 @@ import org.springframework.stereotype.Component; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.core.JsonProcessingException; +import pushPullRefactor.Getter; +import pushPullRefactor.Message; +import pushPullRefactor.Resource; +import pushPullRefactor.State; @Path("/guessB") @Component +@Resource("guessB") public class GuessB { + @State private int value = 0; @PUT + @Message({}) public void setGuessB(@FormParam("b") int b) { this.value = b; } @Produces(MediaType.APPLICATION_JSON) @GET + @Getter public int getValue() { return value; } diff --git a/src/main/java/algoLike/push/HandsB.java b/src/main/java/algoLike/push/HandsB.java index 4031a73..69e8949 100644 --- a/src/main/java/algoLike/push/HandsB.java +++ b/src/main/java/algoLike/push/HandsB.java @@ -7,18 +7,25 @@ import org.springframework.stereotype.Component; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.core.JsonProcessingException; +import pushPullRefactor.Getter; +import pushPullRefactor.Message; +import pushPullRefactor.Resource; +import pushPullRefactor.State; @Path("/handsB") @Component +@Resource("handsB") public class HandsB { private Client client = ClientBuilder.newClient(); private Map.Entry resultByDrawingB; private Map.Entry resultByDrawingA; private Map.Entry> resultBySelectingB; private Map.Entry> resultBySelectingA; + @State private List> value = new ArrayList>(); @Path("/resultByDrawingB") @POST + @Message({"resultByDrawingB","deck"}) public void updateResultByDrawingB(@FormParam("resultByDrawingB") String resultByDrawingB_json, @FormParam("deck") List deck_json) throws JsonProcessingException { List> deck = new ArrayList<>(); for (String str: deck_json) { @@ -51,6 +58,7 @@ } @Path("/resultByDrawingA") @POST + @Message({"resultByDrawingA","deck"}) public void updateResultByDrawingA(@FormParam("resultByDrawingA") String resultByDrawingA_json, @FormParam("deck") List deck_json) throws JsonProcessingException { List> deck = new ArrayList<>(); for (String str: deck_json) { @@ -80,6 +88,7 @@ } @Path("/resultBySelectingB") @POST + @Message({"resultBySelectingA"}) public void updateResultBySelectingB(@FormParam("resultBySelectingB") String resultBySelectingB_json) throws JsonProcessingException { Map.Entry> resultBySelectingB; { @@ -104,6 +113,7 @@ } @Path("/resultBySelectingA") @POST + @Message({"resultBySelectingA"}) public void updateResultBySelectingA(@FormParam("resultBySelectingA") String resultBySelectingA_json) throws JsonProcessingException { Map.Entry> resultBySelectingA; { @@ -128,6 +138,7 @@ } @Produces(MediaType.APPLICATION_JSON) @GET + @Getter public List> getValue() { return value; } diff --git a/src/main/java/algoLike/push/LoseB.java b/src/main/java/algoLike/push/LoseB.java index ae0fff5..887312b 100644 --- a/src/main/java/algoLike/push/LoseB.java +++ b/src/main/java/algoLike/push/LoseB.java @@ -8,12 +8,19 @@ import org.springframework.stereotype.Component; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.core.JsonProcessingException; +import pushPullRefactor.Getter; +import pushPullRefactor.Message; +import pushPullRefactor.Resource; +import pushPullRefactor.State; @Path("/loseB") @Component +@Resource("loseB") public class LoseB { + @State private boolean value; @PUT + @Message({"handsB"}) public void updateHandsB(@FormParam("handsB") List handsB_json) throws JsonProcessingException { List> handsB = new ArrayList<>(); for (String str: handsB_json) { @@ -24,6 +31,7 @@ } @Produces(MediaType.APPLICATION_JSON) @GET + @Getter public boolean getValue() { return value; } diff --git a/src/main/java/algoLike/push/ResultByDrawingA.java b/src/main/java/algoLike/push/ResultByDrawingA.java index 8917448..15af945 100644 --- a/src/main/java/algoLike/push/ResultByDrawingA.java +++ b/src/main/java/algoLike/push/ResultByDrawingA.java @@ -7,13 +7,20 @@ import org.springframework.stereotype.Component; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.core.JsonProcessingException; +import pushPullRefactor.Getter; +import pushPullRefactor.Message; +import pushPullRefactor.Resource; +import pushPullRefactor.State; @Path("/resultByDrawingA") @Component +@Resource("resultByDrawingA") public class ResultByDrawingA { private Client client = ClientBuilder.newClient(); + @State private Map.Entry value; @PUT + @Message({}) public void drawAndAttackA(@FormParam("g") int g, @FormParam("b") List> b, @FormParam("t") int t) throws JsonProcessingException { this.value = new AbstractMap.SimpleEntry<>((b.get(t).getKey()==g), t); List> deck_json = client.target("http://localhost:8080").path("/deck").request().get(ArrayList.class); @@ -42,6 +49,7 @@ } @Produces(MediaType.APPLICATION_JSON) @GET + @Getter public Map.Entry getValue() { return value; } diff --git a/src/main/java/algoLike/push/ResultByDrawingB.java b/src/main/java/algoLike/push/ResultByDrawingB.java index 49a1944..b333d52 100644 --- a/src/main/java/algoLike/push/ResultByDrawingB.java +++ b/src/main/java/algoLike/push/ResultByDrawingB.java @@ -7,13 +7,20 @@ import org.springframework.stereotype.Component; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.core.JsonProcessingException; +import pushPullRefactor.Getter; +import pushPullRefactor.Message; +import pushPullRefactor.Resource; +import pushPullRefactor.State; @Path("/resultByDrawingB") @Component +@Resource("resultByDrawingB") public class ResultByDrawingB { private Client client = ClientBuilder.newClient(); + @State private Map.Entry value; @PUT + @Message({}) public void drawAndAttackB(@FormParam("g") int g, @FormParam("a") List> a, @FormParam("t") int t) throws JsonProcessingException { this.value = new AbstractMap.SimpleEntry<>((a.get(t).getKey()==g), t); List> deck_json = client.target("http://localhost:8080").path("/deck").request().get(ArrayList.class); @@ -42,6 +49,7 @@ } @Produces(MediaType.APPLICATION_JSON) @GET + @Getter public Map.Entry getValue() { return value; } diff --git a/src/main/java/algoLike/push/ResultBySelectingA.java b/src/main/java/algoLike/push/ResultBySelectingA.java index 1e724ef..3cd80c7 100644 --- a/src/main/java/algoLike/push/ResultBySelectingA.java +++ b/src/main/java/algoLike/push/ResultBySelectingA.java @@ -7,13 +7,20 @@ import org.springframework.stereotype.Component; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.core.JsonProcessingException; +import pushPullRefactor.Getter; +import pushPullRefactor.Message; +import pushPullRefactor.Resource; +import pushPullRefactor.State; @Path("/resultBySelectingA") @Component +@Resource("resultBySelectingA") public class ResultBySelectingA { private Client client = ClientBuilder.newClient(); + @State private Map.Entry> value; @PUT + @Message({}) public void selectAndAttackA(@FormParam("t") int t, @FormParam("g") int g, @FormParam("b") List> b, @FormParam("a") int a) throws JsonProcessingException { this.value = new AbstractMap.SimpleEntry<>((b.get(t).getKey()==g), new AbstractMap.SimpleEntry<>(t, a)); Form form = new Form(); @@ -27,6 +34,7 @@ } @Produces(MediaType.APPLICATION_JSON) @GET + @Getter public Map.Entry> getValue() { return value; } diff --git a/src/main/java/algoLike/push/ResultBySelectingB.java b/src/main/java/algoLike/push/ResultBySelectingB.java index 4aac012..7c62a32 100644 --- a/src/main/java/algoLike/push/ResultBySelectingB.java +++ b/src/main/java/algoLike/push/ResultBySelectingB.java @@ -7,13 +7,21 @@ import org.springframework.stereotype.Component; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.core.JsonProcessingException; +import org.springframework.stereotype.Repository; +import pushPullRefactor.Getter; +import pushPullRefactor.Message; +import pushPullRefactor.Resource; +import pushPullRefactor.State; @Path("/resultBySelectingB") @Component +@Resource("resultBySelecting") public class ResultBySelectingB { private Client client = ClientBuilder.newClient(); + @State private Map.Entry> value; @PUT + @Message({}) public void selectAndAttackB(@FormParam("t") int t, @FormParam("g") int g, @FormParam("a") List> a, @FormParam("atk") int atk) throws JsonProcessingException { this.value = new AbstractMap.SimpleEntry<>((a.get(t).getKey()==g), new AbstractMap.SimpleEntry<>(t, atk) ); Form form = new Form(); @@ -27,6 +35,7 @@ } @Produces(MediaType.APPLICATION_JSON) @GET + @Getter public Map.Entry> getValue() { return value; } diff --git a/src/main/java/algoLike/push/TargetA.java b/src/main/java/algoLike/push/TargetA.java index 72e2406..3a4d297 100644 --- a/src/main/java/algoLike/push/TargetA.java +++ b/src/main/java/algoLike/push/TargetA.java @@ -7,17 +7,25 @@ import org.springframework.stereotype.Component; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.core.JsonProcessingException; +import pushPullRefactor.Getter; +import pushPullRefactor.Message; +import pushPullRefactor.Resource; +import pushPullRefactor.State; @Path("/targetA") @Component +@Resource("targetA") public class TargetA { + @State private int value; @PUT + @Message({}) public void setTargetA(@FormParam("a") int a) { this.value = a; } @Produces(MediaType.APPLICATION_JSON) @GET + @Getter public int getValue() { return value; } diff --git a/src/main/java/algoLike/push/TargetB.java b/src/main/java/algoLike/push/TargetB.java index 04a58de..34df139 100644 --- a/src/main/java/algoLike/push/TargetB.java +++ b/src/main/java/algoLike/push/TargetB.java @@ -7,17 +7,25 @@ import org.springframework.stereotype.Component; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.core.JsonProcessingException; +import pushPullRefactor.Getter; +import pushPullRefactor.Message; +import pushPullRefactor.Resource; +import pushPullRefactor.State; @Path("/targetB") @Component +@Resource("targetB") public class TargetB { + @State private int value; @PUT + @Message({}) public void setTargetB(@FormParam("b") int b) { this.value = b; } @Produces(MediaType.APPLICATION_JSON) @GET + @Getter public int getValue() { return value; }