From 9f2503cf924d79f00cb0956d37daf10e7a163163 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Tue, 28 Jun 2016 14:40:55 +0300
Subject: gretty

---
 src/main/java/com/juick/ws/XMPPConnection.java                       | 5 ++---
 src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java | 4 ----
 2 files changed, 2 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/main/java/com/juick/ws/XMPPConnection.java b/src/main/java/com/juick/ws/XMPPConnection.java
index 802271a0..8194862c 100644
--- a/src/main/java/com/juick/ws/XMPPConnection.java
+++ b/src/main/java/com/juick/ws/XMPPConnection.java
@@ -31,15 +31,14 @@ public class XMPPConnection implements Runnable, Stream.StreamListener, Message.
 
     @Inject
     JdbcTemplate sql;
-    @Inject
-    Environment env;
     Stream xmpp;
     String xmppPassword;
     MessageSerializer ms;
     @Inject
     WebsocketComponent ws;
 
-    public XMPPConnection() {
+    @Inject
+    public XMPPConnection(Environment env) {
         xmppPassword = env.getProperty("xmpp_password");
         ms = new MessageSerializer();
         new Thread(this).start();
diff --git a/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java b/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java
index 46ef8486..b0393038 100644
--- a/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java
+++ b/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java
@@ -41,10 +41,6 @@ public class WebsocketConfiguration extends WebMvcConfigurerAdapter implements W
         dataSource.setUrl(env.getProperty("datasource_url"));
         return new JdbcTemplate(dataSource);
     }
-    @Bean
-    XMPPConnection xmpp() {
-        return new XMPPConnection();
-    }
     @Override
     public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) {
         registry.addHandler(wsHandler(), "/");
-- 
cgit v1.2.3