Merge "added test case to PropertyOperatorTest.java"

[ccsdk/apps.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..fd73db3 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
@@ -22,8 +22,9 @@ import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;\r
 import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintException;\r
 import org.onap.ccsdk.apps.controllerblueprints.core.data.PropertyDefinition;\r
-import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils;\r
 import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceDefinition;\r
+import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceSourceMapping;\r
+import org.onap.ccsdk.apps.controllerblueprints.resource.dict.factory.ResourceSourceMappingFactory;\r
 import org.onap.ccsdk.apps.controllerblueprints.service.domain.ResourceDictionary;\r
 import org.onap.ccsdk.apps.controllerblueprints.service.repository.ResourceDictionaryRepository;\r
 import org.onap.ccsdk.apps.controllerblueprints.service.validator.ResourceDictionaryValidator;\r
@@ -105,17 +106,13 @@ 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
 \r
-        resourceDictionary.setResourceType(resourceDefinition.getResourceType());\r
-        resourceDictionary.setResourcePath(resourceDefinition.getResourcePath());\r
         resourceDictionary.setTags(resourceDefinition.getTags());\r
         resourceDefinition.setUpdatedBy(resourceDictionary.getUpdatedBy());\r
         // Set the Property Definitions\r
@@ -126,9 +123,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
@@ -139,8 +133,6 @@ public class ResourceDictionaryService {
             dbResourceDictionary.setName(resourceDictionary.getName());\r
             dbResourceDictionary.setDefinition(resourceDictionary.getDefinition());\r
             dbResourceDictionary.setDescription(resourceDictionary.getDescription());\r
-            dbResourceDictionary.setResourceType(resourceDictionary.getResourceType());\r
-            dbResourceDictionary.setResourcePath(resourceDictionary.getResourcePath());\r
             dbResourceDictionary.setTags(resourceDictionary.getTags());\r
             dbResourceDictionary.setUpdatedBy(resourceDictionary.getUpdatedBy());\r
             dbResourceDictionary.setDataType(resourceDictionary.getDataType());\r
@@ -162,4 +154,12 @@ public class ResourceDictionaryService {
         Preconditions.checkArgument(StringUtils.isNotBlank(name), "Resource dictionary Name Information is missing.");\r
         resourceDictionaryRepository.deleteByName(name);\r
     }\r
+\r
+    /**\r
+     * This is a getResourceSourceMapping service\r
+     *\r
+     */\r
+    public ResourceSourceMapping getResourceSourceMapping() {\r
+        return ResourceSourceMappingFactory.INSTANCE.getRegisterSourceMapping();\r
+    }\r
 }\r