1 files changed, 23 insertions, 15 deletions

diff --git a/juick-xmpp/src/main/java/com/juick/components/s2s/ConnectionRouter.java b/juick-xmpp/src/main/java/com/juick/components/s2s/ConnectionRouter.java
index 9272a3d0..cb3bc46f 100644
--- a/juick-xmpp/src/main/java/com/juick/components/s2s/ConnectionRouter.java
+++ b/juick-xmpp/src/main/java/com/juick/components/s2s/ConnectionRouter.java
@@ -2,9 +2,9 @@ package com.juick.components.s2s;
 
 import com.juick.User;
 import com.juick.components.XMPPServer;
-import com.juick.server.MessagesQueries;
-import com.juick.server.SubscriptionsQueries;
-import com.juick.server.UserQueries;
+import com.juick.service.MessagesService;
+import com.juick.service.SubscriptionService;
+import com.juick.service.UserService;
 import com.juick.xmpp.JID;
 import com.juick.xmpp.Message;
 import com.juick.xmpp.extensions.JuickMessage;
@@ -19,6 +19,7 @@ import org.slf4j.LoggerFactory;
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 
+import javax.inject.Inject;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
@@ -40,6 +41,13 @@ public class ConnectionRouter extends Connection implements Runnable {
     private int componentPort;
     private String password;
 
+    @Inject
+    SubscriptionService subscriptionService;
+    @Inject
+    UserService userService;
+    @Inject
+    MessagesService messagesService;
+
     public ConnectionRouter(XMPPServer s2s, String componentName, int componentPort, String password) throws Exception {
         super(s2s);
         this.componentName = componentName;
@@ -144,11 +152,11 @@ public class ConnectionRouter extends Connection implements Runnable {
         List<String> jids = new ArrayList<>();
 
         if (jmsg.FriendsOnly) {
-            jids = SubscriptionsQueries.getJIDSubscribedToUser(xmpp.jdbc, jmsg.getUser().getUid(), jmsg.FriendsOnly);
+            jids = subscriptionService.getJIDSubscribedToUser(jmsg.getUser().getUid(), jmsg.FriendsOnly);
         } else {
-            List<User> users = SubscriptionsQueries.getSubscribedUsers(xmpp.jdbc, jmsg.getUser().getUid(), jmsg.getMid());
+            List<User> users = subscriptionService.getSubscribedUsers(jmsg.getUser().getUid(), jmsg.getMid());
             for (User user : users) {
-                for (String jid : UserQueries.getJIDsbyUID(xmpp.jdbc, user.getUid())) {
+                for (String jid : userService.getJIDsbyUID(user.getUid())) {
                     jids.add(jid);
                 }
             }
@@ -189,11 +197,11 @@ public class ConnectionRouter extends Connection implements Runnable {
         String replyQuote;
         String replyTo;
 
-        users = SubscriptionsQueries.getUsersSubscribedToComments(xmpp.jdbc, jmsg.getMid(), jmsg.getUser().getUid());
-        com.juick.Message replyMessage = jmsg.getReplyto() > 0 ? MessagesQueries.getReply(xmpp.jdbc, jmsg.getMid(), jmsg.getReplyto())
-                : MessagesQueries.getMessage(xmpp.jdbc, jmsg.getMid());
+        users = subscriptionService.getUsersSubscribedToComments(jmsg.getMid(), jmsg.getUser().getUid());
+        com.juick.Message replyMessage = jmsg.getReplyto() > 0 ? messagesService.getReply(jmsg.getMid(), jmsg.getReplyto())
+                : messagesService.getMessage(jmsg.getMid());
         replyTo = replyMessage.getUser().getName();
-        com.juick.Message fullReply = MessagesQueries.getReply(xmpp.jdbc, jmsg.getMid(), jmsg.getRid());
+        com.juick.Message fullReply = messagesService.getReply(jmsg.getMid(), jmsg.getRid());
         replyQuote = fullReply.getReplyQuote();
 
         String txt = "Reply by @" + jmsg.getUser().getName() + ":\n" + replyQuote + "\n@" + replyTo + " ";
@@ -209,7 +217,7 @@ public class ConnectionRouter extends Connection implements Runnable {
         msg.type = Message.Type.chat;
         msg.addChild(jmsg);
         for (User user : users) {
-            for (String jid : UserQueries.getJIDsbyUID(xmpp.jdbc, user.getUid())) {
+            for (String jid : userService.getJIDsbyUID(user.getUid())) {
                 msg.to = new JID(jid);
                 xmpp.sendOut(msg);
             }
@@ -219,9 +227,9 @@ public class ConnectionRouter extends Connection implements Runnable {
     public void sendJuickRecommendation(JuickMessage recomm) {
         List<User> users;
         JuickMessage jmsg;
-        jmsg = new JuickMessage(MessagesQueries.getMessage(xmpp.jdbc, recomm.getMid()));
-        users = SubscriptionsQueries.getUsersSubscribedToUserRecommendations(xmpp.jdbc,
-                recomm.getUser().getUid(), recomm.getMid(), jmsg.getUser().getUid());
+        jmsg = new JuickMessage(messagesService.getMessage(recomm.getMid()));
+        users = subscriptionService.getUsersSubscribedToUserRecommendations(recomm.getUser().getUid(),
+                recomm.getMid(), jmsg.getUser().getUid());
 
         String txt = "Recommended by @" + recomm.getUser().getName() + ":\n";
         txt += "@" + jmsg.getUser().getName() + ":" + jmsg.getTagsString() + "\n";
@@ -257,7 +265,7 @@ public class ConnectionRouter extends Connection implements Runnable {
         }
 
         for (User user : users) {
-            for (String jid : UserQueries.getJIDsbyUID(xmpp.jdbc, user.getUid())) {
+            for (String jid : userService.getJIDsbyUID(user.getUid())) {
                 msg.to = new JID(jid);
                 xmpp.sendOut(msg);
             }