Вывод количества пользователей

Author: vasiliilantratov

ConnectFour.iml

@@ -9,15 +9,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$APPLICATION_HOME_DIR$/lib/org.json-20120521.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
     <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.20" level="project" />
     <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-server:9.3.0.M0" level="project" />
     <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
@@ -31,5 +22,6 @@
     <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-rewrite:9.3.0.M0" level="project" />
     <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-client:9.3.0.M0" level="project" />
     <orderEntry type="library" name="Maven: org.json:json:20131018" level="project" />
+    <orderEntry type="library" name="Maven: com.intellij:annotations:9.0.4" level="project" />
   </component>
 </module>

src/main/java/admin/AdminServlet.java

@@ -2,13 +2,15 @@
 
 import org.jetbrains.annotations.NotNull;
 import main.AccountService;
+import org.json.JSONObject;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.io.PrintWriter;
+import java.util.HashMap;
+import java.util.Map;
 
 
 public class AdminServlet extends HttpServlet {
@@ -25,25 +27,35 @@ public AdminServlet(@NotNull AccountService accountService) {
     public void doGet(HttpServletRequest request,
                       HttpServletResponse response) throws ServletException, IOException {
         String shutdown = request.getParameter("shutdown");
+        String registCount = request.getParameter("count_regist");
+        String logCount = request.getParameter("count_logged");
 
-        PrintWriter writer = response.getWriter();
+        Map<String, Object> objResponse = new HashMap<>();
+        objResponse.put("count_regist", -1);
+        objResponse.put("count_logged", -1);
 
         if (shutdown != null && !shutdown.isEmpty()) {
             try {
                 int shut = Integer.parseInt(shutdown);
                 System.out.print("выключение сервера через " + shut + " ms");
                 Thread.sleep(shut);
-
             } catch (InterruptedException e) {
                 e.printStackTrace();
             }
             System.out.print("\nShutdown");
             System.exit(0);
         }
+        if (registCount != null && registCount.equals("true")) {
+            objResponse.put("count_regist", accountService.getRegisteredUsersCount());
+        }
+        if (logCount != null && logCount.equals("true")) {
+            objResponse.put("count_logged", accountService.getLoggedUsersCount());
+        }
 
+        JSONObject jsonResponse = new JSONObject(objResponse);
         response.setContentType("application/json");
         response.setCharacterEncoding("UTF-8");
-        //response.getWriter().write(jsonResponse.toString());
+        response.getWriter().write(jsonResponse.toString());
         response.setStatus(HttpServletResponse.SC_OK);
     }
 }

src/main/java/main/AccountService.java

@@ -43,6 +43,7 @@ public long singIn(HttpSession session, String login, String password) {
         return -1;
     }
 
+    /////// наверно надо сделать deleteSession()
     public boolean logOut(HttpSession session) {
         Long userId = (Long) session.getAttribute("userId");
         if (!sessions.isEmpty()) {
@@ -117,7 +118,15 @@ public boolean validationPassword(String password) {
         */
     }
 
-    public void addUser(UserProfile userProfile) {
+    public int getRegisteredUsersCount(){
+        return users.size();
+    }
+
+    public int getLoggedUsersCount(){
+        return sessions.size();
+    }
+
+    private void addUser(UserProfile userProfile) {
         users.put(userProfile.getLogin(), userProfile);
     }
 

src/main/java/main/Main.java

@@ -20,18 +20,13 @@ public class Main {
     public static void main(String[] args) throws Exception {
         //int port = 8080;
         if (args.length != 1) {
-            /*
-            String portString = args[0];
-            port = Integer.valueOf(portString);
-            */
             System.out.append("Use port as the first argument");
             System.exit(1);
         }
 
         String portString = args[0];
         int port = Integer.valueOf(portString);
         System.out.append("Starting at port: ").append(portString).append('\n');
-        //System.out.append("Starting at port: ").append(String.valueOf(port)).append('\n');
 
         AccountService accountService = new AccountService();