almost working messages api

1 files changed, 19 insertions, 12 deletions

diff --git a/src/main/java/com/juick/api/Main.java b/src/main/java/com/juick/api/Main.java
index cdced593..cc068ccd 100644
--- a/src/main/java/com/juick/api/Main.java
+++ b/src/main/java/com/juick/api/Main.java
@@ -29,11 +29,13 @@ import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.net.Socket;
 import java.util.Properties;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.logging.LogManager;
 
 /**
  *
@@ -54,37 +56,38 @@ public class Main extends HttpServlet implements Stream.StreamListener {
     public void init() throws ServletException {
         super.init();
         try {
+            LogManager.getLogManager().readConfiguration(getServletContext().getResourceAsStream("WEB-INF/logging.properties"));
             Properties conf = new Properties();
-            conf.load(new FileInputStream("/etc/juick/api.conf"));
-            final String driverClassName = "com.mysql.jdbc.Driver";
+            conf.load(getServletContext().getResourceAsStream("WEB-INF/juick.conf"));
             DriverManagerDataSource dataSource = new DriverManagerDataSource();
-            dataSource.setUrl("jdbc:mysql://localhost/juick?autoReconnect=true&user=" + conf.getProperty("mysql_username", "") + "&password=" + conf.getProperty("mysql_password", ""));
-            dataSource.setDriverClassName(driverClassName);
+            dataSource.setDriverClassName(conf.getProperty("datasource_driver"));
+            dataSource.setUrl(conf.getProperty("datasource_url"));
             jdbc = new JdbcTemplate(dataSource);
             messages = new Messages(jdbc);
             users = new Users(jdbc);
             pm = new PM(jdbc);
             others = new Others(jdbc);
 
-            setupXmppComponent(conf.getProperty("xmpp_password"));
+            setupXmppComponent(conf.getProperty("xmpp_host", "localhost"), Integer.parseInt(conf.getProperty("xmpp_port", "5347")),
+                    conf.getProperty("xmpp_jid", "api.localhost"), conf.getProperty("xmpp_password"));
 
         } catch (IOException e) {
             log("API initialization error", e);
         }
     }
 
-    public void setupXmppComponent(final String password) {
-        Thread thr = new Thread(() -> {
+    public void setupXmppComponent(final String host, final int port, final String jid, final String password) {
+        ExecutorService executorService = Executors.newSingleThreadExecutor();
+        executorService.submit(() -> {
             try {
-                Socket socket = new Socket("localhost", 5347);
-                xmpp = new StreamComponent(new JID("", "api.juick.com", ""), socket.getInputStream(), socket.getOutputStream(), password);
+                Socket socket = new Socket(host, port);
+                xmpp = new StreamComponent(new JID(jid), socket.getInputStream(), socket.getOutputStream(), password);
                 xmpp.addListener(Main.this);
                 xmpp.startParsing();
             } catch (IOException e) {
                 log("XMPP exception", e);
             }
         });
-        thr.start();
     }
 
     @Override
@@ -94,7 +97,7 @@ public class Main extends HttpServlet implements Stream.StreamListener {
 
     @Override
     public void onStreamReady() {
-        System.err.println("XMPP STREAM READY");
+        log("XMPP STREAM READY");
     }
 
     /** 
@@ -122,6 +125,10 @@ public class Main extends HttpServlet implements Stream.StreamListener {
             } else {
                 response.sendError(401);
             }
+        } else if (uri.equals("/messages")) {
+            messages.doGet(request, response, vuid);
+        } else if (uri.equals("/thread")) {
+            messages.doThreadGet(request, response, vuid);
         } else if (uri.equals("/users")) {
             users.doGetUsers(request, response, vuid);
         } else if (uri.equals("/users/read")) {