TreeTestResultCollectionDao testResultCollectionDao,\r
TestManagerService testManagerService,\r
SlcAgentDescriptorDao slcAgentDescriptorDao) {\r
- if (log.isDebugEnabled())\r
- log.debug("In SlcServiceController Constructor");\r
\r
this.testManagerService = testManagerService;\r
this.treeTestResultDao = treeTestResultDao;\r
}\r
\r
// Business Methods\r
-\r
@RequestMapping("/isServerReady.service")\r
- protected String isServerReady(Model model) {\r
- if (log.isDebugEnabled())\r
- log.debug("SlcServiceController :: isServerReady ");\r
+ protected ExecutionAnswer isServerReady(Model model) {\r
// Does nothing for now, it will return an OK answer.\r
- model.addAttribute(KEY_ANSWER, ExecutionAnswer\r
- .ok("Execution completed properly"));\r
- return KEY_ANSWER;\r
+ return ExecutionAnswer.ok("Execution completed properly");\r
}\r
\r
@RequestMapping("/shutdownRuntime.service")\r
- protected String shutdownRuntime(Model model) {\r
- if (log.isDebugEnabled())\r
- log.debug("SlcServiceController :: shutdownRuntime");\r
-\r
+ protected ExecutionAnswer shutdownRuntime(Model model) {\r
new Thread() {\r
public void run() {\r
// wait in order to let call return\r
dynamicRuntime.shutdown();\r
}\r
}.start();\r
- ExecutionAnswer answer = ExecutionAnswer.ok("Server shutting down...");\r
- model.addAttribute(answer);\r
- return KEY_ANSWER;\r
+ return ExecutionAnswer.ok("Server shutting down...");\r
}\r
\r
@RequestMapping("/getResult.service")\r
- protected String getResult(\r
- @RequestParam(value = "uuid", required = false) String uuid,\r
- Model model) {\r
- if (log.isDebugEnabled())\r
- log.debug("In SlcServiceController In GetResultMethod");\r
+ protected TreeTestResult getResult(\r
+ @RequestParam(value = "uuid", required = false) String uuid) {\r
\r
TreeTestResult result = treeTestResultDao.getTestResult(uuid);\r
if (result == null)\r
throw new SlcException("No result found for uuid " + uuid);\r
- model.addAttribute("result", result);\r
- return "result";\r
+ return result;\r
}\r
\r
@RequestMapping("/addResultToCollection.service")\r
- protected String addResultToCollection(@RequestParam String collectionId,\r
- @RequestParam String resultUuid, Model model) {\r
- if (log.isDebugEnabled())\r
- log.debug("In SlcServiceController :: addResultToCollection");\r
-\r
+ protected ExecutionAnswer addResultToCollection(\r
+ @RequestParam String collectionId, @RequestParam String resultUuid) {\r
testManagerService.addResultToCollection(collectionId, resultUuid);\r
- model.addAttribute(KEY_ANSWER, ExecutionAnswer\r
- .ok("Execution completed properly"));\r
- return KEY_ANSWER;\r
+ return ExecutionAnswer.ok("Execution completed properly");\r
}\r
\r
@RequestMapping("/removeResultFromCollection.service")\r
- protected String removeResultFromCollection(HttpServletRequest request,\r
- Model model) {\r
- if (log.isDebugEnabled())\r
- log\r
- .debug("In SlcServiceController :: removeResultFromCollection.service");\r
-\r
+ protected ExecutionAnswer removeResultFromCollection(\r
+ HttpServletRequest request) {\r
String collectionId = request.getParameter("collectionId");\r
String[] resultUuids = request.getParameterValues("resultUuid");\r
String[] attrNames = request.getParameterValues("attrName");\r
\r
}\r
}\r
- model.addAttribute(KEY_ANSWER, ExecutionAnswer\r
- .ok("Execution completed properly"));\r
- return KEY_ANSWER;\r
+ return ExecutionAnswer.ok("Execution completed properly");\r
}\r
\r
@RequestMapping("/listCollectionRefs.service")\r
- protected String listCollectionRefs(HttpServletRequest request,\r
- HttpServletResponse response, Model model) {\r
-\r
- if (log.isDebugEnabled())\r
- log.debug("In SlcServiceController :: listCollectionRefs.service");\r
+ protected ReferenceList listCollectionRefs(HttpServletRequest request,\r
+ HttpServletResponse response) {\r
\r
SortedSet<TreeTestResultCollection> results = testResultCollectionDao\r
.listCollections();\r
for (TreeTestResultCollection collection : results) {\r
referenceList.getReferences().add(collection.getId());\r
}\r
-\r
- model.addAttribute("referenceList", referenceList);\r
- return "referenceList";\r
+ return referenceList;\r
}\r
\r
@RequestMapping("/listResultAttributes.service")\r
- protected String listResultAttributes(@RequestParam String id, Model model) {\r
-\r
- if (log.isDebugEnabled())\r
- log\r
- .debug("In SlcServiceController :: listResultAttributes.service");\r
+ protected ObjectList listResultAttributes(@RequestParam String id, Model model) {\r
\r
List<ResultAttributes> resultAttributes = testResultCollectionDao\r
.listResultAttributes(id);\r
-\r
- model.addAttribute("resultAttributesList", new ObjectList(\r
- resultAttributes));\r
- return "resultAttributesList";\r
+ return new ObjectList(\r
+ resultAttributes);\r
}\r
\r
@RequestMapping("/listResults.service")\r
@SuppressWarnings(value = { "unchecked" })\r
- protected String listResults(@RequestParam (value = "collectionId", required = false)String collectionId,\r
- HttpServletRequest request, Model model) {\r
-\r
- if (log.isDebugEnabled())\r
- log.debug("In SlcServiceController :: listResults.service");\r
-\r
+ protected ObjectList listResults(\r
+ @RequestParam(value = "collectionId", required = false) String collectionId,\r
+ HttpServletRequest request) {\r
Map<String, String[]> parameterMap = request.getParameterMap();\r
-\r
Map<String, String> attributes = new HashMap<String, String>();\r
for (String parameter : parameterMap.keySet()) {\r
if (parameter.startsWith("attr.")) {\r
\r
List<TreeTestResult> resultAttributes = testResultCollectionDao\r
.listResults(collectionId, attributes);\r
-\r
- model.addAttribute("resultList", new ObjectList(resultAttributes));\r
- return "resultList";\r
+ return new ObjectList(resultAttributes);\r
}\r
\r
@RequestMapping("/copyCollectionToCollection.service")\r
- protected String copyCollectionToCollection(\r
+ protected ExecutionAnswer copyCollectionToCollection(\r
@RequestParam String sourceCollectionId,\r
@RequestParam String targetCollectionId,\r
- HttpServletRequest request, Model model) {\r
-\r
- if (log.isDebugEnabled())\r
- log\r
- .debug("In SlcServiceController :: copyCollectionToCollection.service");\r
+ HttpServletRequest request) {\r
\r
String[] attrNames = request.getParameterValues("attrName");\r
String[] attrPatterns = request.getParameterValues("attrPattern");\r
treeTestResult.getUuid());\r
}\r
}\r
- model.addAttribute(KEY_ANSWER, ExecutionAnswer\r
- .ok("Execution completed properly"));\r
- return KEY_ANSWER;\r
+ return ExecutionAnswer.ok("Execution completed properly");\r
}\r
\r
@RequestMapping("/listAgents.service")\r
- protected String listAgents(Model model) {\r
+ protected ObjectList listAgents() {\r
if (log.isDebugEnabled())\r
- log.debug("In SlcServiceController :: listAgents.service");\r
-\r
+ log.debug("In ServiceController :: listAgents.service");\r
List<SlcAgentDescriptor> list = slcAgentDescriptorDao\r
.listSlcAgentDescriptors();\r
- model.addAttribute("list", new ObjectList(list));\r
- return "list";\r
+ return new ObjectList(list);\r
}\r
\r
@RequestMapping("/cleanAgents.service")\r
- protected String cleanAgents(Model model) {\r
-\r
- if (log.isDebugEnabled())\r
- log.debug("In SlcServiceController :: cleanAgents.service");\r
+ protected ExecutionAnswer cleanAgents() {\r
\r
List<SlcAgentDescriptor> list = slcAgentDescriptorDao\r
.listSlcAgentDescriptors();\r
for (SlcAgentDescriptor t : new Vector<SlcAgentDescriptor>(list)) {\r
slcAgentDescriptorDao.delete(t);\r
}\r
- model.addAttribute(KEY_ANSWER, ExecutionAnswer\r
- .ok("Execution completed properly"));\r
- return KEY_ANSWER;\r
+ return ExecutionAnswer.ok("Execution completed properly");\r
}\r
\r
@RequestMapping("/getAttachment.service")\r
- protected String getAttachment(@RequestParam String uuid,\r
+ protected void getAttachment(@RequestParam String uuid,\r
@RequestParam String contentType, @RequestParam String name,\r
- HttpServletResponse response, Model model) throws Exception {\r
- if (log.isDebugEnabled())\r
- log.debug("In SlcServiceController :: getAttachment");\r
-\r
+ HttpServletResponse response) throws Exception {\r
if (contentType == null || "".equals(contentType.trim())) {\r
if (name != null) {\r
contentType = FORCE_DOWNLOAD;\r
response.setContentType(contentType);\r
ServletOutputStream outputStream = response.getOutputStream();\r
attachmentsStorage.retrieveAttachment(resourceDescriptor, outputStream);\r
- return null;\r
}\r
\r
// IoC\r
projects / gpl / argeo-slc.git / blobdiff