Controller Blueprints Microservice

Add Common Error Handling for ModelType, ServiceTemplate and ResourceDictionary Rest Services.

Change-Id: I8fa78bc4b1c38fd6149238da566e0867f64ffcc5
Issue-ID: CCSDK-522
Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>

3 files changed, 19 insertions, 75 deletions

diff --git a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ModelTypeRest.java b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ModelTypeRest.java
index 082b15078..988cad064 100644
--- a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ModelTypeRest.java
+++ b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ModelTypeRest.java
@@ -1,5 +1,6 @@
 /*

  * Copyright © 2017-2018 AT&T Intellectual Property.

+ * Modifications Copyright © 2018 IBM.

  *

  * Licensed under the Apache License, Version 2.0 (the "License");

  * you may not use this file except in compliance with the License.

@@ -44,48 +45,28 @@ public class ModelTypeRest {
 

     @GetMapping(path = "/{name}", produces = MediaType.APPLICATION_JSON_VALUE)

     public ModelType getModelTypeByName(@PathVariable(value = "name") String name) throws BluePrintException {

-        try {

-            return modelTypeService.getModelTypeByName(name);

-        } catch (Exception e) {

-            throw new BluePrintException(1000, e.getMessage(), e);

-        }

+        return modelTypeService.getModelTypeByName(name);

     }

 

     @GetMapping(path = "/search/{tags}", produces = MediaType.APPLICATION_JSON_VALUE)

     public List<ModelType> searchModelTypes(@PathVariable(value = "tags") String tags) throws BluePrintException {

-        try {

-            return modelTypeService.searchModelTypes(tags);

-        } catch (Exception e) {

-            throw new BluePrintException(1001, e.getMessage(), e);

-        }

+        return modelTypeService.searchModelTypes(tags);

     }

 

     @GetMapping(path = "/by-definition/{definitionType}", produces = MediaType.APPLICATION_JSON_VALUE)

     public @ResponseBody

     List<ModelType> getModelTypeByDefinitionType(@PathVariable(value = "definitionType") String definitionType) throws BluePrintException {

-        try {

-            return modelTypeService.getModelTypeByDefinitionType(definitionType);

-        } catch (Exception e) {

-            throw new BluePrintException(1002, e.getMessage(), e);

-        }

+        return modelTypeService.getModelTypeByDefinitionType(definitionType);

     }

 

     @PostMapping(path = "", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)

     public @ResponseBody

     ModelType saveModelType(@RequestBody ModelType modelType) throws BluePrintException {

-        try {

-            return modelTypeService.saveModel(modelType);

-        } catch (Exception e) {

-            throw new BluePrintException(1100, e.getMessage(), e);

-        }

+        return modelTypeService.saveModel(modelType);

     }

 

     @DeleteMapping(path = "/{name}")

     public void deleteModelTypeByName(@PathVariable(value = "name") String name) throws BluePrintException {

-        try {

-            modelTypeService.deleteByModelName(name);

-        } catch (Exception e) {

-            throw new BluePrintException(1400, e.getMessage(), e);

-        }

+        modelTypeService.deleteByModelName(name);

     }

 }

diff --git a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ResourceDictionaryRest.java b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ResourceDictionaryRest.java
index a4aced60c..e0cf6c69b 100644
--- a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ResourceDictionaryRest.java
+++ b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ResourceDictionaryRest.java
@@ -1,5 +1,6 @@
 /*

  * Copyright © 2017-2018 AT&T Intellectual Property.

+ * Modifications Copyright © 2018 IBM.

  *

  * Licensed under the Apache License, Version 2.0 (the "License");

  * you may not use this file except in compliance with the License.

@@ -47,51 +48,32 @@ public class ResourceDictionaryRest {
     public @ResponseBody

     ResourceDictionary saveResourceDictionary(@RequestBody ResourceDictionary dataDictionary)

             throws BluePrintException {

-        try {

-            return resourceDictionaryService.saveResourceDictionary(dataDictionary);

-        } catch (Exception e) {

-            throw new BluePrintException(4100, e.getMessage(), e);

-        }

+        return resourceDictionaryService.saveResourceDictionary(dataDictionary);

     }

 

     @DeleteMapping(path = "/{name}")

     public void deleteResourceDictionaryByName(@PathVariable(value = "name") String name) throws BluePrintException {

-        try {

-            resourceDictionaryService.deleteResourceDictionary(name);

-        } catch (Exception e) {

-            throw new BluePrintException(4400, e.getMessage(), e);

-        }

+        resourceDictionaryService.deleteResourceDictionary(name);

     }

 

     @GetMapping(path = "/{name}", produces = MediaType.APPLICATION_JSON_VALUE)

     public @ResponseBody

     ResourceDictionary getResourceDictionaryByName(@PathVariable(value = "name") String name) throws BluePrintException {

-        try {

-            return resourceDictionaryService.getResourceDictionaryByName(name);

-        } catch (Exception e) {

-            throw new BluePrintException(4001, e.getMessage(), e);

-        }

+        return resourceDictionaryService.getResourceDictionaryByName(name);

     }

 

     @PostMapping(path = "/by-names", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)

     public @ResponseBody

     List<ResourceDictionary> searchResourceDictionaryByNames(@RequestBody List<String> names)

             throws BluePrintException {

-        try {

-            return resourceDictionaryService.searchResourceDictionaryByNames(names);

-        } catch (Exception e) {

-            throw new BluePrintException(4002, e.getMessage(), e);

-        }

+        return resourceDictionaryService.searchResourceDictionaryByNames(names);

     }

 

     @GetMapping(path = "/search/{tags}", produces = MediaType.APPLICATION_JSON_VALUE)

     public @ResponseBody

     List<ResourceDictionary> searchResourceDictionaryByTags(@PathVariable(value = "tags") String tags) throws BluePrintException {

-        try {

-            return resourceDictionaryService.searchResourceDictionaryByTags(tags);

-        } catch (Exception e) {

-            throw new BluePrintException(4003, e.getMessage(), e);

-        }

+        return resourceDictionaryService.searchResourceDictionaryByTags(tags);

+

     }

 

 }

diff --git a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ServiceTemplateRest.java b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ServiceTemplateRest.java
index a22285b88..caa6bba4f 100644
--- a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ServiceTemplateRest.java
+++ b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ServiceTemplateRest.java
@@ -1,5 +1,6 @@
 /*

  * Copyright © 2017-2018 AT&T Intellectual Property.

+ * Modifications Copyright © 2018 IBM.

  *

  * Licensed under the Apache License, Version 2.0 (the "License");

  * you may not use this file except in compliance with the License.

@@ -49,53 +50,33 @@ public class ServiceTemplateRest {
     @PostMapping(path = "/enrich", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)

     public @ResponseBody

     ServiceTemplate enrichServiceTemplate(@RequestBody ServiceTemplate serviceTemplate) throws BluePrintException {

-        try {

-            return serviceTemplateService.enrichServiceTemplate(serviceTemplate);

-        } catch (Exception e) {

-            throw new BluePrintException(3500, e.getMessage(), e);

-        }

+        return serviceTemplateService.enrichServiceTemplate(serviceTemplate);

     }

 

     @PostMapping(path = "/validate", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)

     public @ResponseBody

     ServiceTemplate validateServiceTemplate(@RequestBody ServiceTemplate serviceTemplate) throws BluePrintException {

-        try {

-            return serviceTemplateService.validateServiceTemplate(serviceTemplate);

-        } catch (Exception e) {

-            throw new BluePrintException(3501, e.getMessage(), e);

-        }

+        return serviceTemplateService.validateServiceTemplate(serviceTemplate);

     }

 

     @PostMapping(path = "/resource-assignment/auto-map", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)

     public @ResponseBody

     AutoMapResponse autoMap(@RequestBody List<ResourceAssignment> resourceAssignments) throws BluePrintException {

-        try {

-            return serviceTemplateService.autoMap(resourceAssignments);

-        } catch (Exception e) {

-            throw new BluePrintException(3502, e.getMessage(), e);

-        }

+        return serviceTemplateService.autoMap(resourceAssignments);

     }

 

     @PostMapping(path = "/resource-assignment/validate", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)

     public @ResponseBody

     List<ResourceAssignment> validateResourceAssignments(@RequestBody List<ResourceAssignment> resourceAssignments)

             throws BluePrintException {

-        try {

-            return serviceTemplateService.validateResourceAssignments(resourceAssignments);

-        } catch (Exception e) {

-            throw new BluePrintException(3503, e.getMessage(), e);

-        }

+        return serviceTemplateService.validateResourceAssignments(resourceAssignments);

     }

 

     @PostMapping(path = "/resource-assignment/generate", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)

     public @ResponseBody

     List<ResourceAssignment> generateResourceAssignments(@RequestBody ConfigModelContent templateContent)

             throws BluePrintException {

-        try {

-            return serviceTemplateService.generateResourceAssignments(templateContent);

-        } catch (Exception e) {

-            throw new BluePrintException(3504, e.getMessage(), e);

-        }

+        return serviceTemplateService.generateResourceAssignments(templateContent);

     }

 

 }