Code Review
/
validation.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Generate Tempest test report"
[validation.git]
/
ui
/
src
/
main
/
java
/
org
/
akraino
/
validation
/
ui
/
controller
/
BlueprintInstanceController.java
diff --git
a/ui/src/main/java/org/akraino/validation/ui/controller/BlueprintInstanceController.java
b/ui/src/main/java/org/akraino/validation/ui/controller/BlueprintInstanceController.java
index
6acdba8
..
84e0636
100644
(file)
--- a/
ui/src/main/java/org/akraino/validation/ui/controller/BlueprintInstanceController.java
+++ b/
ui/src/main/java/org/akraino/validation/ui/controller/BlueprintInstanceController.java
@@
-13,35
+13,43
@@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
* 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.BlueprintInstance;
import org.akraino.validation.ui.service.BlueprintInstanceService;
package org.akraino.validation.ui.controller;
import java.util.List;
import org.akraino.validation.ui.entity.BlueprintInstance;
import org.akraino.validation.ui.service.BlueprintInstanceService;
-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.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.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+@Controller
+@RequestMapping("/api/v1/blueprintinstance")
+public class BlueprintInstanceController extends RestrictedBaseController {
-@RestController
-@RequestMapping("/api/blueprintInstance")
-public class BlueprintInstanceController {
+ private static final EELFLoggerDelegate LOGGER = EELFLoggerDelegate.getLogger(BlueprintInstanceController.class);
@Autowired
BlueprintInstanceService service;
@Autowired
BlueprintInstanceService service;
- private static final Logger LOGGER = Logger.getLogger(BlueprintInstanceController.class);
+ public BlueprintInstanceController() {
+ super();
+ }
- @
GetMapping("/"
)
+ @
RequestMapping(value = { "/" }, method = RequestMethod.GET
)
public ResponseEntity<List<BlueprintInstance>> getBlueprintInstances() {
try {
return new ResponseEntity<>(service.getBlueprintInstances(), HttpStatus.OK);
} catch (Exception e) {
public ResponseEntity<List<BlueprintInstance>> getBlueprintInstances() {
try {
return new ResponseEntity<>(service.getBlueprintInstances(), HttpStatus.OK);
} catch (Exception e) {
- LOGGER.error(e);
+ LOGGER.error(EELFLoggerDelegate.errorLogger,
+ "Error when trying to get blueprint instances for validation. " + UserUtils.getStackTrace(e));
}
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null);
}
}
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null);
}