From e80e13c27e6f06c52a3dc8602cd1f02abdfc3180 Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Wed, 3 Feb 2016 13:54:12 +0300 Subject: WIP --- src/main/java/com/juick/xmpp/s2s/ConnectionListener.java | 8 +++++--- src/main/java/com/juick/xmpp/s2s/S2SComponent.java | 11 +++++++---- 2 files changed, 12 insertions(+), 7 deletions(-) (limited to 'src/main/java/com/juick/xmpp/s2s') diff --git a/src/main/java/com/juick/xmpp/s2s/ConnectionListener.java b/src/main/java/com/juick/xmpp/s2s/ConnectionListener.java index 28ff48f9..320df347 100644 --- a/src/main/java/com/juick/xmpp/s2s/ConnectionListener.java +++ b/src/main/java/com/juick/xmpp/s2s/ConnectionListener.java @@ -1,5 +1,6 @@ package com.juick.xmpp.s2s; +import com.juick.JuickApplication; import com.juick.xmpp.JuickBot; import com.juick.xmpp.Stream; @@ -23,10 +24,11 @@ public class ConnectionListener implements Runnable { JuickBot bot; Stream xmpp; - public ConnectionListener(ExecutorService executorService, JuickBot bot, Stream xmpp) { - this.executorService = executorService; + public ConnectionListener(JuickApplication app, JuickBot bot) { + this.executorService = app.getExecutorService(); + this.xmpp = app.getRouter(); this.bot = bot; - this.xmpp = xmpp; + } @Override diff --git a/src/main/java/com/juick/xmpp/s2s/S2SComponent.java b/src/main/java/com/juick/xmpp/s2s/S2SComponent.java index dcb547fb..b7155643 100644 --- a/src/main/java/com/juick/xmpp/s2s/S2SComponent.java +++ b/src/main/java/com/juick/xmpp/s2s/S2SComponent.java @@ -1,5 +1,6 @@ package com.juick.xmpp.s2s; +import com.juick.JuickApplication; import com.juick.JuickComponent; import com.juick.User; import com.juick.server.MessagesQueries; @@ -33,6 +34,7 @@ public class S2SComponent implements JuickComponent { static final List outConnections = Collections.synchronizedList(new ArrayList<>()); static final List outCache = Collections.synchronizedList(new ArrayList<>()); JdbcTemplate sql; + JuickBot bot; final public static HashMap childParsers = new HashMap<>(); public static void addConnectionIn(ConnectionIn c) { @@ -147,14 +149,15 @@ public class S2SComponent implements JuickComponent { } } - public S2SComponent(JdbcTemplate sql, ExecutorService executorService, Properties conf) { + public S2SComponent(JuickApplication application, Properties conf) { LOGGER.info("component initialized"); HOSTNAME = conf.getProperty("hostname"); componentName = conf.getProperty("componentname"); STATSFILE = conf.getProperty("statsfile"); - this.sql = sql; - this.executorService = executorService; - executorService.submit(new ConnectionListener(executorService)); + this.sql = application.getSql(); + this.executorService = application.getExecutorService(); + this.bot = new JuickBot(application, this); + executorService.submit(new ConnectionListener(application, bot)); executorService.submit(new CleaningUp()); } @Override -- cgit v1.2.3