hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-16 06:23:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

improves error display for disabled opensearch and invalid format

Browse Source
This commit is contained in:
Oliver Goldschmidt
2018-08-01 11:13:13 +02:00
parent f3bdbe43cf
commit b00bae2c23
1 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
dspace-spring-rest/src/main/java/org/dspace/app/rest/OpenSearchController.java
View File

@@ -24,6 +24,7 @@ import org.w3c.dom.Document;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.Model; import org.springframework.ui.Model;
import org.springframework.boot.autoconfigure.web.ErrorController;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
@@ -59,10 +60,10 @@ import org.dspace.authorize.service.AuthorizeService;
*/ */
@Controller @Controller
@RequestMapping("/opensearch") @RequestMapping("/opensearch")
public class OpenSearchController { public class OpenSearchController implements ErrorController {
private static final Logger log = Logger.getLogger(ScopeResolver.class); private static final Logger log = Logger.getLogger(ScopeResolver.class);
private static final String errorpath = "/error";
private List<String> searchIndices = null; private List<String> searchIndices = null;
private CommunityService communityService; private CommunityService communityService;
@@ -106,7 +107,11 @@ public class OpenSearchController {
// TODO: make that work correctly // TODO: make that work correctly
if (!openSearchService.getFormats().contains(format)) if (!openSearchService.getFormats().contains(format))
{ {
response.sendError(HttpServletResponse.SC_BAD_REQUEST); String err = "Format "+format+" is not supported.";
response.setContentType("text/html");
response.setContentLength(err.length());
response.getWriter().write(err);
//response.sendError(HttpServletResponse.SC_BAD_REQUEST);
//return "error"; //return "error";
} }
@@ -160,6 +165,10 @@ public class OpenSearchController {
} }
else { else {
log.debug("OpenSearch Service is disabled"); log.debug("OpenSearch Service is disabled");
String err = "OpenSearch Service is disabled";
response.setContentType("text/html");
response.setContentLength(err.length());
response.getWriter().write(err);
} }
} }
@@ -182,9 +191,23 @@ public class OpenSearchController {
} }
else { else {
log.debug("OpenSearch Service is disabled"); log.debug("OpenSearch Service is disabled");
String err = "OpenSearch Service is disabled";
response.setContentType("text/html");
response.setContentLength(err.length());
response.getWriter().write(err);
} }
} }
@RequestMapping(value = errorpath)
public String error() {
return "Error handling";
}
@Override
public String getErrorPath() {
return errorpath;
}
/** /**
* Internal method for controller initialization * Internal method for controller initialization
* Not used currently * Not used currently