Resource Resoulution Service

Implement Input Resource Resolution Processor Service along with Resource Resolution Utilities

Change-Id: Ibb4899e415f4b79cd6cd1b190b0f4969b09c3fe4
Issue-ID: CCSDK-936
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>

4 files changed, 8 insertions, 8 deletions

diff --git a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/SchemaGeneratorService.java b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/SchemaGeneratorService.java
index 89af9e9a9..3a1535ac0 100644
--- a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/SchemaGeneratorService.java
+++ b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/SchemaGeneratorService.java
@@ -59,7 +59,7 @@ public class SchemaGeneratorService {
      */

     public String generateSchema(String serviceTemplateContent) throws BluePrintException {

         if (StringUtils.isNotBlank(serviceTemplateContent)) {

-            ServiceTemplate serviceTemplate = JacksonUtils.readValue(serviceTemplateContent,

+            ServiceTemplate serviceTemplate = JacksonUtils.Companion.readValue(serviceTemplateContent,

                     ServiceTemplate.class);

             return generateSchema(serviceTemplate);

         } else {

diff --git a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/domain/JpaJsonNodeConverter.java b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/domain/JpaJsonNodeConverter.java
index 23d3a977b..074483a7c 100644
--- a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/domain/JpaJsonNodeConverter.java
+++ b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/domain/JpaJsonNodeConverter.java
@@ -30,11 +30,11 @@ public class JpaJsonNodeConverter implements
 

     @Override

     public String convertToDatabaseColumn(JsonNode node) {

-        return JacksonUtils.getJson(node, true);

+        return JacksonUtils.Companion.getJson(node, true);

     }

 

     @Override

     public JsonNode convertToEntityAttribute(String dbData) {

-        return JacksonUtils.jsonNode(dbData);

+        return JacksonUtils.Companion.jsonNode(dbData);

     }

 }
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/domain/JpaResourceDefinitionConverter.java b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/domain/JpaResourceDefinitionConverter.java
index 18672f1cb..e28cdcd5b 100644
--- a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/domain/JpaResourceDefinitionConverter.java
+++ b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/domain/JpaResourceDefinitionConverter.java
@@ -29,11 +29,11 @@ public class JpaResourceDefinitionConverter implements
         AttributeConverter<ResourceDefinition, String> {

     @Override

     public String convertToDatabaseColumn(ResourceDefinition resourceDefinition) {

-        return JacksonUtils.getJson(resourceDefinition);

+        return JacksonUtils.Companion.getJson(resourceDefinition);

     }

 

     @Override

     public ResourceDefinition convertToEntityAttribute(String content) {

-        return JacksonUtils.readValue(content, ResourceDefinition.class);

+        return JacksonUtils.Companion.readValue(content, ResourceDefinition.class);

     }

 }

diff --git a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/validator/ServiceTemplateValidator.java b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/validator/ServiceTemplateValidator.java
index 6d02544e4..5d15e0876 100644
--- a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/validator/ServiceTemplateValidator.java
+++ b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/validator/ServiceTemplateValidator.java
@@ -58,7 +58,7 @@ public class ServiceTemplateValidator extends BluePrintValidatorDefaultService {
     public boolean validateServiceTemplate(String serviceTemplateContent) throws BluePrintException {

         if (StringUtils.isNotBlank(serviceTemplateContent)) {

             ServiceTemplate serviceTemplate =

-                    JacksonUtils.readValue(serviceTemplateContent, ServiceTemplate.class);

+                    JacksonUtils.Companion.readValue(serviceTemplateContent, ServiceTemplate.class);

             return validateServiceTemplate(serviceTemplate);

         } else {

             throw new BluePrintException(

@@ -131,11 +131,11 @@ public class ServiceTemplateValidator extends BluePrintValidatorDefaultService {
                 Object mappingObject =

                         capabilityAssignment.getProperties().get(ConfigModelConstant.CAPABILITY_PROPERTY_MAPPING);

                 if (mappingObject != null) {

-                    String mappingContent = JacksonUtils.getJson(mappingObject);

+                    String mappingContent = JacksonUtils.Companion.getJson(mappingObject);

                     Preconditions.checkArgument(StringUtils.isNotBlank(mappingContent),

                             String.format("Failed to get capability mapping property (%s) ", ConfigModelConstant.CAPABILITY_PROPERTY_MAPPING));

 

-                    resourceAssignment = JacksonUtils.getListFromJson(mappingContent, ResourceAssignment.class);

+                    resourceAssignment = JacksonUtils.Companion.getListFromJson(mappingContent, ResourceAssignment.class);

 

                     Preconditions.checkNotNull(resourceAssignment,

                             String.format("Failed to get resource assignment info from the content (%s) ", mappingContent));