From f203b7d6605d55a1857b6ee42a93350a7f66937a Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Thu, 22 Mar 2018 01:29:31 +0300 Subject: juick-server: move websocket client to notifications server --- .../java/com/juick/server/WebsocketManager.java | 2 ++ .../server/configuration/ApiAppConfiguration.java | 36 ++-------------------- 2 files changed, 4 insertions(+), 34 deletions(-) (limited to 'juick-server/src/main') diff --git a/juick-server/src/main/java/com/juick/server/WebsocketManager.java b/juick-server/src/main/java/com/juick/server/WebsocketManager.java index 00d6dd28..b63377aa 100644 --- a/juick-server/src/main/java/com/juick/server/WebsocketManager.java +++ b/juick-server/src/main/java/com/juick/server/WebsocketManager.java @@ -34,6 +34,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpHeaders; import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; import org.springframework.web.socket.CloseStatus; import org.springframework.web.socket.PingMessage; import org.springframework.web.socket.TextMessage; @@ -52,6 +53,7 @@ import java.util.List; /** * Created by vitalyster on 28.06.2016. */ +@Component public class WebsocketManager extends TextWebSocketHandler { private static final Logger logger = LoggerFactory.getLogger(WebsocketManager.class); diff --git a/juick-server/src/main/java/com/juick/server/configuration/ApiAppConfiguration.java b/juick-server/src/main/java/com/juick/server/configuration/ApiAppConfiguration.java index 9d31c247..1ca0130f 100644 --- a/juick-server/src/main/java/com/juick/server/configuration/ApiAppConfiguration.java +++ b/juick-server/src/main/java/com/juick/server/configuration/ApiAppConfiguration.java @@ -21,26 +21,19 @@ import com.juick.configuration.DataConfiguration; import com.juick.server.WebsocketManager; import com.juick.server.api.rss.MessagesView; import com.juick.server.api.rss.RepliesView; -import com.juick.server.component.JuickServerComponent; -import com.juick.service.UserService; -import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.scheduling.annotation.EnableScheduling; -import org.springframework.web.servlet.config.annotation.DefaultServletHandlerConfigurer; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import org.springframework.web.servlet.view.BeanNameViewResolver; import org.springframework.web.servlet.view.feed.AbstractRssFeedView; -import org.springframework.web.socket.client.WebSocketConnectionManager; -import org.springframework.web.socket.client.standard.StandardWebSocketClient; import org.springframework.web.socket.config.annotation.EnableWebSocket; import org.springframework.web.socket.config.annotation.WebSocketConfigurer; import org.springframework.web.socket.config.annotation.WebSocketHandlerRegistry; import org.springframework.web.socket.server.standard.ServletServerContainerFactoryBean; -import org.springframework.web.util.UriComponentsBuilder; import springfox.documentation.builders.PathSelectors; import springfox.documentation.builders.RequestHandlerSelectors; import springfox.documentation.service.ApiInfo; @@ -64,23 +57,7 @@ import java.util.Collections; @ComponentScan(basePackages = "com.juick.server") public class ApiAppConfiguration implements WebMvcConfigurer, WebSocketConfigurer { @Inject - UserService userService; - @Value("${api_user:juick}") - private String serviceUser; - @Value("${websocket_url:ws://localhost:8080/ws/}") - private String baseUri; - @Inject - public JuickServerComponent juickServerComponent; - @Bean - public WebSocketConnectionManager connectionManager() { - String websocketURI = UriComponentsBuilder.fromUriString(baseUri) - .queryParam("hash", userService.getHashByUID(userService.getUIDbyName(serviceUser))).build().toUriString(); - return new WebSocketConnectionManager(client(), juickServerComponent, websocketURI); - } - @Bean - public StandardWebSocketClient client() { - return new StandardWebSocketClient(); - } + WebsocketManager websocketManager; @Bean public Docket api() { return new Docket(DocumentationType.SWAGGER_2) @@ -90,15 +67,11 @@ public class ApiAppConfiguration implements WebMvcConfigurer, WebSocketConfigure "2.0", "https://juick.com/help/tos", null, "AGPLv3", "https://www.gnu.org/licenses/agpl-3.0.html", Collections.emptyList())); } - @Bean - public WebsocketManager wsHandler() { - return new WebsocketManager(); - } @Override public void registerWebSocketHandlers(@Nonnull WebSocketHandlerRegistry registry) { //((ServletWebSocketHandlerRegistry) registry).setOrder(Ordered.LOWEST_PRECEDENCE); - registry.addHandler(wsHandler(), "/ws/**").setAllowedOrigins("*"); + registry.addHandler(websocketManager, "/ws/**").setAllowedOrigins("*"); } @Bean @@ -120,9 +93,4 @@ public class ApiAppConfiguration implements WebMvcConfigurer, WebSocketConfigure AbstractRssFeedView repliesView() { return new RepliesView(); } - @Override - public void configureDefaultServletHandling(DefaultServletHandlerConfigurer configurer) { - configurer.enable(); - } - } -- cgit v1.2.3