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>

diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/dao/ConfigResourceDaoTest.java b/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/dao/ConfigResourceDaoTest.java
index 7bc9189..99b0c0b 100644 (file)
--- a/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/dao/ConfigResourceDaoTest.java
+++ b/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/dao/ConfigResourceDaoTest.java
@@ -28,7 +28,6 @@ import org.junit.FixMethodOrder;
 import org.junit.Test;\r
 import org.junit.runner.RunWith;\r
 import org.junit.runners.MethodSorters;\r
-import org.onap.ccsdk.features.data.adaptor.dao.ConfigResourceDao;\r
 import org.onap.ccsdk.features.data.adaptor.domain.ConfigResource;\r
 import org.onap.ccsdk.features.data.adaptor.domain.ResourceAssignmentData;\r
 import org.springframework.beans.factory.annotation.Autowired;\r

diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/dao/ConfigTransactionLogDaoTest.java b/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/dao/ConfigTransactionLogDaoTest.java
index 22e9be9..38cd1b2 100644 (file)
--- a/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/dao/ConfigTransactionLogDaoTest.java
+++ b/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/dao/ConfigTransactionLogDaoTest.java
@@ -27,8 +27,6 @@ import org.junit.Test;
 import org.junit.runner.RunWith;\r
 import org.junit.runners.MethodSorters;\r
 import org.onap.ccsdk.features.data.adaptor.DataAdaptorConstants;\r
-import org.onap.ccsdk.features.data.adaptor.dao.NamedQueryExecutorDao;\r
-import org.onap.ccsdk.features.data.adaptor.dao.TransactionLogDao;\r
 import org.onap.ccsdk.features.data.adaptor.domain.TransactionLog;\r
 import org.springframework.beans.factory.annotation.Autowired;\r
 import org.springframework.test.context.ContextConfiguration;\r

diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/dao/QueryExecutorDaoTest.java b/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/dao/QueryExecutorDaoTest.java
index ee7029f..ddc9495 100644 (file)
--- a/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/dao/QueryExecutorDaoTest.java
+++ b/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/dao/QueryExecutorDaoTest.java
@@ -24,7 +24,6 @@ import org.junit.FixMethodOrder;
 import org.junit.Test;\r
 import org.junit.runner.RunWith;\r
 import org.junit.runners.MethodSorters;\r
-import org.onap.ccsdk.features.data.adaptor.dao.QueryExecutorDao;\r
 import org.springframework.beans.factory.annotation.Autowired;\r
 import org.springframework.test.context.ContextConfiguration;\r
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;\r

diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/service/ConfigResourceNodeTest.java b/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/service/ConfigResourceNodeTest.java
index 61a2e31..05df76c 100644 (file)
--- a/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/service/ConfigResourceNodeTest.java
+++ b/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/service/ConfigResourceNodeTest.java
@@ -28,9 +28,6 @@ import org.onap.ccsdk.features.data.adaptor.dao.ConfigResourceDao;
 import org.onap.ccsdk.features.data.adaptor.dao.NamedQueryExecutorDao;\r
 import org.onap.ccsdk.features.data.adaptor.dao.QueryExecutorDao;\r
 import org.onap.ccsdk.features.data.adaptor.dao.TransactionLogDao;\r
-import org.onap.ccsdk.features.data.adaptor.service.ConfigResourceNode;\r
-import org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService;\r
-import org.onap.ccsdk.features.data.adaptor.service.ConfigResourceServiceImpl;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;\r
 import org.springframework.beans.factory.annotation.Autowired;\r

diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/service/ConfigResourceServiceTest.java b/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/service/ConfigResourceServiceTest.java
index cecede8..76d28d1 100644 (file)
--- a/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/service/ConfigResourceServiceTest.java
+++ b/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/service/ConfigResourceServiceTest.java
@@ -37,8 +37,6 @@ import org.onap.ccsdk.features.data.adaptor.dao.TransactionLogDao;
 import org.onap.ccsdk.features.data.adaptor.domain.ConfigResource;\r
 import org.onap.ccsdk.features.data.adaptor.domain.ResourceAssignmentData;\r
 import org.onap.ccsdk.features.data.adaptor.domain.TransactionLog;\r
-import org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService;\r
-import org.onap.ccsdk.features.data.adaptor.service.ConfigResourceServiceImpl;\r
 import org.springframework.beans.factory.annotation.Autowired;\r
 import org.springframework.test.context.ContextConfiguration;\r
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;\r

diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/features/rest/adaptor/service/AbstractConfigRestClientAdapterTest.java b/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/features/rest/adaptor/service/AbstractConfigRestClientAdapterTest.java
index 201623d..b6891a0 100644 (file)
--- a/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/features/rest/adaptor/service/AbstractConfigRestClientAdapterTest.java
+++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/features/rest/adaptor/service/AbstractConfigRestClientAdapterTest.java
@@ -25,9 +25,6 @@ import java.util.stream.Collectors;
 import org.junit.Assert;\r
 import org.junit.Before;\r
 import org.junit.Test;\r
-import org.onap.ccsdk.features.rest.adaptor.service.ConfigRestClientServiceAdapter;\r
-import org.onap.ccsdk.features.rest.adaptor.service.GenericRestClientAdapterImpl;\r
-import org.onap.ccsdk.features.rest.adaptor.service.SSLRestClientAdapterImpl;\r
 \r
 public class AbstractConfigRestClientAdapterTest {\r
 \r

diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/features/rest/adaptor/service/GenericRestClientServiceTest.java b/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/features/rest/adaptor/service/GenericRestClientServiceTest.java
index f660cca..36599cc 100644 (file)
--- a/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/features/rest/adaptor/service/GenericRestClientServiceTest.java
+++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/features/rest/adaptor/service/GenericRestClientServiceTest.java
@@ -26,9 +26,6 @@ import org.junit.Test;
 import org.junit.runner.RunWith;\r
 import org.mockito.Matchers;\r
 import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorException;\r
-import org.onap.ccsdk.features.rest.adaptor.service.AbstractConfigRestClientAdapter;\r
-import org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorService;\r
-import org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorServiceImpl;\r
 import org.powermock.core.classloader.annotations.PowerMockIgnore;\r
 import org.powermock.core.classloader.annotations.PrepareForTest;\r
 import org.powermock.modules.junit4.PowerMockRunner;\r

diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/features/rest/adaptor/service/SSLClientServiceTest.java b/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/features/rest/adaptor/service/SSLClientServiceTest.java
index e8b3a02..8e09f1b 100644 (file)
--- a/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/features/rest/adaptor/service/SSLClientServiceTest.java
+++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/features/rest/adaptor/service/SSLClientServiceTest.java
@@ -26,9 +26,6 @@ import org.junit.Test;
 import org.junit.runner.RunWith;\r
 import org.mockito.Matchers;\r
 import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorException;\r
-import org.onap.ccsdk.features.rest.adaptor.service.AbstractConfigRestClientAdapter;\r
-import org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorService;\r
-import org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorServiceImpl;\r
 import org.powermock.core.classloader.annotations.PowerMockIgnore;\r
 import org.powermock.core.classloader.annotations.PrepareForTest;\r
 import org.powermock.modules.junit4.PowerMockRunner;\r

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 43a4881..a93e6de 100644 (file)
--- 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;\r
 import org.mockito.runners.MockitoJUnitRunner;\r
 import org.mockito.stubbing.Answer;\r
-import org.onap.ccsdk.features.assignment.processor.DBResourceProcessor;\r
 import org.onap.ccsdk.features.assignment.service.ConfigResourceAssignmentTestUtils;\r
 import org.onap.ccsdk.features.data.adaptor.domain.TransactionLog;\r
 import org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService;\r

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 df38003..16fd6c0 100644 (file)
--- 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;\r
 import org.mockito.runners.MockitoJUnitRunner;\r
 import org.mockito.stubbing.Answer;\r
-import org.onap.ccsdk.features.assignment.processor.DefaultResourceProcessor;\r
 import org.onap.ccsdk.features.assignment.service.ConfigResourceAssignmentTestUtils;\r
 import org.onap.ccsdk.features.data.adaptor.domain.TransactionLog;\r
 import org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService;\r

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 cd0b782..add00d3 100644 (file)
--- 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;\r
 import org.mockito.runners.MockitoJUnitRunner;\r
 import org.mockito.stubbing.Answer;\r
-import org.onap.ccsdk.features.assignment.processor.InputResourceProcessor;\r
 import org.onap.ccsdk.features.assignment.service.ConfigResourceAssignmentTestUtils;\r
 import org.onap.ccsdk.features.data.adaptor.domain.TransactionLog;\r
 import org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService;\r

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 5f73f32..10a4353 100644 (file)
--- 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;\r
 import org.mockito.runners.MockitoJUnitRunner;\r
 import org.mockito.stubbing.Answer;\r
-import org.onap.ccsdk.features.assignment.processor.MdsalResourceProcessor;\r
 import org.onap.ccsdk.features.assignment.service.ConfigResourceAssignmentTestUtils;\r
 import org.onap.ccsdk.features.model.ConfigModelConstant;\r
 import org.onap.ccsdk.features.model.data.ResourceAssignment;\r

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 41911e9..0fe6c92 100644 (file)
--- 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;\r
 import org.mockito.runners.MockitoJUnitRunner;\r
 import org.onap.ccsdk.features.assignment.ConfigAssignmentConstants;\r
-import org.onap.ccsdk.features.assignment.service.ConfigAssignmentNode;\r
 import org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService;\r
 import org.onap.ccsdk.features.generator.service.ConfigGeneratorService;\r
 import org.onap.ccsdk.features.generator.service.ConfigGeneratorServiceImpl;\r

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 0d15542..be4ca03 100644 (file)
--- 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;\r
 import org.mockito.runners.MockitoJUnitRunner;\r
 import org.onap.ccsdk.features.assignment.data.ResourceAssignmentData;\r
-import org.onap.ccsdk.features.assignment.service.ConfigPreviewService;\r
 import org.onap.ccsdk.features.data.adaptor.domain.ConfigResource;\r
 import org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService;\r
 import org.onap.ccsdk.features.generator.service.ConfigGeneratorService;\r

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 58a22ac..2054ee6 100644 (file)
--- 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;\r
 import org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService;\r
 import org.onap.ccsdk.features.generator.ConfigGeneratorConstant;\r
-import org.onap.ccsdk.features.generator.service.ConfigGeneratorNode;\r
 import org.onap.ccsdk.features.model.ConfigModelConstant;\r
 import org.onap.ccsdk.features.model.service.ConfigModelService;\r
 import org.onap.ccsdk.features.model.service.ConfigModelServiceImpl;\r

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 5891868..17dcf7d 100644 (file)
--- 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;
 \r
 import org.junit.Assert;\r
 import org.junit.Test;\r
-import org.onap.ccsdk.features.generator.tool.EscapeUtils;\r
 \r
 public class EscapeUtilsTest {\r
 \r

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 7a49979..25605fc 100644 (file)
--- 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;
 \r
 @JsonIgnoreProperties(ignoreUnknown = true)\r
 public class ResourceDefinition {\r
-    private String tags;\r
 \r
     @JsonProperty(value = "name", required = true)\r
     private String name;\r
 \r
+    @JsonProperty(value = "tags")\r
+    private String tags;\r
+\r
     @JsonProperty(value = "property")\r
     private PropertyDefinition property;\r
 \r
     @JsonProperty(value = "updated-by")\r
     private String updatedBy;\r
 \r
-    @JsonProperty(value = "resource-type", required = true)\r
-    private String resourceType;\r
-\r
-    @JsonProperty(value = "resource-path", required = true)\r
-    private String resourcePath;\r
-\r
     @JsonProperty(value = "sources", required = true)\r
     private Map<String, SourcesDefinition> sourcesDefinition;\r
 \r
@@ -76,22 +72,6 @@ public class ResourceDefinition {
         this.updatedBy = updatedBy;\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 getResourcePath() {\r
-        return resourcePath;\r
-    }\r
-\r
-    public void setResourcePath(String resourcePath) {\r
-        this.resourcePath = resourcePath;\r
-    }\r
-\r
     public Map<String, SourcesDefinition> getSources() {\r
         return sourcesDefinition;\r
     }\r

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 8ba4471..0ce7eda 100644 (file)
--- 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 @@
 \r
 package org.onap.ccsdk.features.model.data.dict;\r
 \r
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;\r
 import com.fasterxml.jackson.annotation.JsonProperty;\r
 \r
+@JsonIgnoreProperties(ignoreUnknown = true)\r
 public class SourcesDefinition {\r
 \r
     @JsonProperty(value = "type", required = true)\r

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 2a57617..696e151 100644 (file)
--- 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;
 \r
 import java.util.List;\r
 import java.util.Map;\r
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;\r
 import com.fasterxml.jackson.annotation.JsonProperty;\r
 \r
+@JsonIgnoreProperties(ignoreUnknown = true)\r
 public class SourcesProperties {\r
 \r
-    @JsonProperty(value = "name")\r
-    private String name;\r
-\r
-    @JsonProperty(value = "base")\r
-    private String base;\r
+    @JsonProperty(value = "key")\r
+    private String key;\r
 \r
     @JsonProperty(value = "type")\r
     private String type;\r
@@ -38,6 +37,9 @@ public class SourcesProperties {
     @JsonProperty(value = "url-path")\r
     private String urlPath;\r
 \r
+    @JsonProperty(value = "expression-type")\r
+    private String expressionType;\r
+\r
     @JsonProperty(value = "path")\r
     private String path;\r
 \r
@@ -50,20 +52,12 @@ public class SourcesProperties {
     @JsonProperty("key-dependencies")\r
     private List<String> dependencies;\r
 \r
-    public String getName() {\r
-        return name;\r
-    }\r
-\r
-    public void setName(String name) {\r
-        this.name = name;\r
-    }\r
-\r
-    public String getBase() {\r
-        return base;\r
+    public String getKey() {\r
+        return key;\r
     }\r
 \r
-    public void setBase(String base) {\r
-        this.base = base;\r
+    public void setKey(String key) {\r
+        this.key = key;\r
     }\r
 \r
     public String getType() {\r
@@ -94,6 +88,14 @@ public class SourcesProperties {
         return path;\r
     }\r
 \r
+    public void setExpressionType(String expressionType) {\r
+        this.expressionType = expressionType;\r
+    }\r
+\r
+    public String getExpressionType() {\r
+        return expressionType;\r
+    }\r
+\r
     public void setPath(String path) {\r
         this.path = path;\r
     }\r

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 9965f61..760c245 100644 (file)
--- 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;\r
 import org.junit.Assert;\r
 import org.junit.Test;\r
-import org.onap.ccsdk.features.model.ValidTypes;\r
 import org.onap.ccsdk.features.model.data.PropertyDefinition;\r
 import org.onap.ccsdk.features.model.data.ResourceAssignment;\r
 import org.onap.ccsdk.features.model.data.dict.ResourceDefinition;\r

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 1875f11..8ff1ff8 100644 (file)
--- 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;
 \r
 import org.junit.Assert;\r
 import org.junit.Test;\r
-import org.onap.ccsdk.features.model.utils.JsonParserUtils;\r
 import com.fasterxml.jackson.databind.JsonNode;\r
 \r
 public class JsonParserUtilsTest {\r

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 9cc3fc6..96d5f89 100644 (file)
--- 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;\r
 import org.junit.Test;\r
 import org.onap.ccsdk.features.model.ValidTypes;\r
-import org.onap.ccsdk.features.model.utils.JsonUtils;\r
 import com.fasterxml.jackson.databind.node.ArrayNode;\r
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;\r
 import com.fasterxml.jackson.databind.node.ObjectNode;\r

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 01548b6..60ef240 100644 (file)
--- 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;\r
 import org.onap.ccsdk.features.model.data.ResourceAssignment;\r
 import org.onap.ccsdk.features.model.data.dict.ResourceDefinition;\r
-import org.onap.ccsdk.features.model.utils.ResourceAssignmentUtils;\r
 import com.fasterxml.jackson.core.type.TypeReference;\r
 import com.fasterxml.jackson.databind.JsonNode;\r
 import com.fasterxml.jackson.databind.ObjectMapper;\r

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 df330b6..525dda4 100644 (file)
--- 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;\r
 import org.onap.ccsdk.features.model.data.CapabilityAssignment;\r
 import org.onap.ccsdk.features.model.data.NodeTemplate;\r
-import org.onap.ccsdk.features.model.utils.ServiceTemplateUtils;\r
 \r
 public class ServiceTemplateUtilsTest {\r
 \r

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 feb6321..f73bc1a 100644 (file)
--- 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;\r
 import java.util.Map;\r
 import org.junit.Test;\r
-import org.onap.ccsdk.features.model.utils.TransformationUtils;\r
 import com.fasterxml.jackson.databind.JsonNode;\r
 \r
 public class TransformationUtilsTest {\r

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 a95f301..72a49eb 100644 (file)
--- 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;\r
 import org.apache.commons.io.IOUtils;\r
 import org.junit.Test;\r
-import org.onap.ccsdk.features.model.validator.ServiceTemplateValidator;\r
 import com.att.eelf.configuration.EELFLogger;\r
 import com.att.eelf.configuration.EELFManager;\r
 \r