refactor

Author: Rajeev Kumar Singh

src/main/java/com/example/websocketdemo/config/WebSocketConfig.java

@@ -11,7 +11,6 @@
 @EnableWebSocketMessageBroker
 public class WebSocketConfig extends AbstractWebSocketMessageBrokerConfigurer {
 
-
     @Override
     public void registerStompEndpoints(StompEndpointRegistry registry) {
         registry.addEndpoint("/ws").withSockJS();

src/main/java/com/example/websocketdemo/controller/ChatController.java

@@ -15,13 +15,14 @@ public class ChatController {
 
     @MessageMapping("/chat.sendMessage")
     @SendTo("/channel/public")
-    public ChatMessage sendMessage(@Payload ChatMessage chatMessage, SimpMessageHeaderAccessor headerAccessor) {
+    public ChatMessage sendMessage(@Payload ChatMessage chatMessage) {
         return chatMessage;
     }
 
     @MessageMapping("/chat.addUser")
     @SendTo("/channel/public")
-    public ChatMessage addUser(@Payload ChatMessage chatMessage, SimpMessageHeaderAccessor headerAccessor) {
+    public ChatMessage addUser(@Payload ChatMessage chatMessage,
+                               SimpMessageHeaderAccessor headerAccessor) {
         // Add username in web socket session
         headerAccessor.getSessionAttributes().put("username", chatMessage.getSender());
         return chatMessage;

src/main/java/com/example/websocketdemo/model/ChatMessage.java

@@ -1,21 +1,17 @@
 package com.example.websocketdemo.model;
 
-import java.util.Date;
-
 /**
  * Created by rajeevkumarsingh on 24/07/17.
  */
 public class ChatMessage {
     private MessageType type;
     private String content;
     private String sender;
-    private String timestamp;
 
     public enum MessageType {
         CHAT,
         JOIN,
-        LEAVE,
-        TYPING
+        LEAVE
     }
 
     public MessageType getType() {
@@ -41,37 +37,4 @@ public String getSender() {
     public void setSender(String sender) {
         this.sender = sender;
     }
-
-    public String getTimestamp() {
-        return timestamp;
-    }
-
-    public void setTimestamp(String timestamp) {
-        this.timestamp = timestamp;
-    }
-
-    @Override
-    public String toString() {
-        return "ChatMessage{" +
-                "type=" + type +
-                ", content='" + content + '\'' +
-                ", sender='" + sender + '\'' +
-                ", timestamp='" + timestamp + '\'' +
-                '}';
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-
-        ChatMessage that = (ChatMessage) o;
-
-        return sender != null ? sender.equals(that.sender) : that.sender == null;
-    }
-
-    @Override
-    public int hashCode() {
-        return sender != null ? sender.hashCode() : 0;
-    }
 }

src/main/resources/static/css/main.css

@@ -232,7 +232,7 @@ button.accent {
 
 .chat-header {
     text-align: center;
-    padding: 20px 15px 20px 15px;
+    padding: 15px;
     border-bottom: 1px solid #ececec;
 }
 

src/main/resources/static/js/main.js

@@ -12,7 +12,8 @@ var stompClient = null;
 var username = null;
 
 var colors = [
-    '#2196F3', '#32c787', '#00BCD4', '#ffc107', '#ff5652', '#ff85af', '#FF9800', '#39bbb0'
+    '#2196F3', '#32c787', '#00BCD4', '#ff5652',
+    '#ffc107', '#ff85af', '#FF9800', '#39bbb0'
 ];
 
 function connect(event) {
@@ -71,11 +72,8 @@ function sendMessage(event) {
 
 
 function onMessageReceived(payload) {
-    console.log(payload);
     var message = JSON.parse(payload.body);
 
-    console.log("New Message Received : ", message);
-
     var messageElement = document.createElement('li');
 
     if(message.type === 'JOIN') {