SDN Controller Blueprints Processor

Changing Resource Dictionary Definition data-type from String to JsonNode and other implementation to consume Resource Definitions List from Blueprints Artifacts

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

diff --git a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ConfigAssignmentUtils.java b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ConfigAssignmentUtils.java
index 1d7df6b..15221ae 100644 (file)
--- a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ConfigAssignmentUtils.java
+++ b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ConfigAssignmentUtils.java
@@ -56,14 +56,10 @@ public class ConfigAssignmentUtils {
 \r
     public static synchronized Object getContextKeyValue(SvcLogicContext context, String key) {\r
         Object value = null;\r
-        if (context != null && key != null) {\r
-            if (context.getAttributeKeySet().contains(key)) {\r
-                String strValue = context.getAttribute(key);\r
-                if (StringUtils.isNotBlank(strValue)) {\r
-                    value = strValue;\r
-                }\r
-            } else {\r
-                // Do Nothing\r
+        if (context != null && key != null && context.getAttributeKeySet().contains(key)) {\r
+            String strValue = context.getAttribute(key);\r
+            if (StringUtils.isNotBlank(strValue)) {\r
+                value = strValue;\r
             }\r
         }\r
         return value;\r
@@ -135,9 +131,9 @@ public class ConfigAssignmentUtils {
         ResourceDefinition resourceDefinition = null;\r
         if (dictionaries != null && StringUtils.isNotBlank(dictionaryName)) {\r
             ResourceDictionary resourceDictionary = dictionaries.get(dictionaryName);\r
-            if (resourceDictionary != null && StringUtils.isNotBlank(resourceDictionary.getDefinition())) {\r
+            if (resourceDictionary != null && resourceDictionary.getDefinition() != null) {\r
                 resourceDefinition =\r
-                        TransformationUtils.readValue(resourceDictionary.getDefinition(), ResourceDefinition.class);\r
+                        TransformationUtils.treeToValue(resourceDictionary.getDefinition(), ResourceDefinition.class);\r
             }\r
         }\r
         return resourceDefinition;\r

diff --git a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ResourceDictionaryService.java b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ResourceDictionaryService.java
index ec586f4..d8692c4 100644 (file)
--- a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ResourceDictionaryService.java
+++ b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ResourceDictionaryService.java
@@ -51,11 +51,9 @@ public class ResourceDictionaryService {
                 List<String> names = new ArrayList<>();\r
                 for (ResourceAssignment resourceAssignment : resourceAssignments) {\r
                     if (resourceAssignment != null && StringUtils.isNotBlank(resourceAssignment.getDictionaryName())) {\r
-\r
                         if (!names.contains(resourceAssignment.getDictionaryName())) {\r
                             names.add(resourceAssignment.getDictionaryName());\r
                         }\r
-\r
                         if (resourceAssignment.getDependencies() != null\r
                                 && !resourceAssignment.getDependencies().isEmpty()) {\r
                             List<String> dependencieNames = resourceAssignment.getDependencies();\r
@@ -83,7 +81,7 @@ public class ResourceDictionaryService {
         if (!names.isEmpty()) {\r
 \r
             String dictionaryContents = configRestAdaptorService.postResource(\r
-                    ConfigRestAdaptorConstants.SELECTOR_MODEL_SERVICE, "dictionarybynames", names, String.class);\r
+                    ConfigRestAdaptorConstants.SELECTOR_MODEL_SERVICE, "dictionary/by-names", names, String.class);\r
 \r
             if (StringUtils.isNotBlank(dictionaryContents)) {\r
                 List<ResourceDictionary> dataDictionaries =\r
@@ -91,9 +89,9 @@ public class ResourceDictionaryService {
                 if (dataDictionaries != null) {\r
                     for (ResourceDictionary dataDictionary : dataDictionaries) {\r
                         if (dataDictionary != null && StringUtils.isNotBlank(dataDictionary.getName())\r
-                                && StringUtils.isNotBlank(dataDictionary.getDefinition())) {\r
+                                && dataDictionary.getDefinition() != null) {\r
                             ResourceDefinition resourceDefinition = TransformationUtils\r
-                                    .readValue(dataDictionary.getDefinition(), ResourceDefinition.class);\r
+                                    .treeToValue(dataDictionary.getDefinition(), ResourceDefinition.class);\r
                             if (resourceDefinition != null && StringUtils.isNotBlank(resourceDefinition.getName())) {\r
                                 dictionaries.put(resourceDefinition.getName(), resourceDefinition);\r
                             } else {\r

diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/domain/ConfigModelContent.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/domain/ConfigModelContent.java
index 4c55e75..cba2570 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/domain/ConfigModelContent.java
+++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/domain/ConfigModelContent.java
@@ -28,7 +28,7 @@ public class ConfigModelContent {
     private String description;\r
     private String content;\r
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")\r
-    private Date createdDate = new Date();\r
+    private Date creationDate = new Date();\r
 \r
     @Override\r
     public String toString() {\r
@@ -80,12 +80,12 @@ public class ConfigModelContent {
         this.content = content;\r
     }\r
 \r
-    public Date getCreatedDate() {\r
-        return createdDate;\r
+    public Date getCreationDate() {\r
+        return creationDate;\r
     }\r
 \r
-    public void setCreatedDate(Date createdDate) {\r
-        this.createdDate = createdDate;\r
+    public void setCreationDate(Date creationDate) {\r
+        this.creationDate = creationDate;\r
     }\r
 \r
 }\r

diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/domain/ResourceDictionary.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/domain/ResourceDictionary.java
index c62bf69..d97d3a3 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/domain/ResourceDictionary.java
+++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/domain/ResourceDictionary.java
@@ -17,21 +17,17 @@
 \r
 package org.onap.ccsdk.features.model.domain;\r
 \r
+import com.fasterxml.jackson.databind.JsonNode;\r
 import java.io.Serializable;\r
 import java.util.Date;\r
 \r
 public class ResourceDictionary implements Serializable {\r
     private static final long serialVersionUID = 1L;\r
-\r
     private Long id;\r
     private String name;\r
-    private String resourcePath;\r
-    private String resourceType;\r
     private String dataType;\r
     private String entrySchema;\r
-    private String validValues;\r
-    private String sampleValue;\r
-    private String definition;\r
+    private JsonNode definition;\r
     private String description;\r
     private String tags;\r
     private Date creationDate;\r
@@ -40,16 +36,9 @@ public class ResourceDictionary implements Serializable {
     @Override\r
     public String toString() {\r
         StringBuilder buffer = new StringBuilder("[");\r
-        buffer.append("id = " + id);\r
-        buffer.append(", name = " + name);\r
-        buffer.append(", resourcePath = " + resourcePath);\r
-        buffer.append(", resourceType = " + resourceType);\r
+        buffer.append("name = " + name);\r
         buffer.append(", dataType = " + dataType);\r
         buffer.append(", entrySchema = " + entrySchema);\r
-        buffer.append(", validValues = " + validValues);\r
-        buffer.append(", definition =" + definition);\r
-        buffer.append(", description = " + description);\r
-        buffer.append(", tags = " + tags);\r
         buffer.append(", creationDate = " + creationDate);\r
         buffer.append("]");\r
         return buffer.toString();\r
@@ -71,22 +60,6 @@ public class ResourceDictionary implements Serializable {
         this.name = name;\r
     }\r
 \r
-    public String getResourcePath() {\r
-        return resourcePath;\r
-    }\r
-\r
-    public void setResourcePath(String resourcePath) {\r
-        this.resourcePath = resourcePath;\r
-    }\r
-\r
-    public String getResourceType() {\r
-        return resourceType;\r
-    }\r
-\r
-    public void setResourceType(String resourceType) {\r
-        this.resourceType = resourceType;\r
-    }\r
-\r
     public String getDataType() {\r
         return dataType;\r
     }\r
@@ -103,27 +76,11 @@ public class ResourceDictionary implements Serializable {
         this.entrySchema = entrySchema;\r
     }\r
 \r
-    public String getValidValues() {\r
-        return validValues;\r
-    }\r
-\r
-    public void setValidValues(String validValues) {\r
-        this.validValues = validValues;\r
-    }\r
-\r
-    public String getSampleValue() {\r
-        return sampleValue;\r
-    }\r
-\r
-    public void setSampleValue(String sampleValue) {\r
-        this.sampleValue = sampleValue;\r
-    }\r
-\r
-    public String getDefinition() {\r
+    public JsonNode getDefinition() {\r
         return definition;\r
     }\r
 \r
-    public void setDefinition(String definition) {\r
+    public void setDefinition(JsonNode definition) {\r
         this.definition = definition;\r
     }\r
 \r