From eac6e43420a34bd3ad04d3f7e37a4055fad79584 Mon Sep 17 00:00:00 2001 From: Lorenzo Iovino Date: Tue, 11 Jul 2017 19:20:06 +0200 Subject: [PATCH] implementazione persistenza --- .idea/artifacts/TextTwist_jar.xml | 13 + .idea/libraries/redis_clients_jedis_2_9_0.xml | 11 + .idea/workspace.xml | 1214 +++++++++-------- .../client/controllers/GameController.java | 9 - .../client/controllers/MenuController.java | 2 +- .../src/com/texttwist/client/models/Game.java | 71 +- .../com/texttwist/client/pages/GamePage.java | 17 +- .../client/pages/HighscoresPage.java | 3 +- .../com/texttwist/client/pages/HomePage.java | 2 +- .../client/pages/MatchRequestsPage.java | 2 - .../client/pages/MatchSetupPage.java | 2 +- .../com/texttwist/client/pages/MenuPage.java | 2 +- .../src/com/texttwist/client/pages/Page.java | 22 +- .../texttwist/client/pages/RegisterPage.java | 5 +- .../client/services/AuthService.java | 12 +- .../client/services/HighscoresService.java | 39 - .../client/services/NotificationClient.java | 6 +- .../com/texttwist/client/tasks/StartGame.java | 4 +- .../client/tasks/WaitForPlayers.java | 2 +- .../texttwist/client/tasks/WaitForScore.java | 3 +- Commons/src/constants/Config.java | 1 - Commons/src/models/User.java | 4 +- META-INF/MANIFEST.MF | 3 + Server/Server.iml | 2 + Server/src/com/texttwist/server/Server.java | 10 +- .../server/components/AccountsManager.java | 56 +- .../server/components/GameServer.java | 2 +- .../server/components/JedisService.java | 96 ++ .../server/tasks/ComputeHighscores.java | 3 + .../texttwist/server/tasks/ComputeScore.java | 4 + client_1.log | 285 ++++ notificationServer.log | 653 +++++++++ server.log | 52 + 33 files changed, 1876 insertions(+), 736 deletions(-) create mode 100644 .idea/artifacts/TextTwist_jar.xml create mode 100644 .idea/libraries/redis_clients_jedis_2_9_0.xml delete mode 100644 Client/src/com/texttwist/client/services/HighscoresService.java create mode 100644 META-INF/MANIFEST.MF create mode 100644 Server/src/com/texttwist/server/components/JedisService.java create mode 100644 notificationServer.log diff --git a/.idea/artifacts/TextTwist_jar.xml b/.idea/artifacts/TextTwist_jar.xml new file mode 100644 index 0000000..da74d61 --- /dev/null +++ b/.idea/artifacts/TextTwist_jar.xml @@ -0,0 +1,13 @@ + + + $PROJECT_DIR$/out/artifacts/TextTwist_jar + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/redis_clients_jedis_2_9_0.xml b/.idea/libraries/redis_clients_jedis_2_9_0.xml new file mode 100644 index 0000000..3799a93 --- /dev/null +++ b/.idea/libraries/redis_clients_jedis_2_9_0.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 70def8e..007aa13 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,16 +1,43 @@ + + + + + - + + + - + + + + + + + + + + + + + + + + + + + + + - - + + @@ -23,71 +50,22 @@ - + com.texttwist.client.* com.texttwist.client.* + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -95,31 +73,31 @@ - - + + - - + + - - + + - - + + - - + + - - + + @@ -128,8 +106,67 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -146,41 +183,166 @@ - HUGHSCR - HUGHSCO - HUGHSC - HUGHS - HUGH - HUG - HU + highscorelist + gameBox H - HIGH - HIGHSCOR - HIGHSCORE - s - sesso - sess - sessionMane - sessionMana - sessionMan - sessionMa - sessionM - sValid - session - WOR - WO - TO - TOKEN NON - TOKEN NON - WORDS - channel - bufferMEssa - bufferMess + Hi + Higscr + Higsc + Higs + Hig + Highs + HighscoreSe + HighscoreS + Highscore + HighscoresS + HighscoresSe + HighscoresSer + us + users.ad + users.add + J + Je + Jedis + JedisSe + JedisSer + JedisServi + JedisServic + JedisService + JedisService. + JedisService.g + r + remove + + C:\Users\loke\TextTwist\out\production + C:\Users\loke\TextTwist\ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - @@ -296,6 +459,16 @@ + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -576,32 +683,6 @@ - - - - - - - - - - - - - - - - - - - - + + @@ -848,8 +925,12 @@ - - + + + + + + @@ -1340,47 +1421,51 @@ - + + + + + - - + - - - - - - - - - - + + + + + + + + + + + + - - @@ -1391,7 +1476,7 @@ - @@ -1400,235 +1485,139 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + - - + - + - - - + + - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -1643,77 +1632,13 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -1721,106 +1646,248 @@ - + - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + - + - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + TextTwist:jar @@ -1840,6 +1907,7 @@ + jedis-2.1.0-sources - Client + Server - com.github.cliftonlabs:json-simple:2.1.2 + redis.clients:jedis:2.9.0