X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=validation.git;a=blobdiff_plain;f=ui%2Fsrc%2Fmain%2Fjava%2Forg%2Fakraino%2Fvalidation%2Fui%2Fcontroller%2FSiloController.java;fp=ui%2Fsrc%2Fmain%2Fjava%2Forg%2Fakraino%2Fvalidation%2Fui%2Fcontroller%2FResultsController.java;h=18f4f72c6ab3b8a0775ac6cec1209ac39b165e3b;hp=a4b460dd776b25ce5f366911c2bf41265ae28899;hb=2eba847ebb6acb2686be08eb1cdafc1b12071e7d;hpb=f86b9715d156238532fcb0bf464bd72e9cf7ce96

diff --git a/ui/src/main/java/org/akraino/validation/ui/controller/ResultsController.java b/ui/src/main/java/org/akraino/validation/ui/controller/SiloController.java
similarity index 66%
rename from ui/src/main/java/org/akraino/validation/ui/controller/ResultsController.java
rename to ui/src/main/java/org/akraino/validation/ui/controller/SiloController.java
index a4b460d..18f4f72 100644
--- a/ui/src/main/java/org/akraino/validation/ui/controller/ResultsController.java
+++ b/ui/src/main/java/org/akraino/validation/ui/controller/SiloController.java
@@ -13,12 +13,13 @@
  * implied. See the License for the specific language governing
  * permissions and limitations under the License.
  */
+
 package org.akraino.validation.ui.controller;
 
 import java.util.List;
 
-import org.akraino.validation.ui.client.nexus.resources.WrapperRobotTestResult;
-import org.akraino.validation.ui.service.ResultService;
+import org.akraino.validation.ui.entity.LabSilo;
+import org.akraino.validation.ui.service.SiloService;
 import org.onap.portalsdk.core.controller.RestrictedBaseController;
 import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
 import org.onap.portalsdk.core.web.support.UserUtils;
@@ -26,32 +27,30 @@ import org.springframework.beans.factory.annotation.Autowired;
 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.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
 @Controller
-@RequestMapping("/api/results")
-public class ResultsController extends RestrictedBaseController {
+@RequestMapping("/api/v1/silo")
+public class SiloController extends RestrictedBaseController {
 
-    private static final EELFLoggerDelegate LOGGER = EELFLoggerDelegate.getLogger(ResultsController.class);
+    private static final EELFLoggerDelegate LOGGER = EELFLoggerDelegate.getLogger(SiloController.class);
 
     @Autowired
-    ResultService service;
+    SiloService service;
 
-    public ResultsController() {
+    public SiloController() {
         super();
     }
 
-    @RequestMapping(value = {"/getBySubmissionId/{id}"}, method = RequestMethod.GET)
-    public ResponseEntity<List<WrapperRobotTestResult>> getByBlueprintId(@PathVariable("id") String submissionId) {
+    @RequestMapping(value = { "/" }, method = RequestMethod.GET)
+    public ResponseEntity<List<LabSilo>> getSilos() {
         try {
-            return new ResponseEntity<>(service.getRobotTestResults(submissionId), HttpStatus.OK);
+            return new ResponseEntity<>(service.getSilos(), HttpStatus.OK);
         } catch (Exception e) {
             LOGGER.error(EELFLoggerDelegate.errorLogger,
-                    "Error when retrieving results. " + UserUtils.getStackTrace(e));
+                    "Error when trying to get lab silos. " + UserUtils.getStackTrace(e));
         }
         return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null);
     }
-
 }