UI adaptation for supporting ONAP portal SDK

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

diff --git a/ui/src/main/java/org/akraino/validation/ui/controller/TimeSlotsController.java b/ui/src/main/java/org/akraino/validation/ui/controller/TimeslotsController.java
similarity index 51%
rename from ui/src/main/java/org/akraino/validation/ui/controller/TimeSlotsController.java
rename to ui/src/main/java/org/akraino/validation/ui/controller/TimeslotsController.java
index d6da8a9..0f4f8d1 100644 (file)
--- a/ui/src/main/java/org/akraino/validation/ui/controller/TimeSlotsController.java
+++ b/ui/src/main/java/org/akraino/validation/ui/controller/TimeslotsController.java
@@ -1,49 +1,56 @@
 /*
  * 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;
 
 import java.util.List;
 
 import org.akraino.validation.ui.entity.Timeslot;
 import org.akraino.validation.ui.service.TimeslotService;
-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.GetMapping;
+import org.springframework.stereotype.Controller;
 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/timeslots")
-public class TimeSlotsController {
+public class TimeslotsController extends RestrictedBaseController {
+
+    private static final EELFLoggerDelegate LOGGER = EELFLoggerDelegate.getLogger(TimeslotsController.class);
 
     @Autowired
     TimeslotService service;
 
-    private static final Logger LOGGER = Logger.getLogger(TimeSlotsController.class);
+    public TimeslotsController() {
+        super();
+    }
 
-    @GetMapping("/")
+    @RequestMapping(value = {"/"}, method = RequestMethod.GET)
     public ResponseEntity<List<Timeslot>> getTimeSlots() {
         try {
             return new ResponseEntity<>(service.getTimeslots(), HttpStatus.OK);
         } catch (Exception e) {
-            LOGGER.error(e);
+            LOGGER.error(EELFLoggerDelegate.errorLogger,
+                    "Error occured when trying to retrieve timeslots. " + UserUtils.getStackTrace(e));
         }
         return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null);
     }
-
 }