Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Alexandre Ducarne
ai12-othello
Commits
1fa865bd
Commit
1fa865bd
authored
Nov 26, 2019
by
Corentin-Boulanger
Committed by
alexandre.ducarne
Nov 27, 2019
Browse files
Begin refactor of messages process data
parent
6c0458e8
Changes
7
Hide whitespace changes
Inline
Side-by-side
src/main/java/client/network/MessageClientController.java
View file @
1fa865bd
...
...
@@ -2,6 +2,8 @@ package main.java.client.network;
import
main.java.client.network.messages.clientToServer.ChatMessageToServerMessage
;
import
main.java.client.network.messages.clientToServer.LoginUserToServerMessage
;
import
main.java.common.message.MessageMeta
;
import
main.java.server.network.messages.serverToClient.ServerStateOnConnectionMessage
;
import
java.util.Optional
;
import
main.java.client.network.messages.clientToServer.NewGameToServerMessage
;
...
...
@@ -14,7 +16,7 @@ public class MessageClientController {
private
static
MessageClientController
instance
=
new
MessageClientController
();
private
WebSocketStompSessionHandler
wsHandler
;
private
ComCoreClient
comCore
;
public
ComCoreClient
getComCore
()
{
return
comCore
;
}
...
...
@@ -53,6 +55,9 @@ public class MessageClientController {
wsHandler
.
sendMessage
(
message
);
}
public
void
processData
(
MessageMeta
message
)
{
}
void
sendNewGameAvailableToServer
(
NewGameToServerMessage
message
)
{
wsHandler
.
sendMessage
(
message
);
}
...
...
src/main/java/client/network/WebSocketStompSessionHandler.java
View file @
1fa865bd
...
...
@@ -79,7 +79,7 @@ public class WebSocketStompSessionHandler extends StompSessionHandlerAdapter {
public
void
handleFrame
(
StompHeaders
headers
,
Object
payload
)
{
MessageMeta
message
=
(
MessageMeta
)
payload
;
LOGGER
.
info
(
"New server message received : "
+
message
.
toString
());
m
essage
.
processData
();
M
essage
ClientController
.
getInstance
()
.
processData
(
message
);
}
}
src/main/java/client/network/messages/clientToServer/LoginUserToServerMessage.java
View file @
1fa865bd
...
...
@@ -31,7 +31,6 @@ public class LoginUserToServerMessage extends MessageMeta {
@Override
public
void
processData
()
{
MessageServerController
.
getInstance
().
getComCore
().
getComToData
().
addAuthenticatedPlayer
(
this
.
userToAdd
);
}
public
UserLight
getUserToAdd
()
{
...
...
src/main/java/common/dataModel/UserLight.java
View file @
1fa865bd
...
...
@@ -25,7 +25,11 @@ public class UserLight extends UserMeta {
super
(
id
,
pseudo
);
}
public
String
getLastName
()
{
public
UserLight
()
{
super
();
}
public
String
getLastName
()
{
return
lastName
;
}
...
...
src/main/java/common/dataModel/UserMeta.java
View file @
1fa865bd
...
...
@@ -11,6 +11,9 @@ abstract class UserMeta {
this
.
pseudo
=
pseudo
;
}
public
UserMeta
()
{
}
public
UUID
getId
()
{
return
id
;
}
...
...
src/main/java/server/network/MessageServerController.java
View file @
1fa865bd
package
main.java.server.network
;
import
java.util.Optional
;
import
main.java.client.network.messages.clientToServer.LoginUserToServerMessage
;
import
main.java.common.message.MessageMeta
;
import
main.java.common.dataModel.Message
;
import
main.java.server.network.messages.serverToClient.NewUserAddedMessage
;
import
main.java.server.network.messages.serverToClient.ServerStateOnConnectionMessage
;
...
...
@@ -74,6 +78,14 @@ public class MessageServerController {
wsController
.
sendMessage
(
message
);
}
public
void
processData
(
MessageMeta
message
)
{
switch
(
message
.
getClass
().
toString
())
{
case
"LoginUserToServerMessage"
:
LoginUserToServerMessage
msg
=
(
LoginUserToServerMessage
)
message
;
MessageServerController
.
getInstance
().
getComCore
().
getComToData
().
addAuthenticatedPlayer
(
msg
.
getUserToAdd
());
}
}
/**
* Use the gameId to find endpoint of all connected clients to this game chatroom and
* sends message to the endpoint for them to receive the message
...
...
src/main/java/server/network/WebSocketController.java
View file @
1fa865bd
...
...
@@ -39,6 +39,6 @@ public class WebSocketController {
@MessageMapping
(
"/serverMessages"
)
public
void
onMessageReceived
(
MessageMeta
message
)
{
LOGGER
.
info
(
"New client message received : "
+
message
.
toString
());
m
essage
.
processData
();
M
essage
ServerController
.
getInstance
()
.
processData
(
message
);
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment