Revize 0917eae7

#7 Use SLF4J logger

- added some log messages

sources/src/main/java/cz/zcu/kiv/offscreen/servlets/ShowGraph.java

@@ -1 +1 @@
 package cz.zcu.kiv.offscreen.servlets;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
 import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
@@ -11 +14 @@
  * @author Jindra Pavlíková <[e-mail]>
  */
 public class ShowGraph extends BaseServlet {
+    private static final Logger logger = LogManager.getLogger();
 
     @Override
     protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        logger.debug("Processing request");
+
         // render
         RequestDispatcher rd = getServletContext().getRequestDispatcher("/showGraph.jsp");
         rd.forward(request, response);
+        logger.debug("Request processed");
     }
 
 }

sources/src/main/java/cz/zcu/kiv/offscreen/servlets/UploadFiles.java

@@ -4 +4 @@
 import cz.zcu.kiv.offscreen.storage.FileLoader;
 import cz.zcu.kiv.offscreen.user.DB;
 import cz.zcu.kiv.offscreen.user.Diagram;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletException;
@@ -19 +21 @@
  * @author Jindra Pavlíková <[e-mail]>
  */
 public class UploadFiles extends BaseServlet {
+    private static final Logger logger = LogManager.getLogger();
 
     @Override
     protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        logger.debug("Processing request");
         DB db = new DB(getServletContext());
         Diagram diagram = new Diagram(db);
 
         List<Map<String, String>> userDiagramList = new ArrayList<>();
         if (isLoggedIn(request)) {
+            logger.debug("Logged user");
             int loggedUserId = getUserId(request);
 
             userDiagramList = diagram.getDiagramListByUserId(loggedUserId);
@@ -39 +44 @@
         // render
         RequestDispatcher rd = getServletContext().getRequestDispatcher("/uploadFiles.jsp");
         rd.forward(request, response);
+        logger.debug("Request processed");
     }
 
     @Override
     protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        logger.debug("Processing request");
         Map<String, String> jsonData = new FileLoader().loadFile(request);
 
         if(!jsonData.containsKey("file") || !jsonData.containsKey("jsonFileFormat")) {
             request.setAttribute("errorMessage", "<strong>Invalid request!</strong><br/>");
+            logger.debug("Invalid request");
             doGet(request, response);
 
         } else if (Strings.isNullOrEmpty(jsonData.get("file"))) {
             request.setAttribute("errorMessage", "<strong>Unsupported file</strong><br/>");
+            logger.debug("Empty diagram json");
             doGet(request, response);
         } else {
             request.getSession().setAttribute("json_graph", jsonData.get("file"));
             request.getSession().setAttribute("json_graph_type", jsonData.get("jsonFileFormat"));
             request.getSession().setAttribute("graph_filename", jsonData.get("filename"));
             response.sendRedirect(getServletContext().getInitParameter("APP_HOME_URL") + "graph");
+            logger.debug("send redirect to /graph");
         }
+        logger.debug("Request processed");
     }
 }

sources/src/main/java/cz/zcu/kiv/offscreen/servlets/api/GetDBDiagram.java

@@ -4 +4 @@
 import cz.zcu.kiv.offscreen.servlets.BaseServlet;
 import cz.zcu.kiv.offscreen.user.DB;
 import cz.zcu.kiv.offscreen.user.Diagram;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.json.JSONObject;
 
 import javax.servlet.http.HttpServletRequest;
@@ -15 +17 @@
  */
 public class GetDBDiagram extends BaseServlet {
 
+    private static final Logger logger = LogManager.getLogger();
+
     @Override
     protected void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException {
+        logger.debug("Processing request");
         String diagramId = request.getParameter("id");
 
         if (Strings.isNullOrEmpty(diagramId)) {
             response.sendError(HttpServletResponse.SC_BAD_REQUEST);
+            logger.debug("Diagram id is empty");
             return;
         }
 
@@ -29 +35 @@
 
         if (!diagram.isPublic() && (!isLoggedIn(request) || (isLoggedIn(request) && diagram.getUserId() != getUserId(request)))) {
             response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
+            logger.debug("User is unauthorized");
             return;
         }
 
@@ -39 +46 @@
         response.setStatus(HttpServletResponse.SC_OK);
         response.getWriter().write(json.toString());
         response.getWriter().flush();
+        logger.debug("Response OK");
     }
 }

sources/src/main/java/cz/zcu/kiv/offscreen/servlets/api/GetPrivateDiagrams.java

