Controller Blueprints Microservice

Add resource assignment enhancer, resource definition repo functions and code improvements.

Change-Id: I751bf8149a36f80c20d48b86344cd6bd3054ed21
Issue-ID: CCSDK-431
Signed-off-by: Muthuramalingam, Brinda Santh(bs2796) <bs2796@att.com>

6 files changed, 18 insertions, 18 deletions

diff --git a/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/common/SchemaGeneratorServiceTest.java b/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/common/SchemaGeneratorServiceTest.java
index f846e9a11..b70651fba 100644
--- a/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/common/SchemaGeneratorServiceTest.java
+++ b/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/common/SchemaGeneratorServiceTest.java
@@ -22,8 +22,8 @@ import org.junit.FixMethodOrder;
 import org.junit.Test;

 import org.junit.runners.MethodSorters;

 import org.onap.ccsdk.apps.controllerblueprints.service.SchemaGeneratorService;

-import org.slf4j.Logger;

-import org.slf4j.LoggerFactory;

+import com.att.eelf.configuration.EELFLogger;

+import com.att.eelf.configuration.EELFManager;

 

 import java.io.File;

 import java.nio.charset.Charset;

@@ -32,7 +32,7 @@ import java.nio.charset.Charset;
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)

 public class SchemaGeneratorServiceTest {

 

-    private static Logger log = LoggerFactory.getLogger(SchemaGeneratorServiceTest.class);

+    private static EELFLogger log = EELFManager.getInstance().getLogger(SchemaGeneratorServiceTest.class);

 

     @Test

     public void test01GenerateSwaggerData() throws Exception {

diff --git a/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ConfigModelRestTest.java b/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ConfigModelRestTest.java
index a4a787b08..4fa827c2a 100644
--- a/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ConfigModelRestTest.java
+++ b/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ConfigModelRestTest.java
@@ -22,8 +22,8 @@ import org.junit.runners.MethodSorters;
 import org.onap.ccsdk.apps.controllerblueprints.TestApplication;

 import org.onap.ccsdk.apps.controllerblueprints.service.domain.ConfigModel;

 import org.onap.ccsdk.apps.controllerblueprints.service.utils.ConfigModelUtils;

-import org.slf4j.Logger;

-import org.slf4j.LoggerFactory;

+import com.att.eelf.configuration.EELFLogger;

+import com.att.eelf.configuration.EELFManager;

 import org.springframework.beans.factory.annotation.Autowired;

 import org.springframework.boot.test.context.SpringBootTest;

 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;

@@ -38,7 +38,7 @@ import java.util.List;
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)

 public class ConfigModelRestTest {

 

-    private static Logger log = LoggerFactory.getLogger(ConfigModelRestTest.class);

+    private static EELFLogger log = EELFManager.getInstance().getLogger(ConfigModelRestTest.class);

 

     @Autowired

     ConfigModelRest configModelRest;

diff --git a/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ModelTypeRestTest.java b/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ModelTypeRestTest.java
index 08bfeb10c..8e88f0a69 100644
--- a/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ModelTypeRestTest.java
+++ b/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ModelTypeRestTest.java
@@ -23,8 +23,8 @@ import org.junit.runners.MethodSorters;
 import org.onap.ccsdk.apps.controllerblueprints.TestApplication;

 import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintConstants;

 import org.onap.ccsdk.apps.controllerblueprints.service.domain.ModelType;

-import org.slf4j.Logger;

-import org.slf4j.LoggerFactory;

+import com.att.eelf.configuration.EELFLogger;

+import com.att.eelf.configuration.EELFManager;

 import org.springframework.beans.factory.annotation.Autowired;

 import org.springframework.boot.test.context.SpringBootTest;

 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;

@@ -40,7 +40,7 @@ import java.util.List;
 @ContextConfiguration(classes = {TestApplication.class})

 @FixMethodOrder(MethodSorters.NAME_ASCENDING)

 public class ModelTypeRestTest {

-    private static Logger log = LoggerFactory.getLogger(ModelTypeRestTest.class);

+    private static EELFLogger log = EELFManager.getInstance().getLogger(ModelTypeRestTest.class);

     @Autowired

     ModelTypeRest modelTypeRest;

 

diff --git a/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ResourceDictionaryRestTest.java b/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ResourceDictionaryRestTest.java
index ec036eef3..8bb1f0b89 100644
--- a/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ResourceDictionaryRestTest.java
+++ b/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ResourceDictionaryRestTest.java
@@ -25,8 +25,8 @@ import org.junit.runner.RunWith;
 import org.junit.runners.MethodSorters;

 import org.onap.ccsdk.apps.controllerblueprints.TestApplication;

 import org.onap.ccsdk.apps.controllerblueprints.service.domain.ResourceDictionary;

-import org.slf4j.Logger;

-import org.slf4j.LoggerFactory;

+import com.att.eelf.configuration.EELFLogger;

+import com.att.eelf.configuration.EELFManager;

 import org.springframework.beans.factory.annotation.Autowired;

 import org.springframework.boot.test.context.SpringBootTest;

 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;

@@ -44,7 +44,7 @@ import java.util.List;
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)

 public class ResourceDictionaryRestTest {

 

-    private static Logger log = LoggerFactory.getLogger(ResourceDictionaryRestTest.class);

+    private static EELFLogger log = EELFManager.getInstance().getLogger(ResourceDictionaryRestTest.class);

 

     @Autowired

     protected ResourceDictionaryRest resourceDictionaryRest;

diff --git a/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ServiceTemplateRestTest.java b/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ServiceTemplateRestTest.java
index fdc68e4e5..217eb8f06 100644
--- a/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ServiceTemplateRestTest.java
+++ b/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ServiceTemplateRestTest.java
@@ -30,8 +30,8 @@ import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils;
 import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceAssignment;

 import org.onap.ccsdk.apps.controllerblueprints.service.domain.ConfigModelContent;

 import org.onap.ccsdk.apps.controllerblueprints.service.model.AutoMapResponse;

-import org.slf4j.Logger;

-import org.slf4j.LoggerFactory;

+import com.att.eelf.configuration.EELFLogger;

+import com.att.eelf.configuration.EELFManager;

 import org.springframework.beans.factory.annotation.Autowired;

 import org.springframework.boot.test.context.SpringBootTest;

 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;

@@ -49,7 +49,7 @@ import java.util.List;
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)

 public class ServiceTemplateRestTest {

 

-    private static Logger log = LoggerFactory.getLogger(ServiceTemplateRestTest.class);

+    private static EELFLogger log = EELFManager.getInstance().getLogger(ServiceTemplateRestTest.class);

     @Autowired

     ModelTypeRest modelTypeRest;

 

diff --git a/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/validator/ServiceTemplateValidationTest.java b/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/validator/ServiceTemplateValidationTest.java
index e41e90a2d..93ea4c498 100644
--- a/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/validator/ServiceTemplateValidationTest.java
+++ b/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/validator/ServiceTemplateValidationTest.java
@@ -23,15 +23,15 @@ import org.junit.Test;
 import org.onap.ccsdk.apps.controllerblueprints.core.data.ServiceTemplate;

 import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils;

 import org.onap.ccsdk.apps.controllerblueprints.service.utils.ConfigModelUtils;

-import org.slf4j.Logger;

-import org.slf4j.LoggerFactory;

+import com.att.eelf.configuration.EELFLogger;

+import com.att.eelf.configuration.EELFManager;

 

 import java.io.File;

 import java.nio.charset.Charset;

 import java.util.List;

 

 public class ServiceTemplateValidationTest {

-    private static Logger log = LoggerFactory.getLogger(ServiceTemplateValidationTest.class);

+    private static EELFLogger log = EELFManager.getInstance().getLogger(ServiceTemplateValidationTest.class);

 

     @Test

     public void testBluePrintDirs() {