Merge pull request #11 from aquality-automation/feature/SwaggerUpdate

Fix swagger documentation

Author: aquality-automation

src/main/java/main/exceptions/AqualityException.java

@@ -1,6 +1,10 @@
 package main.exceptions;
 
+import lombok.Getter;
+
 public class AqualityException extends Exception {
+    @Getter
+    protected Integer responseCode = 500;
     public AqualityException(String error) {
         super(error);
     }

src/main/java/main/exceptions/AqualityPermissionsException.java

@@ -5,5 +5,6 @@
 public class AqualityPermissionsException extends AqualityException {
     public AqualityPermissionsException(String error, UserDto user) {
         super(String.format("[Permissions %s]: " + error, user != null ? user.getUser_name() : "anonymous"));
+        this.responseCode = 403;
     }
 }

src/main/java/main/exceptions/AqualitySQLException.java

@@ -0,0 +1,33 @@
+package main.exceptions;
+
+public class AqualitySQLException extends AqualityException {
+
+    public AqualitySQLException(String sqlcode) {
+        super(getErrorMessage(sqlcode));
+        this.responseCode = getErrorCode(sqlcode);
+    }
+
+
+
+    private static String getErrorMessage(String sqlcode){
+        switch (sqlcode){
+            case "23516":
+            case "45000":
+            case "23505":
+                return "You are trying to create duplicate entity.";
+            default:
+                return String.format("Unknown SQL Error: %s", sqlcode);
+        }
+    }
+
+    private static Integer getErrorCode(String sqlcode){
+        switch (sqlcode){
+            case "23516":
+            case "45000":
+            case "23505":
+                return 409;
+            default:
+                return 500;
+        }
+    }
+}

src/main/java/main/model/db/dao/DAO.java

@@ -1,6 +1,7 @@
 package main.model.db.dao;
 
 import com.mysql.cj.core.conf.url.ConnectionUrlParser.Pair;
+import main.exceptions.AqualitySQLException;
 import main.exceptions.AqualityException;
 import main.model.db.RS_Converter;
 import main.model.dto.BaseDto;
@@ -156,7 +157,7 @@ protected JSONArray CallStoredProcedure(String sql, List<Pair<String, String>> p
                 rs.close();
             }
         } catch (SQLException e) {
-            throw new AqualityException(String.format("Cannot execute statement for '%s'", getSqlName(sql)));
+            throw new AqualitySQLException(e.getSQLState());
         } finally {
             closeCallableStatement(callableStatement);
         }
@@ -210,7 +211,7 @@ private CallableStatement executeCallableStatement(String sql, List<Pair<String,
         try {
             callableStatement.execute();
         } catch (SQLException e) {
-            throw new AqualityException(String.format("Cannot execute query '%s': %s", getSqlName(sql), e.getMessage()));
+            throw new AqualitySQLException(e.getSQLState());
         }
 
         return callableStatement;

src/main/java/main/model/email/AuditEmails.java

@@ -6,6 +6,7 @@
 import main.model.db.dao.project.UserDao;
 import main.model.dto.*;
 import main.utils.AppProperties;
+
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;

src/main/java/main/utils/PropertyUtils.java

@@ -1,6 +1,6 @@
 package main.utils;
 
-import main.exceptions.RPException;
+import main.exceptions.AqualityException;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -15,10 +15,10 @@ class PropertyUtils {
             prop = new Properties();
 
             if (input == null) {
-                throw new RPException(String.format("Sorry, unable to find %s.", property.getName()));
+                throw new AqualityException(String.format("Sorry, unable to find %s.", property.getName()));
             }
             prop.load(input);
-        }catch (RPException | IOException e) {
+        }catch (AqualityException | IOException e) {
             e.printStackTrace();
         }
     }

src/main/java/main/view/BaseServlet.java

@@ -134,27 +134,6 @@ protected void setAuthorizationProblem(@NotNull HttpServletResponse resp){
         resp.addHeader("ErrorMessage", "Are you sure you logged in?");
     }
 
-    private void handleSQLException(@NotNull SQLException e, HttpServletResponse resp){
-        String sqlState = e.getSQLState();
-        if(sqlState == null) sqlState = "";
-        switch (sqlState){
-            case "23515":
-                resp.setStatus(403);
-                resp.addHeader("ErrorMessage", "You have no permissions for this action.");
-                break;
-            case "23516":
-            case "45000":
-            case "23505":
-                resp.setStatus(409);
-                resp.addHeader("ErrorMessage", "You are trying to create duplicate entity.");
-                break;
-            default:
-                resp.setStatus(500);
-                resp.addHeader("ErrorMessage", e.getMessage());
-                break;
-        }
-    }
-
     protected void setErrorHeader(@NotNull HttpServletResponse resp, String errorMessage){
         resp.addHeader("ErrorMessage", errorMessage);
     }
@@ -207,23 +186,15 @@ protected void handleException(HttpServletResponse resp, @NotNull Exception e){
             case "AuthenticationException":
                 setAuthorizationProblem(resp,e);
                 return;
-            case "SQLException":
-            case "SQLIntegrityConstraintViolationException":
-                handleSQLException((SQLException) e, resp);
-                return;
             case "AqualityPermissionsException":
-                resp.setStatus(403);
-                resp.addHeader("ErrorMessage", e.getMessage());
-                return;
             case "AqualityException":
-                resp.setStatus(500);
-                resp.addHeader("ErrorMessage", e.getMessage());
-                return;
             case "InvalidFormatException":
             case "AqualityQueryParameterException":
-                resp.setStatus(422);
-                resp.addHeader("ErrorMessage", e.getMessage());
-
+            case "AqualitySQLException":
+                AqualityException exception = (AqualityException) e;
+                resp.setStatus(exception.getResponseCode());
+                resp.addHeader("ErrorMessage", exception.getMessage());
+                return;
             default:
                 setUnknownIssue(resp);
         }

src/main/java/main/view/Project/FinalResultServlet.java

@@ -3,7 +3,6 @@
 import main.Session;
 import main.view.BaseServlet;
 import main.view.IGet;
-import main.view.IPost;
 import main.model.dto.FinalResultDto;
 
 import javax.servlet.annotation.WebServlet;