@@ -3 +3 @@
 import cz.zcu.kiv.offscreen.servlets.BaseServlet;
 import cz.zcu.kiv.offscreen.user.DB;
 import cz.zcu.kiv.offscreen.user.Diagram;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
@@ -14 +16 @@
 
 public class GetPrivateDiagrams extends BaseServlet {
 
+    private static final Logger logger = LogManager.getLogger();
+
     @Override
     protected void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException {
+        logger.debug("Processing request");
+
         if (!isLoggedIn(request)) {
             response.sendError(HttpServletResponse.SC_UNAUTHORIZED);
+            logger.debug("User is unauthorized");
             return;
         }
 
@@ -37 +44 @@
         response.setStatus(HttpServletResponse.SC_OK);
         response.getWriter().write(json.toString());
         response.getWriter().flush();
+        logger.debug("Response OK");
+
     }
 }

sources/src/main/java/cz/zcu/kiv/offscreen/servlets/api/GetSessionDiagram.java

@@ -8 +8 @@
 import cz.zcu.kiv.offscreen.graph.loader.JSONConfigLoader;
 import cz.zcu.kiv.offscreen.servlets.BaseServlet;
 import net.sf.json.JSONObject;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -17 +19 @@
  * This class is used for loading diagrams from session.
  */
 public class GetSessionDiagram extends BaseServlet {
+    private static final Logger logger = LogManager.getLogger();
 
     /**
      * Constructs graph data using either the current graph version or the version set in query parameter. Resulting
@@ -24 +27 @@
      */
     @Override
     protected void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException {
+        logger.debug("Processing request");
+
         response.setContentType("application/json");
         response.setCharacterEncoding("UTF-8");
 
@@ -44 +49 @@
 
             switch (jsonType) {
                 case "spade":
+                    logger.debug("Processing Spade json");
                     rawJson = convertSpadeToRawJson(jsonToDisplay);
                     break;
                 default:
+                    logger.debug("Processing Raw json");
                     rawJson = jsonToDisplay;
             }
 
@@ -57 +64 @@
             response.setStatus(HttpServletResponse.SC_OK);
             response.getWriter().write(jsonObject.toString());
             response.getWriter().flush();
+            logger.debug("Response OK");
             return;
         }
 
         response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
+        logger.debug("Response BAD REQUEST");
     }
 
     /**

sources/src/main/java/cz/zcu/kiv/offscreen/servlets/api/Login.java

@@ -5 +5 @@
 import cz.zcu.kiv.offscreen.user.DB;
 import cz.zcu.kiv.offscreen.user.User;
 import cz.zcu.kiv.offscreen.vo.UserVO;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.json.JSONObject;
 
 import javax.servlet.http.HttpServletRequest;
@@ -14 +16 @@
 import java.util.Map;
 
 public class Login extends BaseServlet {
+    private static final Logger logger = LogManager.getLogger();
 
     @Override
     protected void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException {
+        logger.debug("Processing request");
         String username = request.getParameter("username");
         String password = request.getParameter("password");
 
@@ -24 +28 @@
 
         if (Strings.isNullOrEmpty(username)) {
             errors.put("username", "Please enter username.");
+            logger.debug("Empty user name");
         }
 
         if (Strings.isNullOrEmpty(password)) {
             errors.put("password", "Please enter password.");
+            logger.debug("Empty password");
         }
 
         if (errors.isEmpty()) {
@@ -54 +60 @@
                 response.setStatus(HttpServletResponse.SC_ACCEPTED);
                 response.getWriter().write(json.toString());
                 response.getWriter().flush();
+                logger.debug("Response ACCEPTED");
 
             } else {
                 request.getSession().setAttribute("isLoggedIn", false);
@@ -61 +68 @@
                 request.getSession().setAttribute("user", null);
 
                 response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
+                logger.debug("Response UNAUTHORIZED");
             }
 
         } else {
@@ -71 +79 @@
             response.setContentType("application/json");
             response.getWriter().write(json.toString());
             response.getWriter().flush();
+            logger.debug("Response BAD REQUEST");
         }
     }
 }

sources/src/main/java/cz/zcu/kiv/offscreen/servlets/api/Logout.java

@@ -1 +1 @@
 package cz.zcu.kiv.offscreen.servlets.api;
 
 import cz.zcu.kiv.offscreen.servlets.BaseServlet;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 public class Logout extends BaseServlet {
-	
+    private static final Logger logger = LogManager.getLogger();
+
     @Override
     protected void doGet(HttpServletRequest request, HttpServletResponse response) {
+        logger.debug("Processing request");
         request.getSession().setAttribute("isLoggedIn", false);
         request.getSession().setAttribute("userId", null);
         request.getSession().setAttribute("user", null);
 
         response.setStatus(HttpServletResponse.SC_RESET_CONTENT);
+        logger.debug("Response RESET CONTENT");
     }
 }

sources/src/main/java/cz/zcu/kiv/offscreen/servlets/api/Register.java

@@ -4 +4 @@
 import cz.zcu.kiv.offscreen.servlets.BaseServlet;
 import cz.zcu.kiv.offscreen.user.DB;
 import cz.zcu.kiv.offscreen.user.User;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.json.JSONObject;
 
 import javax.servlet.http.HttpServletRequest;
@@ -15 +17 @@
 import java.util.regex.Pattern;
 
 public class Register extends BaseServlet {
-    
-    private static final String EMAIL_ADDRESS_PATTERN = "^[A-Za-z0-9-\\+_]+(\\.[A-Za-z0-9-_]+)*@" +
+	private static final Logger logger = LogManager.getLogger();
+	private static final String EMAIL_ADDRESS_PATTERN = "^[A-Za-z0-9-\\+_]+(\\.[A-Za-z0-9-_]+)*@" +
     											"[A-Za-z0-9-]+(\\.[A-Za-z0-9]+)*" +
     											"(\\.[A-Za-z]{2,})$";
     
     @Override
     protected void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException {
+		logger.debug("Processing request");
 		String name = request.getParameter("name");
 		String email = request.getParameter("email");
 		String username = request.getParameter("username");
@@ -35 +38 @@
 
 		if (Strings.isNullOrEmpty(name)) {
 			errors.put("name", "Please enter name.");
+			logger.debug("Empty name");
 		}
 
 		if (Strings.isNullOrEmpty(email)) {
 			errors.put("email", "Please enter e-mail address.");
+			logger.debug("Empty e-mail address");
+
 		} else if (!isEmailAddressValid(email)) {
 			errors.put("email", "Please enter valid e-mail address.");
+			logger.debug("Invalid e-mail address");
+
 		} else if (user.isEmailExists(email)) {
 			errors.put("email", "E-mail already exists.");
+			logger.debug("E-mail exists");
 		}
 
 		if (Strings.isNullOrEmpty(username)) {
 			errors.put("username", "Please enter username.");
+			logger.debug("Empty user name");
+
 		} else if (user.isNickExists(username)) {
 			errors.put("username", "Nickname already exists.");
+			logger.debug("Username(nickname) exists");
 		}
     	
     	if (Strings.isNullOrEmpty(password) || Strings.isNullOrEmpty(passwordCheck)) {
     		errors.put("password", "Please enter password.");
-    	} else if (password.length() < 5) {
+			logger.debug("Empty password");
+
+		} else if (password.length() < 5) {
     		errors.put("password", "Passwords must be at least 5 characters long.");
+			logger.debug("Invalid password");
+
 		} else if (!password.equals(passwordCheck)) {
 			errors.put("passwordCheck", "Passwords must be equal.");
-    	}
+			logger.debug("Passwords not match");
+		}
 
     	if (errors.isEmpty()) {
     		Map<String, String> userMap = new HashMap<>();
@@ -70 +87 @@
     		user.register(userMap);
 
 			response.setStatus(HttpServletResponse.SC_CREATED);
+			logger.debug("User created");
 
-    	} else {
+		} else {
 			JSONObject json = new JSONObject();
 			json.put("error", new JSONObject(errors));
 
@@ -79 +97 @@
 			response.setContentType("application/json");
 			response.getWriter().write(json.toString());
 			response.getWriter().flush();
+			logger.debug("Response BAD REQUEST");
 		}
     }
     

sources/src/main/java/cz/zcu/kiv/offscreen/servlets/api/RemoveDiagram.java

@@ -4 +4 @@
 import cz.zcu.kiv.offscreen.servlets.BaseServlet;
 import cz.zcu.kiv.offscreen.user.DB;
 import cz.zcu.kiv.offscreen.user.Diagram;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 public class RemoveDiagram extends BaseServlet {
+    private static final Logger logger = LogManager.getLogger();
 
     @Override
     protected void doDelete(HttpServletRequest request, HttpServletResponse response) throws IOException {
+        logger.debug("Processing request");
         if (!isLoggedIn(request)) {
             response.sendError(HttpServletResponse.SC_UNAUTHORIZED);
+            logger.debug("User is unauthorized");
             return;
         }
 
@@ -24 +29 @@
 
         if (Strings.isNullOrEmpty(diagramId)) {
             response.sendError(HttpServletResponse.SC_BAD_REQUEST);
+            logger.debug("Empty diagram id");
             return;
         }
 
@@ -32 +38 @@
 
         if (diagram.getUserId() != loggedUserId) {
             response.sendError(HttpServletResponse.SC_UNAUTHORIZED);
+            logger.debug("User is not owner of diagram");
             return;
         }
 
         diagram.delete();
+        logger.debug("Diagram removed");
 
         response.setStatus(HttpServletResponse.SC_NO_CONTENT);
     }

sources/src/main/java/cz/zcu/kiv/offscreen/servlets/api/SaveDiagram.java

@@ -4 +4 @@
 import cz.zcu.kiv.offscreen.servlets.BaseServlet;
 import cz.zcu.kiv.offscreen.user.DB;
 import cz.zcu.kiv.offscreen.user.Diagram;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.json.JSONObject;
 
 import javax.servlet.http.HttpServletRequest;
@@ -13 +15 @@
 import java.util.Map;
 
 public class SaveDiagram extends BaseServlet {
+    private static final Logger logger = LogManager.getLogger();
 
     @Override
     protected void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException {
+        logger.debug("Processing request");
+
         if (!isLoggedIn(request)) {
             response.sendError(HttpServletResponse.SC_UNAUTHORIZED);
+            logger.debug("User is unauthorized");
             return;
         }
 
@@ -33 +39 @@
         // input parameters are invalid
         if (Strings.isNullOrEmpty(name) || Strings.isNullOrEmpty(graphJson)) {
             response.sendError(HttpServletResponse.SC_BAD_REQUEST);
+            logger.debug("Input name or json is empty");
             return;
         }
 
@@ -40 +47 @@
         Diagram diagram;
 
         if (Strings.isNullOrEmpty(diagramId)) {
-            // new diagram
+            logger.debug("Creating new diagram");
             diagram = new Diagram(db);
 
         } else {
-            // diagram exists
+            logger.debug("Getting existing diagram from database");
             diagram = new Diagram(db, Integer.parseInt(diagramId));
 
-            // user is not owner of the diagram
             if (loggedUserId != diagram.getUserId()) {
                 response.sendError(HttpServletResponse.SC_UNAUTHORIZED);
+                logger.debug("User is not owner of diagram");
                 return;
             }
         }
@@ -61 +68 @@
         diagramParams.put("user_id", Integer.toString(loggedUserId));
 
         diagram.update(diagramParams);
+        logger.debug("Diagram created or updated.");
 
         // send response
         JSONObject json = new JSONObject(diagram.getDiagram());
@@ -70 +78 @@
         response.setStatus(HttpServletResponse.SC_OK);
         response.getWriter().write(json.toString());
         response.getWriter().flush();
+        logger.debug("Response OK");
     }
 }

sources/src/main/java/cz/zcu/kiv/offscreen/servlets/rest/RawInput.java

@@ -2 +2 @@
 
 import com.google.common.base.Strings;
 import cz.zcu.kiv.offscreen.servlets.BaseServlet;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
@@ -12 +14 @@
  * @author Tomáš Šimandl
  */
 public class RawInput extends BaseServlet {
+    private static final Logger logger = LogManager.getLogger();
 
     @Override
     protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        logger.debug("Processing request");
         request.setCharacterEncoding("UTF-8");
         String diagram = request.getParameter("rawDiagram");
         String type = "raw";
 
         if (Strings.isNullOrEmpty(diagram)) {
             response.sendError(HttpServletResponse.SC_BAD_REQUEST);
+            logger.debug("Diagram json is empty");
             return;
         }
 
         request.getSession().setAttribute("json_graph", diagram);
         request.getSession().setAttribute("json_graph_type", type);
         response.sendRedirect(getServletContext().getInitParameter("HOME_URL") + "graph");
+        logger.debug("Send redirect to /graph");
     }
 }

sources/src/main/java/cz/zcu/kiv/offscreen/user/DB.java

@@ -28 +28 @@
 		String password = context.getInitParameter("jdbc.password");
 
 		try {
+			logger.debug("Opening database connection");
 			Class.forName(driverClassName);
 			connection = DriverManager.getConnection(url, username, password);
 			connection.setAutoCommit(true);