dalbodeule/snap-admin
1
0
Fork 0
mirror of https://github.com/dalbodeule/snap-admin.git synced 2025-06-09 05:48:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Not found now returns proper 404 status code

Browse Source
This commit is contained in:
Francesco 2023-10-12 14:50:21 +02:00
parent 1f7f8ba327
commit b5886a3a3a
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/tech/ailef/dbadmin/external/controller/GlobalController.java vendored
View File

@ -22,12 +22,15 @@ package tech.ailef.dbadmin.external.controller;
import java.util.Map; import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.HttpStatusCode;
import org.springframework.ui.Model; import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ControllerAdvice; import org.springframework.web.bind.annotation.ControllerAdvice;
import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.ModelAttribute;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import tech.ailef.dbadmin.external.DbAdmin; import tech.ailef.dbadmin.external.DbAdmin;
import tech.ailef.dbadmin.external.DbAdminProperties; import tech.ailef.dbadmin.external.DbAdminProperties;
import tech.ailef.dbadmin.external.exceptions.DbAdminNotFoundException; import tech.ailef.dbadmin.external.exceptions.DbAdminNotFoundException;
@ -50,13 +53,14 @@ public class GlobalController {
private DbAdmin dbAdmin; private DbAdmin dbAdmin;
@ExceptionHandler(DbAdminNotFoundException.class) @ExceptionHandler(DbAdminNotFoundException.class)
public String handleNotFound(Exception e, Model model) { public String handleNotFound(Exception e, Model model, HttpServletResponse response) {
model.addAttribute("status", "404"); model.addAttribute("status", "404");
model.addAttribute("error", "Error"); model.addAttribute("error", "Error");
model.addAttribute("message", e.getMessage()); model.addAttribute("message", e.getMessage());
model.addAttribute("dbadmin_userConf", userConf); model.addAttribute("dbadmin_userConf", userConf);
model.addAttribute("dbadmin_baseUrl", getBaseUrl()); model.addAttribute("dbadmin_baseUrl", getBaseUrl());
model.addAttribute("dbadmin_version", dbAdmin.getVersion()); model.addAttribute("dbadmin_version", dbAdmin.getVersion());
response.setStatus(404);
return "other/error"; return "other/error";
} }