# Conflicts: # application/src/main/java/org/thingsboard/server/controller/plugin/TbWebSocketHandler.java # application/src/main/java/org/thingsboard/server/service/ws/DefaultWebSocketService.java # application/src/test/java/org/thingsboard/server/controller/BaseWebsocketApiTest.java # application/src/test/java/org/thingsboard/server/controller/TbTestWebSocketClient.java