Merge "[RECV-94] Separate docker/robot invoking"

[validation.git] / ui / src / main / java / org / akraino / validation / ui / controller / SubmissionController.java

diff --git a/ui/src/main/java/org/akraino/validation/ui/controller/SubmissionController.java b/ui/src/main/java/org/akraino/validation/ui/controller/SubmissionController.java
index ca78b0d..fb6f8e0 100644 (file)
--- a/ui/src/main/java/org/akraino/validation/ui/controller/SubmissionController.java
+++ b/ui/src/main/java/org/akraino/validation/ui/controller/SubmissionController.java
@@ -1,17 +1,17 @@
 /*
  * Copyright (c) 2019 AT&T Intellectual Property. All rights reserved.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License. You may obtain
+ * a copy of the License at
  *
- *        http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 package org.akraino.validation.ui.controller;
 
@@ -19,55 +19,48 @@ import java.util.List;
 
 import org.akraino.validation.ui.entity.Submission;
 import org.akraino.validation.ui.service.SubmissionService;
-import org.apache.log4j.Logger;
+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.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.RequestMethod;
 
-@RestController
+@Controller
 @RequestMapping("/api/submission")
-public class SubmissionController {
+public class SubmissionController extends RestrictedBaseController {
 
     @Autowired
     SubmissionService service;
 
-    private static final Logger LOGGER = Logger.getLogger(SubmissionController.class);
+    private static final EELFLoggerDelegate LOGGER = EELFLoggerDelegate.getLogger(SubmissionController.class);
 
-    @GetMapping("/")
+    public SubmissionController() {
+        super();
+    }
+
+    @RequestMapping(value = {"/"}, method = RequestMethod.GET)
     public ResponseEntity<List<Submission>> getSubmissions() {
         try {
             return new ResponseEntity<>(service.getSubmissions(), HttpStatus.OK);
         } catch (Exception e) {
-            LOGGER.error(e);
+            LOGGER.error(EELFLoggerDelegate.errorLogger, "Get of submissions failed. " + UserUtils.getStackTrace(e));
         }
         return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null);
     }
 
-    @PostMapping("/")
+    @RequestMapping(value = {"/"}, method = RequestMethod.POST)
     public ResponseEntity<Submission> postSubmission(@RequestBody Submission newSubmission) {
         try {
-            return new ResponseEntity<>(service.saveSubmission(newSubmission), HttpStatus.CREATED);
+            return new ResponseEntity<>(service.saveSubmission(newSubmission), HttpStatus.OK);
         } catch (Exception e) {
-            LOGGER.error(e);
+            LOGGER.error(EELFLoggerDelegate.errorLogger, "Post of submission failed. " + UserUtils.getStackTrace(e));
         }
         return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null);
     }
 
-    @DeleteMapping("/")
-    public ResponseEntity<Boolean> deleteSubmission(@RequestBody Submission submission) {
-        try {
-            service.deleteSubmission(submission.getSubmissionId());
-            return new ResponseEntity<>(true, HttpStatus.OK);
-        } catch (Exception e) {
-            LOGGER.error(e);
-        }
-        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(false);
-    }
-
 }