Controller Blueprints Microservice

[ccsdk/cds.git] / ms / controllerblueprints / modules / service / src / main / java / org / onap / ccsdk / apps / controllerblueprints / service / ResourceDictionaryService.java

diff --git a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/ResourceDictionaryService.java b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/ResourceDictionaryService.java
index ccf4ffc..70e43d6 100644 (file)
--- a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/ResourceDictionaryService.java
+++ b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/ResourceDictionaryService.java
@@ -105,11 +105,9 @@ public class ResourceDictionaryService {
      */\r
     public ResourceDictionary saveResourceDictionary(ResourceDictionary resourceDictionary) {\r
         Preconditions.checkNotNull(resourceDictionary, "Resource Dictionary information is missing");\r
-        Preconditions.checkArgument(StringUtils.isNotBlank(resourceDictionary.getDefinition()),\r
-                "Resource Dictionary definition information is missing");\r
+        Preconditions.checkNotNull(resourceDictionary.getDefinition(),"Resource Dictionary definition information is missing");\r
 \r
-        ResourceDefinition resourceDefinition =\r
-                JacksonUtils.readValue(resourceDictionary.getDefinition(), ResourceDefinition.class);\r
+        ResourceDefinition resourceDefinition = resourceDictionary.getDefinition();\r
         Preconditions.checkNotNull(resourceDefinition, "failed to get resource definition from content");\r
         // Validate the Resource Definitions\r
         resourceDictionaryValidationService.validate(resourceDefinition);\r
@@ -126,9 +124,6 @@ public class ResourceDictionaryService {
             resourceDictionary.setEntrySchema(propertyDefinition.getEntrySchema().getType());\r
         }\r
 \r
-        String definitionContent = JacksonUtils.getJson(resourceDefinition, true);\r
-        resourceDictionary.setDefinition(definitionContent);\r
-\r
         ResourceDictionaryValidator.validateResourceDictionary(resourceDictionary);\r
 \r
         Optional<ResourceDictionary> dbResourceDictionaryData =\r