Revize 4fe267e3

use commons-lang3 to check blank strings (including whitespace) instead of guava

sources/pom.xml

@@ -67 +67 @@
             <artifactId>commons-fileupload</artifactId>
             <version>1.3.3</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.8.1</version>
+        </dependency>
 
         <!-- Servlets and JSP -->
         <dependency>

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

@@ -1 +1 @@
 package cz.zcu.kiv.offscreen.servlets;
 
-import com.google.common.base.Strings;
 import cz.zcu.kiv.offscreen.modularization.ModuleProvider;
 import cz.zcu.kiv.offscreen.storage.FileLoader;
 import cz.zcu.kiv.offscreen.user.DB;
 import cz.zcu.kiv.offscreen.user.Diagram;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -59 +59 @@
             logger.debug("Invalid request");
             doGet(request, response);
 
-        } else if (Strings.isNullOrEmpty(data.get("file"))) {
+        } else if (StringUtils.isBlank(data.get("file"))) {
             request.setAttribute("errorMessage", "<strong>Unsupported file</strong><br/>");
             logger.debug("Empty diagram string");
             doGet(request, response);

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

@@ -1 +1 @@
 package cz.zcu.kiv.offscreen.servlets.api;
 
-import com.google.common.base.Strings;
 import com.google.gson.Gson;
 import cz.zcu.kiv.offscreen.servlets.BaseServlet;
 import cz.zcu.kiv.offscreen.user.DB;
 import cz.zcu.kiv.offscreen.user.Diagram;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -24 +24 @@
         logger.debug("Processing request");
         String diagramId = request.getParameter("id");
 
-        if (Strings.isNullOrEmpty(diagramId)) {
+        if (StringUtils.isBlank(diagramId)) {
             response.sendError(HttpServletResponse.SC_BAD_REQUEST);
             logger.debug("Diagram id is empty");
             return;

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

@@ -1 +1 @@
 package cz.zcu.kiv.offscreen.servlets.api;
 
-import com.google.common.base.Strings;
 import com.google.gson.JsonObject;
 import cz.zcu.kiv.offscreen.modularization.ModuleProvider;
 import cz.zcu.kiv.offscreen.servlets.BaseServlet;
 import javafx.util.Pair;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.apache.maven.shared.utils.StringUtils;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -43 +42 @@
         String diagramType = (String) request.getSession().getAttribute("diagram_type");
         String filename = (String) request.getSession().getAttribute("diagram_filename");
 
-        if (!Strings.isNullOrEmpty(diagramToDisplay) && diagramType != null) {
+        if (StringUtils.isNotBlank(diagramToDisplay) && diagramType != null) {
 
             String rawJson;
 

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

@@ -1 +1 @@
 package cz.zcu.kiv.offscreen.servlets.api;
 
-import com.google.common.base.Strings;
 import com.google.gson.JsonObject;
 import cz.zcu.kiv.offscreen.servlets.BaseServlet;
 import cz.zcu.kiv.offscreen.user.DB;
 import cz.zcu.kiv.offscreen.user.User;
 import cz.zcu.kiv.offscreen.vo.UserVO;
+import org.apache.commons.lang3.StringUtils;
 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 Login extends BaseServlet {
     private static final Logger logger = LogManager.getLogger();
 
@@ -24 +24 @@
 
         JsonObject errors = new JsonObject();
 
-        if (Strings.isNullOrEmpty(username)) {
+        if (StringUtils.isBlank(username)) {
             errors.addProperty("username", "Please enter username.");
             logger.debug("Empty user name");
         }
 
-        if (Strings.isNullOrEmpty(password)) {
+        if (StringUtils.isBlank(password)) {
             errors.addProperty("password", "Please enter password.");
             logger.debug("Empty password");
         }

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

@@ -1 +1 @@
 package cz.zcu.kiv.offscreen.servlets.api;
 
-import com.google.common.base.Strings;
 import com.google.gson.JsonObject;
 import cz.zcu.kiv.offscreen.servlets.BaseServlet;
 import cz.zcu.kiv.offscreen.user.DB;
 import cz.zcu.kiv.offscreen.user.User;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -37 +37 @@
 
 		JsonObject errors = new JsonObject();
 
-		if (Strings.isNullOrEmpty(name)) {
+		if (StringUtils.isBlank(name)) {
 			errors.addProperty("name", "Please enter name.");
 			logger.debug("Empty name");
 		}
 
-		if (Strings.isNullOrEmpty(email)) {
+		if (StringUtils.isBlank(email)) {
 			errors.addProperty("email", "Please enter e-mail address.");
 			logger.debug("Empty e-mail address");
 
@@ -55 +55 @@
 			logger.debug("E-mail exists");
 		}
 
-		if (Strings.isNullOrEmpty(username)) {
+		if (StringUtils.isBlank(username)) {
 			errors.addProperty("username", "Please enter username.");
 			logger.debug("Empty user name");
 
@@ -64 +64 @@
 			logger.debug("Username(nickname) exists");
 		}
     	
-    	if (Strings.isNullOrEmpty(password) || Strings.isNullOrEmpty(passwordCheck)) {
+    	if (StringUtils.isBlank(password) || StringUtils.isBlank(passwordCheck)) {
     		errors.addProperty("password", "Please enter password.");
 			logger.debug("Empty password");
 

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

@@ -1 +1 @@
 package cz.zcu.kiv.offscreen.servlets.api;
 
-import com.google.common.base.Strings;
 import cz.zcu.kiv.offscreen.servlets.BaseServlet;
 import cz.zcu.kiv.offscreen.user.DB;
 import cz.zcu.kiv.offscreen.user.Diagram;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -27 +27 @@
 
         String diagramId = request.getParameter("diagramId");
 
-        if (Strings.isNullOrEmpty(diagramId)) {
+        if (StringUtils.isBlank(diagramId)) {
             response.sendError(HttpServletResponse.SC_BAD_REQUEST);
             logger.debug("Empty diagram id");
             return;

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

@@ -1 +1 @@
 package cz.zcu.kiv.offscreen.servlets.api;
 
-import com.google.common.base.Strings;
 import com.google.gson.Gson;
-import com.google.gson.JsonObject;
 import cz.zcu.kiv.offscreen.servlets.BaseServlet;
 import cz.zcu.kiv.offscreen.user.DB;
 import cz.zcu.kiv.offscreen.user.Diagram;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -38 +37 @@
         String isPublic = request.getParameter("public");
 
         // input parameters are invalid
-        if (Strings.isNullOrEmpty(name) || Strings.isNullOrEmpty(graphJson)) {
+        if (StringUtils.isBlank(name) || StringUtils.isBlank(graphJson)) {
             response.sendError(HttpServletResponse.SC_BAD_REQUEST);
             logger.debug("Input name or json is empty");
             return;
@@ -47 +46 @@
         DB db = new DB(getServletContext());
         Diagram diagram;
 
-        if (Strings.isNullOrEmpty(diagramId)) {
+        if (StringUtils.isBlank(diagramId)) {
             logger.debug("Creating new diagram");
             diagram = new Diagram(db);
 

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

@@ -1 +1 @@
 package cz.zcu.kiv.offscreen.servlets.rest;
 
-import com.google.common.base.Strings;
 import cz.zcu.kiv.offscreen.servlets.BaseServlet;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -23 +23 @@
         String diagram = request.getParameter("rawDiagram");
         String type = "raw";
 
-        if (Strings.isNullOrEmpty(diagram)) {
+        if (StringUtils.isBlank(diagram)) {
             response.sendError(HttpServletResponse.SC_BAD_REQUEST);
             logger.debug("Diagram json is empty");
             return;