import java.util.List;
import org.akraino.validation.ui.entity.Submission;
-import org.akraino.validation.ui.service.SubmissionService;
+import org.akraino.validation.ui.service.DbSubmissionAdapter;
import org.onap.portalsdk.core.controller.RestrictedBaseController;
import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
import org.onap.portalsdk.core.web.support.UserUtils;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@Controller
-@RequestMapping("/api/submission")
+@RequestMapping("/api/v1/submission")
public class SubmissionController extends RestrictedBaseController {
@Autowired
- SubmissionService service;
+ DbSubmissionAdapter service;
private static final EELFLoggerDelegate LOGGER = EELFLoggerDelegate.getLogger(SubmissionController.class);
super();
}
- @RequestMapping(value = {"/"}, method = RequestMethod.GET)
+ @RequestMapping(value = { "/" }, method = RequestMethod.GET)
public ResponseEntity<List<Submission>> getSubmissions() {
try {
return new ResponseEntity<>(service.getSubmissions(), HttpStatus.OK);
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null);
}
- @RequestMapping(value = {"/"}, method = RequestMethod.POST)
- public ResponseEntity<Submission> postSubmission(@RequestBody Submission newSubmission) {
+ @RequestMapping(value = { "/{id}" }, method = RequestMethod.GET)
+ public ResponseEntity<Submission> getSubmission(@PathVariable("id") String submissionId) {
try {
- return new ResponseEntity<>(service.saveSubmission(newSubmission), HttpStatus.OK);
+ return new ResponseEntity<>(service.getSubmission(submissionId), HttpStatus.OK);
} catch (Exception e) {
- LOGGER.error(EELFLoggerDelegate.errorLogger, "Post of submission failed. " + UserUtils.getStackTrace(e));
+ LOGGER.error(EELFLoggerDelegate.errorLogger, "Get of submission failed. " + UserUtils.getStackTrace(e));
}
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null);
}
- @RequestMapping(value = {"/"}, method = RequestMethod.DELETE)
- public ResponseEntity<Boolean> deleteSubmission(@RequestBody Submission submission) {
+ @RequestMapping(value = { "/" }, method = RequestMethod.POST)
+ public ResponseEntity<Submission> postSubmission(@RequestBody Submission submission) {
try {
- service.deleteSubmission(submission.getSubmissionId());
- return new ResponseEntity<>(true, HttpStatus.OK);
+ return new ResponseEntity<>(service.saveSubmission(submission), HttpStatus.OK);
} catch (Exception e) {
- LOGGER.error(EELFLoggerDelegate.errorLogger,
- "Deletion of submission failed. " + UserUtils.getStackTrace(e));
+ LOGGER.error(EELFLoggerDelegate.errorLogger, "Post of submission failed. " + UserUtils.getStackTrace(e));
}
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null);
}