SDN Controller Blueprints Processor

Changing java beans for Resource Definition Dictionaries as per new Schema

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

18 files changed, 24 insertions, 55 deletions

diff --git a/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/processor/DBResourceProcessorTest.java b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/processor/DBResourceProcessorTest.java
index 43a4881d5..a93e6de2e 100644
--- a/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/processor/DBResourceProcessorTest.java
+++ b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/processor/DBResourceProcessorTest.java
@@ -37,7 +37,6 @@ import org.mockito.MockitoAnnotations;
 import org.mockito.invocation.InvocationOnMock;

 import org.mockito.runners.MockitoJUnitRunner;

 import org.mockito.stubbing.Answer;

-import org.onap.ccsdk.features.assignment.processor.DBResourceProcessor;

 import org.onap.ccsdk.features.assignment.service.ConfigResourceAssignmentTestUtils;

 import org.onap.ccsdk.features.data.adaptor.domain.TransactionLog;

 import org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService;

diff --git a/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/processor/DefaultResourceProcessorTest.java b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/processor/DefaultResourceProcessorTest.java
index df3800387..16fd6c0bd 100644
--- a/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/processor/DefaultResourceProcessorTest.java
+++ b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/processor/DefaultResourceProcessorTest.java
@@ -35,7 +35,6 @@ import org.mockito.MockitoAnnotations;
 import org.mockito.invocation.InvocationOnMock;

 import org.mockito.runners.MockitoJUnitRunner;

 import org.mockito.stubbing.Answer;

-import org.onap.ccsdk.features.assignment.processor.DefaultResourceProcessor;

 import org.onap.ccsdk.features.assignment.service.ConfigResourceAssignmentTestUtils;

 import org.onap.ccsdk.features.data.adaptor.domain.TransactionLog;

 import org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService;

diff --git a/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/processor/InputResourceProcessorTest.java b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/processor/InputResourceProcessorTest.java
index cd0b7828e..add00d3a9 100644
--- a/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/processor/InputResourceProcessorTest.java
+++ b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/processor/InputResourceProcessorTest.java
@@ -35,7 +35,6 @@ import org.mockito.MockitoAnnotations;
 import org.mockito.invocation.InvocationOnMock;

 import org.mockito.runners.MockitoJUnitRunner;

 import org.mockito.stubbing.Answer;

-import org.onap.ccsdk.features.assignment.processor.InputResourceProcessor;

 import org.onap.ccsdk.features.assignment.service.ConfigResourceAssignmentTestUtils;

 import org.onap.ccsdk.features.data.adaptor.domain.TransactionLog;

 import org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService;

diff --git a/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/processor/MdsalResourceProcessorTest.java b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/processor/MdsalResourceProcessorTest.java
index 5f73f32e3..10a43538c 100644
--- a/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/processor/MdsalResourceProcessorTest.java
+++ b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/processor/MdsalResourceProcessorTest.java
@@ -33,7 +33,6 @@ import org.mockito.Mockito;
 import org.mockito.invocation.InvocationOnMock;

 import org.mockito.runners.MockitoJUnitRunner;

 import org.mockito.stubbing.Answer;

-import org.onap.ccsdk.features.assignment.processor.MdsalResourceProcessor;

 import org.onap.ccsdk.features.assignment.service.ConfigResourceAssignmentTestUtils;

 import org.onap.ccsdk.features.model.ConfigModelConstant;

 import org.onap.ccsdk.features.model.data.ResourceAssignment;

diff --git a/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/service/ConfigAssignmentNodeTest.java b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/service/ConfigAssignmentNodeTest.java
index 41911e91d..0fe6c9261 100644
--- a/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/service/ConfigAssignmentNodeTest.java
+++ b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/service/ConfigAssignmentNodeTest.java
@@ -34,7 +34,6 @@ import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;

 import org.mockito.runners.MockitoJUnitRunner;

 import org.onap.ccsdk.features.assignment.ConfigAssignmentConstants;

