Commit 150bccd

author

Rajeev Kumar Singh

committed

refactor

1 parent bbee3d7 commit 150bccdCopy full SHA for 150bccd

File tree

5 files changed

-46

lines changed

src/main
- java/com/example/websocketdemo
  - config
    - WebSocketConfig.java
  - controller
    - ChatController.java
  - model
    - ChatMessage.java
- resources/static
  - css
    - main.css
  - js
    - main.js

5 files changed

-46

lines changed

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

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@`
`11`	`11`	`@EnableWebSocketMessageBroker`
`12`	`12`	`public class WebSocketConfig extends AbstractWebSocketMessageBrokerConfigurer {`
`13`	`13`
`14`		`-`
`15`	`14`	`@Override`
`16`	`15`	`public void registerStompEndpoints(StompEndpointRegistry registry) {`
`17`	`16`	`registry.addEndpoint("/ws").withSockJS();`

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

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,13 +15,14 @@ public class ChatController {`
`15`	`15`
`16`	`16`	`@MessageMapping("/chat.sendMessage")`
`17`	`17`	`@SendTo("/channel/public")`
`18`		`- public ChatMessage sendMessage(@Payload ChatMessage chatMessage, SimpMessageHeaderAccessorheaderAccessor) {`
	`18`	`+ public ChatMessage sendMessage(@Payload ChatMessage chatMessage) {`
`19`	`19`	`return chatMessage;`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`@MessageMapping("/chat.addUser")`
`23`	`23`	`@SendTo("/channel/public")`
`24`		`- public ChatMessage addUser(@Payload ChatMessage chatMessage, SimpMessageHeaderAccessor headerAccessor) {`
	`24`	`+ public ChatMessage addUser(@Payload ChatMessage chatMessage,`
	`25`	`+ SimpMessageHeaderAccessor headerAccessor) {`
`25`	`26`	`// Add username in web socket session`
`26`	`27`	`headerAccessor.getSessionAttributes().put("username", chatMessage.getSender());`
`27`	`28`	`return chatMessage;`

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

Lines changed: 1 addition & 38 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,21 +1,17 @@`
`1`	`1`	`package com.example.websocketdemo.model;`
`2`	`2`
`3`		`-import java.util.Date;`
`4`		`-`
`5`	`3`	`/**`
`6`	`4`	`* Created by rajeevkumarsingh on 24/07/17.`
`7`	`5`	`*/`
`8`	`6`	`public class ChatMessage {`
`9`	`7`	`private MessageType type;`
`10`	`8`	`private String content;`
`11`	`9`	`private String sender;`
`12`		`- private String timestamp;`
`13`	`10`
`14`	`11`	`public enum MessageType {`
`15`	`12`	`CHAT,`
`16`	`13`	`JOIN,`
`17`		`- LEAVE,`
`18`		`- TYPING`
	`14`	`+ LEAVE`
`19`	`15`	`}`
`20`	`16`
`21`	`17`	`public MessageType getType() {`
`@@ -41,37 +37,4 @@ public String getSender() {`
`41`	`37`	`public void setSender(String sender) {`
`42`	`38`	`this.sender = sender;`
`43`	`39`	`}`
`44`		`-`
`45`		`- public String getTimestamp() {`
`46`		`- return timestamp;`
`47`		`- }`
`48`		`-`
`49`		`- public void setTimestamp(String timestamp) {`
`50`		`- this.timestamp = timestamp;`
`51`		`- }`
`52`		`-`
`53`		`- @Override`
`54`		`- public String toString() {`
`55`		`- return "ChatMessage{" +`
`56`		`- "type=" + type +`
`57`		`- ", content='" + content + '\'' +`
`58`		`- ", sender='" + sender + '\'' +`
`59`		`- ", timestamp='" + timestamp + '\'' +`
`60`		`- '}';`
`61`		`- }`
`62`		`-`
`63`		`- @Override`
`64`		`- public boolean equals(Object o) {`
`65`		`- if (this == o) return true;`
`66`		`- if (o == null \|\| getClass() != o.getClass()) return false;`
`67`		`-`
`68`		`- ChatMessage that = (ChatMessage) o;`
`69`		`-`
`70`		`- return sender != null ? sender.equals(that.sender) : that.sender == null;`
`71`		`- }`
`72`		`-`
`73`		`- @Override`
`74`		`- public int hashCode() {`
`75`		`- return sender != null ? sender.hashCode() : 0;`
`76`		`- }`
`77`	`40`	`}`

`‎src/main/resources/static/css/main.css`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -232,7 +232,7 @@ button.accent {`
`232`	`232`
`233`	`233`	`.chat-header {`
`234`	`234`	`text-align: center;`
`235`		`- padding: 20px15px20px15px;`
	`235`	`+ padding: 15px;`
`236`	`236`	`border-bottom: 1px solid #ececec;`
`237`	`237`	`}`
`238`	`238`

`‎src/main/resources/static/js/main.js`

Lines changed: 2 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,8 @@ var stompClient = null;`
`12`	`12`	`var username = null;`
`13`	`13`
`14`	`14`	`var colors = [`
`15`		`- '#2196F3', '#32c787', '#00BCD4', '#ffc107', '#ff5652', '#ff85af', '#FF9800', '#39bbb0'`
	`15`	`+ '#2196F3', '#32c787', '#00BCD4', '#ff5652',`
	`16`	`+ '#ffc107', '#ff85af', '#FF9800', '#39bbb0'`
`16`	`17`	`];`
`17`	`18`
`18`	`19`	`function connect(event) {`
`@@ -71,11 +72,8 @@ function sendMessage(event) {`
`71`	`72`
`72`	`73`
`73`	`74`	`function onMessageReceived(payload) {`
`74`		`- console.log(payload);`
`75`	`75`	`var message = JSON.parse(payload.body);`
`76`	`76`
`77`		`- console.log("New Message Received : ", message);`
`78`		`-`
`79`	`77`	`var messageElement = document.createElement('li');`
`80`	`78`
`81`	`79`	`if(message.type === 'JOIN') {`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 150bccd

File tree

5 files changed

5 files changed

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

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

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

`‎src/main/resources/static/css/main.css`

`‎src/main/resources/static/js/main.js`

0 commit comments