Skip to content

Commit cef39fb

Browse files
Fix comments
1 parent 8e50901 commit cef39fb

7 files changed

+35
-31
lines changed

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

Lines changed: 29 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ protected void setOptionsResponseHeaders(@NotNull HttpServletResponse resp) {
133133
resp.setStatus(204);
134134
}
135135

136-
private void setAuthorizationProblem(@NotNull HttpServletResponse resp, @NotNull Exception e) {
136+
private void setAuthorizationProblem(@NotNull HttpServletResponse resp, @NotNull Exception e) throws AqualityException {
137137
resp.setStatus(401);
138138
resp.addHeader("ErrorMessage", !Objects.equals(e.getMessage(), "") ? e.getMessage() : "Are you sure you logged in?");
139139
setResponseBody(resp, !Objects.equals(e.getMessage(), "") ? e.getMessage() : "Are you sure you logged in?");
@@ -193,47 +193,51 @@ protected void processResponse(HttpServletResponse response, String filePath) {
193193
}
194194
}
195195

196-
protected void setResponseBody(HttpServletResponse resp, Object object) {
196+
protected void setResponseBody(HttpServletResponse resp, Object object) throws AqualityException {
197197
try {
198198
setJSONContentType(resp);
199199
resp.getWriter().write(mapper.serialize(object));
200200
} catch (IOException e) {
201-
System.out.println("Cannot set response body!");
201+
throw new AqualityException("System was not able to write a response! Raise an Issue.");
202202
}
203203
}
204204

205205
protected void handleException(HttpServletResponse resp, @NotNull Exception e) {
206206
e.printStackTrace();
207-
switch (e.getClass().getSimpleName()) {
208-
case "UnsupportedOperationException":
209-
setNotImplementedFunction(resp, e);
210-
return;
211-
case "AuthenticationException":
212-
setAuthorizationProblem(resp, e);
213-
return;
214-
case "AqualityParametersException":
215-
case "AqualityPermissionsException":
216-
case "AqualityException":
217-
case "InvalidFormatException":
218-
case "AqualityQueryParameterException":
219-
case "AqualitySQLException":
220-
AqualityException exception = (AqualityException) e;
221-
resp.setStatus(exception.getResponseCode());
222-
resp.addHeader("ErrorMessage", exception.getMessage());
223-
setResponseBody(resp, new ErrorDto(exception.getMessage()));
224-
return;
225-
default:
226-
setUnknownIssue(resp);
207+
try {
208+
switch (e.getClass().getSimpleName()) {
209+
case "UnsupportedOperationException":
210+
setNotImplementedFunction(resp, e);
211+
return;
212+
case "AuthenticationException":
213+
setAuthorizationProblem(resp, e);
214+
return;
215+
case "AqualityParametersException":
216+
case "AqualityPermissionsException":
217+
case "AqualityException":
218+
case "InvalidFormatException":
219+
case "AqualityQueryParameterException":
220+
case "AqualitySQLException":
221+
AqualityException exception = (AqualityException) e;
222+
resp.setStatus(exception.getResponseCode());
223+
resp.addHeader("ErrorMessage", exception.getMessage());
224+
setResponseBody(resp, new ErrorDto(exception.getMessage()));
225+
return;
226+
default:
227+
setUnknownIssue(resp);
228+
}
229+
} catch (AqualityException ex) {
230+
handleException(resp, ex);
227231
}
228232
}
229233

230-
private void setNotImplementedFunction(@NotNull HttpServletResponse resp, @NotNull Exception e) {
234+
private void setNotImplementedFunction(@NotNull HttpServletResponse resp, @NotNull Exception e) throws AqualityException {
231235
resp.setStatus(501);
232236
resp.addHeader("ErrorMessage", e.getMessage());
233237
setResponseBody(resp, new ErrorDto(e.getMessage()));
234238
}
235239

236-
private void setUnknownIssue(@NotNull HttpServletResponse resp) {
240+
private void setUnknownIssue(@NotNull HttpServletResponse resp) throws AqualityException {
237241
resp.setStatus(500);
238242
resp.addHeader("ErrorMessage", "Unknown Issue.");
239243
setResponseBody(resp, new ErrorDto("Unknown Issue."));

src/main/java/main/view/publicApi/publicSuiteServlet.java renamed to src/main/java/main/view/publicApi/PublicSuiteServlet.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import javax.servlet.http.HttpServletResponse;
1212

1313
@WebServlet("/public/suite/create-or-update")
14-
public class publicSuiteServlet extends BaseServlet implements IPost {
14+
public class PublicSuiteServlet extends BaseServlet implements IPost {
1515

1616
@Override
1717
public void doPost(HttpServletRequest req, HttpServletResponse resp) {

src/main/java/main/view/publicApi/publicTestResultFinishServlet.java renamed to src/main/java/main/view/publicApi/PublicTestResultFinishServlet.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import java.util.List;
1414

1515
@WebServlet("/public/test/result/finish")
16-
public class publicTestResultFinishServlet extends BaseServlet implements IPost {
16+
public class PublicTestResultFinishServlet extends BaseServlet implements IPost {
1717

1818
@Override
1919
public void doPost(HttpServletRequest req, HttpServletResponse resp) {

src/main/java/main/view/publicApi/publicTestResultStartServlet.java renamed to src/main/java/main/view/publicApi/PublicTestResultStartServlet.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import java.util.List;
1515

1616
@WebServlet("/public/test/result/start")
17-
public class publicTestResultStartServlet extends BaseServlet implements IGet {
17+
public class PublicTestResultStartServlet extends BaseServlet implements IGet {
1818

1919
@Override
2020
public void doGet(HttpServletRequest req, HttpServletResponse resp) {

src/main/java/main/view/publicApi/publicTestRunFinishServlet.java renamed to src/main/java/main/view/publicApi/PublicTestRunFinishServlet.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import java.util.Date;
1414

1515
@WebServlet("/public/testrun/finish")
16-
public class publicTestRunFinishServlet extends BaseServlet implements IGet {
16+
public class PublicTestRunFinishServlet extends BaseServlet implements IGet {
1717

1818
@Override
1919
public void doGet(HttpServletRequest req, HttpServletResponse resp) {

src/main/java/main/view/publicApi/publicTestRunStartServlet.java renamed to src/main/java/main/view/publicApi/PublicTestRunStartServlet.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import java.util.Date;
1515

1616
@WebServlet("/public/testrun/start")
17-
public class publicTestRunStartServlet extends BaseServlet implements IPost {
17+
public class PublicTestRunStartServlet extends BaseServlet implements IPost {
1818
@Override
1919
public void doPost(HttpServletRequest req, HttpServletResponse resp) {
2020
setPostResponseHeaders(resp);

src/main/java/main/view/publicApi/publicTestServlet.java renamed to src/main/java/main/view/publicApi/PublicTestServlet.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import javax.servlet.http.HttpServletResponse;
1212

1313
@WebServlet("/public/test/create-or-update")
14-
public class publicTestServlet extends BaseServlet implements IPost {
14+
public class PublicTestServlet extends BaseServlet implements IPost {
1515

1616
@Override
1717
public void doPost(HttpServletRequest req, HttpServletResponse resp) {

0 commit comments

Comments
 (0)