aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/com/juick/ws/configuration
diff options
context:
space:
mode:
authorGravatar Vitaly Takmazov2016-06-30 11:46:44 +0300
committerGravatar Vitaly Takmazov2016-06-30 11:46:44 +0300
commitdbceb8cb379c44366c1014d282a73457762aabe1 (patch)
treef265954387142c7983928f2db71cc22c715896f3 /src/main/java/com/juick/ws/configuration
parent38040c8f5faaab4fe6d7055ed010533aa1860b07 (diff)
ws injection fix, next
Diffstat (limited to 'src/main/java/com/juick/ws/configuration')
-rw-r--r--src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java14
1 files changed, 11 insertions, 3 deletions
diff --git a/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java b/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java
index 0bb293f4..223f8d63 100644
--- a/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java
+++ b/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java
@@ -1,6 +1,7 @@
package com.juick.ws.configuration;
import com.juick.ws.WebsocketComponent;
+import com.juick.ws.XMPPConnection;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
@@ -10,12 +11,13 @@ import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.datasource.DriverManagerDataSource;
import org.springframework.web.servlet.config.annotation.EnableWebMvc;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
-import org.springframework.web.socket.WebSocketHandler;
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 javax.inject.Inject;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
/**
* Created by vitalyster on 28.06.2016.
@@ -28,12 +30,18 @@ import javax.inject.Inject;
public class WebsocketConfiguration extends WebMvcConfigurerAdapter implements WebSocketConfigurer {
@Inject
Environment env;
-
+ ExecutorService xmppThread = Executors.newSingleThreadExecutor();
@Bean
- WebSocketHandler wsHandler() {
+ WebsocketComponent wsHandler() {
return new WebsocketComponent();
}
@Bean
+ XMPPConnection xmpp() {
+ XMPPConnection xmpp = new XMPPConnection(env, wsHandler());
+ xmppThread.submit(xmpp);
+ return xmpp;
+ }
+ @Bean
JdbcTemplate jdbc() {
DriverManagerDataSource dataSource = new DriverManagerDataSource();
dataSource.setDriverClassName(env.getProperty("datasource_driver", "com.mysql.jdbc.Driver"));