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>

2 files changed, 10 insertions, 53 deletions

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 4c55e7534..cba2570ea 100644
--- 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;

     private String content;

     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")

-    private Date createdDate = new Date();

+    private Date creationDate = new Date();

 

     @Override

     public String toString() {

@@ -80,12 +80,12 @@ public class ConfigModelContent {
         this.content = content;

     }

 

-    public Date getCreatedDate() {

-        return createdDate;

+    public Date getCreationDate() {

+        return creationDate;

     }

 

-    public void setCreatedDate(Date createdDate) {

-        this.createdDate = createdDate;

+    public void setCreationDate(Date creationDate) {

+        this.creationDate = creationDate;

     }

 

 }

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 c62bf69b2..d97d3a395 100644
--- 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 @@
 

 package org.onap.ccsdk.features.model.domain;

 

+import com.fasterxml.jackson.databind.JsonNode;

 import java.io.Serializable;

 import java.util.Date;

 

 public class ResourceDictionary implements Serializable {

     private static final long serialVersionUID = 1L;

-

     private Long id;

     private String name;

-    private String resourcePath;

-    private String resourceType;

     private String dataType;

     private String entrySchema;

-    private String validValues;

-    private String sampleValue;

-    private String definition;

+    private JsonNode definition;

     private String description;

     private String tags;

     private Date creationDate;

@@ -40,16 +36,9 @@ public class ResourceDictionary implements Serializable {
     @Override

     public String toString() {

         StringBuilder buffer = new StringBuilder("[");

-        buffer.append("id = " + id);

-        buffer.append(", name = " + name);

-        buffer.append(", resourcePath = " + resourcePath);

-        buffer.append(", resourceType = " + resourceType);

+        buffer.append("name = " + name);

         buffer.append(", dataType = " + dataType);

         buffer.append(", entrySchema = " + entrySchema);

-        buffer.append(", validValues = " + validValues);

-        buffer.append(", definition =" + definition);

-        buffer.append(", description = " + description);

-        buffer.append(", tags = " + tags);

         buffer.append(", creationDate = " + creationDate);

         buffer.append("]");

         return buffer.toString();

@@ -71,22 +60,6 @@ public class ResourceDictionary implements Serializable {
         this.name = name;

     }

 

-    public String getResourcePath() {

-        return resourcePath;

-    }

-

-    public void setResourcePath(String resourcePath) {

-        this.resourcePath = resourcePath;

-    }

-

-    public String getResourceType() {

-        return resourceType;

-    }

-

-    public void setResourceType(String resourceType) {

-        this.resourceType = resourceType;

-    }

-

     public String getDataType() {

         return dataType;

     }

@@ -103,27 +76,11 @@ public class ResourceDictionary implements Serializable {
         this.entrySchema = entrySchema;

     }

 

-    public String getValidValues() {

-        return validValues;

-    }

-

-    public void setValidValues(String validValues) {

-        this.validValues = validValues;

-    }

-

-    public String getSampleValue() {

-        return sampleValue;

-    }

-

-    public void setSampleValue(String sampleValue) {

-        this.sampleValue = sampleValue;

-    }

-

-    public String getDefinition() {

+    public JsonNode getDefinition() {

         return definition;

     }

 

-    public void setDefinition(String definition) {

+    public void setDefinition(JsonNode definition) {

         this.definition = definition;

     }