diff --git a/multiModule1/subMultiModule1/src/main/java/com/example/api/APIQueryHandler.java b/multiModule1/subMultiModule1/src/main/java/com/example/api/APIQueryHandler.java index 3c14dcd..b657e83 100644 --- a/multiModule1/subMultiModule1/src/main/java/com/example/api/APIQueryHandler.java +++ b/multiModule1/subMultiModule1/src/main/java/com/example/api/APIQueryHandler.java @@ -1,7 +1,6 @@ package com.example.api; import com.example.data.ConfigData; - import java.net.URL; import java.util.List; import java.util.Map; @@ -9,9 +8,7 @@ import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -/** - * Performs a network call in parallel using the provided config options. - */ +/** Performs a network call in parallel using the provided config options. */ public class APIQueryHandler { private Map configs; private List outputs; diff --git a/multiModule1/subMultiModule1/src/main/java/com/example/api/UrlRequest.java b/multiModule1/subMultiModule1/src/main/java/com/example/api/UrlRequest.java index ac459d1..41a266d 100644 --- a/multiModule1/subMultiModule1/src/main/java/com/example/api/UrlRequest.java +++ b/multiModule1/subMultiModule1/src/main/java/com/example/api/UrlRequest.java @@ -11,6 +11,7 @@ public class UrlRequest { public static class A { public static String props = null; + static { try { props = new String(UrlRequest.class.getResourceAsStream("a.properties").readAllBytes()); @@ -20,6 +21,7 @@ public static class A { System.out.println(props); } } + private URL url; private Map params; diff --git a/multiModule1/subMultiModule2/src/main/java/com/example/data/ConfigData.java b/multiModule1/subMultiModule2/src/main/java/com/example/data/ConfigData.java index f1336b5..6d8de5d 100644 --- a/multiModule1/subMultiModule2/src/main/java/com/example/data/ConfigData.java +++ b/multiModule1/subMultiModule2/src/main/java/com/example/data/ConfigData.java @@ -1,6 +1,5 @@ package com.example.data; -import java.net.URL; import java.util.Iterator; import java.util.Map; @@ -9,8 +8,9 @@ public class ConfigData implements Iterator { public static Double ds() { return 3.14; } - private int pos = 0; - private Map params; + + private int pos = 0; + private Map params; public Map getParams() { return params; diff --git a/source/com/example/Main.java b/source/com/example/Main.java index 399d5d3..c20331f 100644 --- a/source/com/example/Main.java +++ b/source/com/example/Main.java @@ -1,7 +1,6 @@ package com.example; import com.example.api.APIQueryHandler; -import com.example.api.UrlRequest; import com.example.data.ConfigData; import java.io.BufferedReader; import java.io.File; diff --git a/web/src/main/java/com/example/server/Server.java b/web/src/main/java/com/example/server/Server.java index aaaccd1..3ab8673 100644 --- a/web/src/main/java/com/example/server/Server.java +++ b/web/src/main/java/com/example/server/Server.java @@ -1,62 +1,64 @@ package com.example.server; + +import java.io.IOException; +import java.sql.*; import javax.servlet.ServletException; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.sql.*; public class Server extends HttpServlet { - static final String DB_URL = "jdbc:mysql://localhost/users"; - static Connection conn; - - @Override - protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { - Cookie c = new Cookie("uid", req.getSession().getId()); - // For older browsers? - c.setSecure(false); - resp.addCookie(c); - resp.setHeader("Access-Control-Allow-Origin", "*"); - - Boolean b = Boolean.parseBoolean(req.getParameter("winCondition")); - int ticketNumber = Integer.parseInt(req.getParameter("ticket")); - try { - Statement s = conn.createStatement(); - s.execute("SELECT userName, isWin FROM users WHERE uid = " + ticketNumber + ";"); - ResultSet r = s.getResultSet(); - - if (r.getBoolean("isWin") && b) { - resp.getWriter().write("You win, " + r.getString("userName")); - } else { - resp.getWriter().write("You lose, " + r.getString("userName")); - } - } catch (SQLException throwables) { - throwables.printStackTrace(); - } - resp.setStatus(200); - } + static final String DB_URL = "jdbc:mysql://localhost/users"; + static Connection conn; - @Override - protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { - super.doPost(req, resp); - } + @Override + protected void doGet(HttpServletRequest req, HttpServletResponse resp) + throws ServletException, IOException { + Cookie c = new Cookie("uid", req.getSession().getId()); + // For older browsers? + c.setSecure(false); + resp.addCookie(c); + resp.setHeader("Access-Control-Allow-Origin", "*"); - @Override - public void destroy() { - super.destroy(); + Boolean b = Boolean.parseBoolean(req.getParameter("winCondition")); + int ticketNumber = Integer.parseInt(req.getParameter("ticket")); + try { + Statement s = conn.createStatement(); + s.execute("SELECT userName, isWin FROM users WHERE uid = " + ticketNumber + ";"); + ResultSet r = s.getResultSet(); + + if (r.getBoolean("isWin") && b) { + resp.getWriter().write("You win, " + r.getString("userName")); + } else { + resp.getWriter().write("You lose, " + r.getString("userName")); + } + } catch (SQLException throwables) { + throwables.printStackTrace(); } + resp.setStatus(200); + } + + @Override + protected void doPost(HttpServletRequest req, HttpServletResponse resp) + throws ServletException, IOException { + super.doPost(req, resp); + } - @Override - public void init() throws ServletException { - super.init(); + @Override + public void destroy() { + super.destroy(); + } - try { - conn = DriverManager.getConnection(DB_URL, "user", ""); - } catch (SQLException throwables) { - throwables.printStackTrace(); - } + @Override + public void init() throws ServletException { + super.init(); + try { + conn = DriverManager.getConnection(DB_URL, "user", ""); + } catch (SQLException throwables) { + throwables.printStackTrace(); } + } }