From 64824ed6dddf776ce3ed36fe96ffc300d4127e29 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Mon, 8 Aug 2016 10:26:37 +0300
Subject: juick-ws: read component jids and ports from config

---
 .../java/com/juick/ws/components/PushComponent.java  | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

(limited to 'juick-ws/src/main/java/com/juick/ws/components/PushComponent.java')

diff --git a/juick-ws/src/main/java/com/juick/ws/components/PushComponent.java b/juick-ws/src/main/java/com/juick/ws/components/PushComponent.java
index 11e20ed4..325f4a7e 100644
--- a/juick-ws/src/main/java/com/juick/ws/components/PushComponent.java
+++ b/juick-ws/src/main/java/com/juick/ws/components/PushComponent.java
@@ -32,6 +32,7 @@ import com.juick.xmpp.extensions.JuickMessage;
 import com.juick.xmpp.utils.XmlUtils;
 import com.notnoop.apns.APNS;
 import com.notnoop.apns.ApnsService;
+import org.apache.commons.lang3.math.NumberUtils;
 import org.apache.http.Consts;
 import org.apache.http.Header;
 import org.apache.http.HttpResponse;
@@ -59,8 +60,6 @@ import java.net.Socket;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
@@ -74,7 +73,6 @@ public class PushComponent implements InitializingBean, DisposableBean, Stream.S
 
     private static Logger logger = Logger.getLogger(PushComponent.class.getName());
 
-    private ExecutorService executorService;
     String wns_application_sip;
     String wns_client_secret;
     JdbcTemplate sql;
@@ -88,21 +86,17 @@ public class PushComponent implements InitializingBean, DisposableBean, Stream.S
     @Override
     public void afterPropertiesSet() {
         logger.info("component initialized");
-        executorService = Executors.newSingleThreadExecutor();
-        executorService.submit(() -> {
-            wns_application_sip = env.getProperty("wns_application_sip", "");
-            wns_client_secret = env.getProperty("wns_client_secret", "");
-            GCMSender = new Sender(env.getProperty("gcm_key"));
+        wns_application_sip = env.getProperty("wns_application_sip", "");
+        wns_client_secret = env.getProperty("wns_client_secret", "");
+        GCMSender = new Sender(env.getProperty("gcm_key"));
 
-            setupSql(env.getProperty("datasource_driver", "com.mysql.jdbc.Driver"), env.getProperty("datasource_url", ""));
-            setupXmppComponent(new JID("", env.getProperty("push_jid"), ""), env.getProperty("xmpp_host", "localhost"),
-                    Integer.parseInt(env.getProperty("xmpp_port", "5347")), env.getProperty("push_xmpp_password", ""));
-        });
+        setupSql(env.getProperty("datasource_driver", "com.mysql.jdbc.Driver"), env.getProperty("datasource_url", ""));
+        setupXmppComponent(new JID("", env.getProperty("push_jid"), ""), env.getProperty("xmpp_host", "localhost"),
+                NumberUtils.toInt(env.getProperty("xmpp_port", ""), 5347), env.getProperty("push_xmpp_password", ""));
     }
 
     @Override
     public void destroy() {
-        executorService.shutdown();
         logger.info("component destroyed");
     }
 
-- 
cgit v1.2.3