From 42718787291bed507caf4f7ae13f6c41f9b8d7ff Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Wed, 23 Nov 2016 12:08:45 +0300
Subject: using HttpServletResponse status codes

---
 juick-api/src/main/java/com/juick/api/Main.java | 38 ++++++++++++-------------
 1 file changed, 19 insertions(+), 19 deletions(-)

(limited to 'juick-api/src/main/java/com/juick/api/Main.java')

diff --git a/juick-api/src/main/java/com/juick/api/Main.java b/juick-api/src/main/java/com/juick/api/Main.java
index dffb9d66..f902fc6b 100644
--- a/juick-api/src/main/java/com/juick/api/Main.java
+++ b/juick-api/src/main/java/com/juick/api/Main.java
@@ -153,7 +153,7 @@ public class Main extends HttpServlet {
             if (vuid > 0) {
                 messages.doGetHome(request, response, vuid);
             } else {
-                response.sendError(401);
+                response.sendError(HttpServletResponse.SC_UNAUTHORIZED);
             }
         } else if (uri.equals("/messages")) {
             messages.doGet(request, response, vuid);
@@ -169,19 +169,19 @@ public class Main extends HttpServlet {
             if (vuid > 0) {
                 pm.doGetPM(request, response, vuid);
             } else {
-                response.sendError(401);
+                response.sendError(HttpServletResponse.SC_UNAUTHORIZED);
             }
         } else if (uri.equals("/groups_pms")) {
             if (vuid > 0) {
                 others.doGetGroupsPMs(request, response, vuid);
             } else {
-                response.sendError(401);
+                response.sendError(HttpServletResponse.SC_UNAUTHORIZED);
             }
         } else if (uri.equals("/messages/recommended")) {
             if (vuid > 0) {
                 messages.doGetRecommended(request, response, vuid);
             } else {
-                response.sendError(401);
+                response.sendError(HttpServletResponse.SC_UNAUTHORIZED);
             }
         } else if (uri.equals("/messages/set_popular") && vuid == 3694) {
             messages.doSetPopular(request, response, xmpp);
@@ -192,7 +192,7 @@ public class Main extends HttpServlet {
         } else if (uri.equals("/notifications")) {
             notifications.doGet(request, response, vuid);
         } else {
-            response.sendError(404);
+            response.sendError(HttpServletResponse.SC_NOT_FOUND);
         }
     }
 
@@ -228,7 +228,7 @@ public class Main extends HttpServlet {
             vuid = Utils.getVisitorQueryStringUID(jdbc, request);
         }
         if (vuid == 0) {
-            response.sendError(401);
+            response.sendError(HttpServletResponse.SC_UNAUTHORIZED);
             return;
         }
         switch (uri) {
@@ -244,7 +244,7 @@ public class Main extends HttpServlet {
                 pm.doPostPM(request, response, xmpp, vuid);
                 break;
             default:
-                response.sendError(405);
+                response.sendError(HttpServletResponse.SC_METHOD_NOT_ALLOWED);
                 break;
         }
     }
@@ -253,7 +253,7 @@ public class Main extends HttpServlet {
             throws ServletException, IOException {
         String body = request.getParameter("body");
         if (body == null || body.length() < 1 || body.length() > 4096) {
-            response.sendError(400);
+            response.sendError(HttpServletResponse.SC_BAD_REQUEST);
             return;
         }
         body = body.replace("\r", "");
@@ -282,7 +282,7 @@ public class Main extends HttpServlet {
             attachmentFName = Utils.receiveMultiPartFile(request, "attach");
         } catch (Exception e) {
             log("MULTIPART ERROR", e);
-            response.sendError(400);
+            response.sendError(HttpServletResponse.SC_BAD_REQUEST);
             return;
         }
 
@@ -293,7 +293,7 @@ public class Main extends HttpServlet {
                 attachmentFName = Utils.downloadImage(imgUrl);
             } catch (Exception e) {
                 log("DOWNLOAD ERROR", e);
-                response.sendError(500);
+                response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
                 return;
             }
         }
@@ -366,12 +366,12 @@ public class Main extends HttpServlet {
             throws ServletException, IOException {
         int mid = NumberUtils.toInt(request.getParameter("mid"), 0);
         if (mid == 0) {
-            response.sendError(400);
+            response.sendError(HttpServletResponse.SC_BAD_REQUEST);
             return;
         }
         com.juick.Message msg = MessagesQueries.getMessage(sql, mid);
         if (msg == null) {
-            response.sendError(404);
+            response.sendError(HttpServletResponse.SC_NOT_FOUND);
             return;
         }
 
@@ -380,21 +380,21 @@ public class Main extends HttpServlet {
         if (rid > 0) {
             reply = MessagesQueries.getReply(sql, mid, rid);
             if (reply == null) {
-                response.sendError(404);
+                response.sendError(HttpServletResponse.SC_NOT_FOUND);
                 return;
             }
         }
 
         String body = request.getParameter("body");
         if (body == null || body.length() < 1 || body.length() > 4096) {
-            response.sendError(400);
+            response.sendError(HttpServletResponse.SC_BAD_REQUEST);
             return;
         }
         body = body.replace("\r", "");
 
         if ((msg.ReadOnly && msg.getUser().getUid() != vuid) || UserQueries.isInBLAny(sql, msg.getUser().getUid(), vuid)
                 || (reply != null && UserQueries.isInBLAny(sql, reply.getUser().getUid(), vuid))) {
-            response.sendError(403);
+            response.sendError(HttpServletResponse.SC_FORBIDDEN);
             return;
         }
 
@@ -403,7 +403,7 @@ public class Main extends HttpServlet {
             attachmentFName = Utils.receiveMultiPartFile(request, "attach");
         } catch (Exception e) {
             log("MULTIPART ERROR", e);
-            response.sendError(400);
+            response.sendError(HttpServletResponse.SC_BAD_REQUEST);
             return;
         }
 
@@ -413,7 +413,7 @@ public class Main extends HttpServlet {
                 attachmentFName = Utils.downloadImage(new URL(paramImg));
             } catch (Exception e) {
                 log("DOWNLOAD ERROR", e);
-                response.sendError(500);
+                response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
                 return;
             }
         }
@@ -488,7 +488,7 @@ public class Main extends HttpServlet {
             vuid = Utils.getVisitorQueryStringUID(jdbc, req);
         }
         if (vuid == 0) {
-            resp.sendError(401);
+            resp.sendError(HttpServletResponse.SC_UNAUTHORIZED);
             return;
         }
         String uri = req.getRequestURI();
@@ -497,7 +497,7 @@ public class Main extends HttpServlet {
                 notifications.doDelete(req, resp, vuid);
                 break;
             default:
-                resp.sendError(400);
+                resp.sendError(HttpServletResponse.SC_BAD_REQUEST);
                 break;
         }
     }
-- 
cgit v1.2.3