-import org.onap.ccsdk.features.assignment.service.ConfigAssignmentNode;

 import org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService;

 import org.onap.ccsdk.features.generator.service.ConfigGeneratorService;

 import org.onap.ccsdk.features.generator.service.ConfigGeneratorServiceImpl;

diff --git a/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/service/ConfigPreviewServiceTest.java b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/service/ConfigPreviewServiceTest.java
index 0d15542f4..be4ca0381 100644
--- a/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/service/ConfigPreviewServiceTest.java
+++ b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/service/ConfigPreviewServiceTest.java
@@ -30,7 +30,6 @@ import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;

 import org.mockito.runners.MockitoJUnitRunner;

 import org.onap.ccsdk.features.assignment.data.ResourceAssignmentData;

-import org.onap.ccsdk.features.assignment.service.ConfigPreviewService;

 import org.onap.ccsdk.features.data.adaptor.domain.ConfigResource;

 import org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService;

 import org.onap.ccsdk.features.generator.service.ConfigGeneratorService;

diff --git a/blueprints-processor/plugin/generator-provider/src/test/java/org/onap/ccsdk/features/generator/service/ConfigGeneratorNodeTest.java b/blueprints-processor/plugin/generator-provider/src/test/java/org/onap/ccsdk/features/generator/service/ConfigGeneratorNodeTest.java
index 58a22ac14..2054ee681 100644
--- a/blueprints-processor/plugin/generator-provider/src/test/java/org/onap/ccsdk/features/generator/service/ConfigGeneratorNodeTest.java
+++ b/blueprints-processor/plugin/generator-provider/src/test/java/org/onap/ccsdk/features/generator/service/ConfigGeneratorNodeTest.java
@@ -39,7 +39,6 @@ import org.onap.ccsdk.features.data.adaptor.domain.ConfigResource;
 import org.onap.ccsdk.features.data.adaptor.domain.TransactionLog;

 import org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService;

 import org.onap.ccsdk.features.generator.ConfigGeneratorConstant;

-import org.onap.ccsdk.features.generator.service.ConfigGeneratorNode;

 import org.onap.ccsdk.features.model.ConfigModelConstant;

 import org.onap.ccsdk.features.model.service.ConfigModelService;

 import org.onap.ccsdk.features.model.service.ConfigModelServiceImpl;

diff --git a/blueprints-processor/plugin/generator-provider/src/test/java/org/onap/ccsdk/features/generator/tool/EscapeUtilsTest.java b/blueprints-processor/plugin/generator-provider/src/test/java/org/onap/ccsdk/features/generator/tool/EscapeUtilsTest.java
index 58918685d..17dcf7d07 100644
--- a/blueprints-processor/plugin/generator-provider/src/test/java/org/onap/ccsdk/features/generator/tool/EscapeUtilsTest.java
+++ b/blueprints-processor/plugin/generator-provider/src/test/java/org/onap/ccsdk/features/generator/tool/EscapeUtilsTest.java
@@ -19,7 +19,6 @@ package org.onap.ccsdk.features.generator.tool;
 

 import org.junit.Assert;

 import org.junit.Test;

