3 files changed, 6 insertions, 10 deletions
diff --git a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/domain/ModelType.java b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/domain/ModelType.java
index d8fea60e..33c7ae42 100644
--- a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/domain/ModelType.java
+++ b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/domain/ModelType.java
@@ -84,7 +84,7 @@ public class ModelType implements Serializable {
 
     @Override
     public String toString() {
-        String buffer = "[" + ", modelName = " + modelName +
+        return "[" + ", modelName = " + modelName +
                 ", derivedFrom = " + derivedFrom +
                 ", definitionType = " + definitionType +
                 ", description = " + description +
@@ -93,7 +93,6 @@ public class ModelType implements Serializable {
                 ", updatedBy = " + updatedBy +
                 ", tags = " + tags +
                 "]";
-        return buffer;
     }
 
     public String getModelName() {
diff --git a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/domain/ResourceDictionary.java b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/domain/ResourceDictionary.java
index 42c8e83b..5352d9c9 100644
--- a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/domain/ResourceDictionary.java
+++ b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/domain/ResourceDictionary.java
@@ -78,7 +78,7 @@ public class ResourceDictionary implements Serializable {
 
     @Override
     public String toString() {
-        String buffer = "[" + ", name = " + name +
+        return "[" + ", name = " + name +
                 ", dataType = " + dataType +
                 ", entrySchema = " + entrySchema +
                 ", definition =" + definition +
@@ -87,7 +87,6 @@ public class ResourceDictionary implements Serializable {
                 ", tags = " + tags +
                 ", creationDate = " + creationDate +
                 "]";
-        return buffer;
     }
 
     public String getName() {
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 287d413c..9b2209e8 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
@@ -47,13 +47,12 @@ public class ResourceDictionaryRest {
 
     @PostMapping(path = "", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
     public @ResponseBody
-    ResourceDictionary saveResourceDictionary(@RequestBody ResourceDictionary dataDictionary)
-            throws BluePrintException {
+    ResourceDictionary saveResourceDictionary(@RequestBody ResourceDictionary dataDictionary) {
         return resourceDictionaryService.saveResourceDictionary(dataDictionary);
     }
 
     @DeleteMapping(path = "/{name}")
-    public void deleteResourceDictionaryByName(@PathVariable(value = "name") String name) throws BluePrintException {
+    public void deleteResourceDictionaryByName(@PathVariable(value = "name") String name) {
         resourceDictionaryService.deleteResourceDictionary(name);
     }
 
@@ -65,14 +64,13 @@ public class ResourceDictionaryRest {
 
     @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 {
+    List<ResourceDictionary> searchResourceDictionaryByNames(@RequestBody List<String> names) {
         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 {
+    List<ResourceDictionary> searchResourceDictionaryByTags(@PathVariable(value = "tags") String tags) {
         return resourceDictionaryService.searchResourceDictionaryByTags(tags);
 
     }