-import org.onap.ccsdk.features.generator.tool.EscapeUtils;

 

 public class EscapeUtilsTest {

 

diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/dict/ResourceDefinition.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/dict/ResourceDefinition.java
index 7a49979a5..25605fcd2 100644
--- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/dict/ResourceDefinition.java
+++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/dict/ResourceDefinition.java
@@ -24,23 +24,19 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 

 @JsonIgnoreProperties(ignoreUnknown = true)

 public class ResourceDefinition {

-    private String tags;

 

     @JsonProperty(value = "name", required = true)

     private String name;

 

+    @JsonProperty(value = "tags")

+    private String tags;

+

     @JsonProperty(value = "property")

     private PropertyDefinition property;

 

     @JsonProperty(value = "updated-by")

     private String updatedBy;

 

-    @JsonProperty(value = "resource-type", required = true)

-    private String resourceType;

-

-    @JsonProperty(value = "resource-path", required = true)

-    private String resourcePath;

-

     @JsonProperty(value = "sources", required = true)

     private Map<String, SourcesDefinition> sourcesDefinition;

 

@@ -76,22 +72,6 @@ public class ResourceDefinition {
         this.updatedBy = updatedBy;

     }

 

-    public String getResourceType() {

-        return resourceType;

-    }

-

-    public void setResourceType(String resourceType) {

-        this.resourceType = resourceType;

-    }

-

-    public String getResourcePath() {

-        return resourcePath;

-    }

-

-    public void setResourcePath(String resourcePath) {

-        this.resourcePath = resourcePath;

-    }

-

     public Map<String, SourcesDefinition> getSources() {

         return sourcesDefinition;

     }

diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/dict/SourcesDefinition.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/dict/SourcesDefinition.java
index 8ba4471e3..0ce7eda37 100644
--- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/dict/SourcesDefinition.java
+++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/dict/SourcesDefinition.java
@@ -17,8 +17,10 @@
 

 package org.onap.ccsdk.features.model.data.dict;

 

+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

 import com.fasterxml.jackson.annotation.JsonProperty;

 

+@JsonIgnoreProperties(ignoreUnknown = true)

 public class SourcesDefinition {

 

     @JsonProperty(value = "type", required = true)

diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/dict/SourcesProperties.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/dict/SourcesProperties.java
index 2a57617ec..696e1516d 100644
--- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/dict/SourcesProperties.java
+++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/dict/SourcesProperties.java
@@ -19,15 +19,14 @@ package org.onap.ccsdk.features.model.data.dict;
 

 import java.util.List;

 import java.util.Map;

+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

 import com.fasterxml.jackson.annotation.JsonProperty;

 

+@JsonIgnoreProperties(ignoreUnknown = true)

 public class SourcesProperties {

 

-    @JsonProperty(value = "name")

-    private String name;

-

-    @JsonProperty(value = "base")

-    private String base;

+    @JsonProperty(value = "key")

+    private String key;

 

     @JsonProperty(value = "type")

     private String type;

@@ -38,6 +37,9 @@ public class SourcesProperties {
     @JsonProperty(value = "url-path")

     private String urlPath;

 

+    @JsonProperty(value = "expression-type")

+    private String expressionType;

+

     @JsonProperty(value = "path")

     private String path;

 

@@ -50,20 +52,12 @@ public class SourcesProperties {
     @JsonProperty("key-dependencies")

     private List<String> dependencies;

 

-    public String getName() {

-        return name;

-    }

-

-    public void setName(String name) {

-        this.name = name;

-    }

-

-    public String getBase() {

-        return base;

+    public String getKey() {

+        return key;

     }

 

-    public void setBase(String base) {

-        this.base = base;

+    public void setKey(String key) {

+        this.key = key;

     }

 

     public String getType() {

@@ -94,6 +88,14 @@ public class SourcesProperties {
         return path;

     }

 

+    public void setExpressionType(String expressionType) {

+        this.expressionType = expressionType;

+    }

+

+    public String getExpressionType() {

+        return expressionType;

+    }

+

     public void setPath(String path) {

         this.path = path;

     }

diff --git a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/ResourceDictionaryUtilsTest.java b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/ResourceDictionaryUtilsTest.java
index 9965f61c6..760c245fd 100644
--- a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/ResourceDictionaryUtilsTest.java
+++ b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/ResourceDictionaryUtilsTest.java
@@ -21,7 +21,6 @@ import java.util.Arrays;
 import java.util.HashMap;

 import org.junit.Assert;

 import org.junit.Test;

-import org.onap.ccsdk.features.model.ValidTypes;

 import org.onap.ccsdk.features.model.data.PropertyDefinition;

 import org.onap.ccsdk.features.model.data.ResourceAssignment;

 import org.onap.ccsdk.features.model.data.dict.ResourceDefinition;

diff --git a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/JsonParserUtilsTest.java b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/JsonParserUtilsTest.java
index 1875f115d..8ff1ff8de 100644
--- a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/JsonParserUtilsTest.java
+++ b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/JsonParserUtilsTest.java
@@ -19,7 +19,6 @@ package org.onap.ccsdk.features.model.utils;
 

 import org.junit.Assert;

 import org.junit.Test;

-import org.onap.ccsdk.features.model.utils.JsonParserUtils;

 import com.fasterxml.jackson.databind.JsonNode;

 

 public class JsonParserUtilsTest {

diff --git a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/JsonUtilsTest.java b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/JsonUtilsTest.java
index 9cc3fc681..96d5f89f5 100644
--- a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/JsonUtilsTest.java
+++ b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/JsonUtilsTest.java
@@ -20,7 +20,6 @@ package org.onap.ccsdk.features.model.utils;
 import static org.junit.Assert.assertTrue;

 import org.junit.Test;

 import org.onap.ccsdk.features.model.ValidTypes;

-import org.onap.ccsdk.features.model.utils.JsonUtils;

 import com.fasterxml.jackson.databind.node.ArrayNode;

 import com.fasterxml.jackson.databind.node.JsonNodeFactory;

 import com.fasterxml.jackson.databind.node.ObjectNode;

diff --git a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/ResourceAssignmentUtilsTest.java b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/ResourceAssignmentUtilsTest.java
index 01548b648..60ef24049 100644
--- a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/ResourceAssignmentUtilsTest.java
+++ b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/ResourceAssignmentUtilsTest.java
@@ -30,7 +30,6 @@ import org.onap.ccsdk.features.model.ValidTypes;
 import org.onap.ccsdk.features.model.data.PropertyDefinition;

 import org.onap.ccsdk.features.model.data.ResourceAssignment;

 import org.onap.ccsdk.features.model.data.dict.ResourceDefinition;

-import org.onap.ccsdk.features.model.utils.ResourceAssignmentUtils;

 import com.fasterxml.jackson.core.type.TypeReference;

 import com.fasterxml.jackson.databind.JsonNode;

 import com.fasterxml.jackson.databind.ObjectMapper;

diff --git a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/ServiceTemplateUtilsTest.java b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/ServiceTemplateUtilsTest.java
index df330b69e..525dda4e1 100644
--- a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/ServiceTemplateUtilsTest.java
+++ b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/ServiceTemplateUtilsTest.java
@@ -24,7 +24,6 @@ import org.junit.Test;
 import org.onap.ccsdk.features.model.data.ArtifactDefinition;

 import org.onap.ccsdk.features.model.data.CapabilityAssignment;

 import org.onap.ccsdk.features.model.data.NodeTemplate;

-import org.onap.ccsdk.features.model.utils.ServiceTemplateUtils;

 

 public class ServiceTemplateUtilsTest {

 

diff --git a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/TransformationUtilsTest.java b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/TransformationUtilsTest.java
index feb6321d2..f73bc1af2 100644
--- a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/TransformationUtilsTest.java
+++ b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/TransformationUtilsTest.java
@@ -22,7 +22,6 @@ import static org.junit.Assert.assertTrue;
 import java.util.HashMap;

 import java.util.Map;

 import org.junit.Test;

-import org.onap.ccsdk.features.model.utils.TransformationUtils;

 import com.fasterxml.jackson.databind.JsonNode;

 

 public class TransformationUtilsTest {

diff --git a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/validator/ServiceTemplateValidationTest.java b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/validator/ServiceTemplateValidationTest.java
index a95f301f0..72a49ebc7 100644
--- a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/validator/ServiceTemplateValidationTest.java
+++ b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/validator/ServiceTemplateValidationTest.java
@@ -20,7 +20,6 @@ package org.onap.ccsdk.features.model.validator;
 import java.nio.charset.Charset;

 import org.apache.commons.io.IOUtils;

 import org.junit.Test;

-import org.onap.ccsdk.features.model.validator.ServiceTemplateValidator;

 import com.att.eelf.configuration.EELFLogger;

 import com.att.eelf.configuration.EELFManager;