Controller Blueprints Nitrogen to Oxygen Migration

Changing package structure from org.onap.ccsdk.config to org.onap.ccsdk.features

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

5 files changed, 37 insertions, 28 deletions

diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/config/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 6c7f114eb..2e091591b 100644
--- a/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/config/rest/adaptor/service/AbstractConfigRestClientAdapterTest.java
+++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/features/rest/adaptor/service/AbstractConfigRestClientAdapterTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.

  */

 

-package org.onap.ccsdk.config.rest.adaptor.service;

+package org.onap.ccsdk.features.rest.adaptor.service;

 

 import java.io.FileInputStream;

 import java.util.HashMap;

@@ -25,6 +25,9 @@ import java.util.stream.Collectors;
 import org.junit.Assert;

 import org.junit.Before;

 import org.junit.Test;

+import org.onap.ccsdk.features.rest.adaptor.service.ConfigRestClientServiceAdapter;

+import org.onap.ccsdk.features.rest.adaptor.service.GenericRestClientAdapterImpl;

+import org.onap.ccsdk.features.rest.adaptor.service.SSLRestClientAdapterImpl;

 

 public class AbstractConfigRestClientAdapterTest {

 

diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/config/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 7e7f52261..f660cca10 100644
--- a/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/config/rest/adaptor/service/GenericRestClientServiceTest.java
+++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/features/rest/adaptor/service/GenericRestClientServiceTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.

  */

 

-package org.onap.ccsdk.config.rest.adaptor.service;

+package org.onap.ccsdk.features.rest.adaptor.service;

 

 import static org.powermock.api.mockito.PowerMockito.mock;

 import static org.powermock.api.mockito.PowerMockito.when;

@@ -25,7 +25,10 @@ import org.junit.Before;
 import org.junit.Test;

 import org.junit.runner.RunWith;

 import org.mockito.Matchers;

-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorException;

+import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorException;

+import org.onap.ccsdk.features.rest.adaptor.service.AbstractConfigRestClientAdapter;

+import org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorService;

+import org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorServiceImpl;

 import org.powermock.core.classloader.annotations.PowerMockIgnore;

 import org.powermock.core.classloader.annotations.PrepareForTest;

 import org.powermock.modules.junit4.PowerMockRunner;

diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/config/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 a5e757213..e8b3a02ed 100644
--- a/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/config/rest/adaptor/service/SSLClientServiceTest.java
+++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/features/rest/adaptor/service/SSLClientServiceTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.

  */

 

-package org.onap.ccsdk.config.rest.adaptor.service;

+package org.onap.ccsdk.features.rest.adaptor.service;

 

 import static org.powermock.api.mockito.PowerMockito.mock;

 import static org.powermock.api.mockito.PowerMockito.when;

@@ -25,7 +25,10 @@ import org.junit.Before;
 import org.junit.Test;

 import org.junit.runner.RunWith;

 import org.mockito.Matchers;

-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorException;

+import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorException;

+import org.onap.ccsdk.features.rest.adaptor.service.AbstractConfigRestClientAdapter;

+import org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorService;

+import org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorServiceImpl;

 import org.powermock.core.classloader.annotations.PowerMockIgnore;

 import org.powermock.core.classloader.annotations.PrepareForTest;

 import org.powermock.modules.junit4.PowerMockRunner;

diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/config/rest/adaptor/utils/RestTemplateFactoryTest.java b/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/features/rest/adaptor/utils/RestTemplateFactoryTest.java
index e1d0268e1..cee91d297 100644
--- a/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/config/rest/adaptor/utils/RestTemplateFactoryTest.java
+++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/features/rest/adaptor/utils/RestTemplateFactoryTest.java
@@ -15,11 +15,11 @@
  * limitations under the License.

  */

 

-package org.onap.ccsdk.config.rest.adaptor.utils;

+package org.onap.ccsdk.features.rest.adaptor.utils;

 

-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorConstants;

-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorException;

-import org.onap.ccsdk.config.rest.adaptor.service.ConfigRestAdaptorServiceImpl;

+import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorConstants;

+import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorException;

+import org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorServiceImpl;

 

 @SuppressWarnings("squid:S2187")

 public class RestTemplateFactoryTest {

diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/test/resources/config-rest-adaptor.properties b/blueprints-processor/adaptors/rest-adaptor-provider/src/test/resources/config-rest-adaptor.properties
index 4527e8977..22748259b 100644
--- a/blueprints-processor/adaptors/rest-adaptor-provider/src/test/resources/config-rest-adaptor.properties
+++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/test/resources/config-rest-adaptor.properties
@@ -18,28 +18,28 @@
 # Configuration file for SDNC Controller Module

 #

 

-org.onap.ccsdk.config.rest.adaptors.envtype=solo

+org.onap.ccsdk.features.rest.adaptors.envtype=solo

 

 # Config Generator Microservices

-org.onap.ccsdk.config.rest.adaptors.modelservice.type=generic

-org.onap.ccsdk.config.rest.adaptors.modelservice.enable=true

-org.onap.ccsdk.config.rest.adaptors.modelservice.url=http://localhost:8080/configgenerator/service/

-org.onap.ccsdk.config.rest.adaptors.modelservice.user=admin

-org.onap.ccsdk.config.rest.adaptors.modelservice.passwd=admin

+org.onap.ccsdk.features.rest.adaptors.modelservice.type=generic

+org.onap.ccsdk.features.rest.adaptors.modelservice.enable=true

+org.onap.ccsdk.features.rest.adaptors.modelservice.url=http://localhost:8080/configgenerator/service/

+org.onap.ccsdk.features.rest.adaptors.modelservice.user=admin

+org.onap.ccsdk.features.rest.adaptors.modelservice.passwd=admin

 

 # Generic RESTCONF Adaptor

-org.onap.ccsdk.config.rest.adaptors.restconf.type=generic

-org.onap.ccsdk.config.rest.adaptors.restconf.enable=true

-org.onap.ccsdk.config.rest.adaptors.restconf.user=admin

-org.onap.ccsdk.config.rest.adaptors.restconf.passwd=admin

-org.onap.ccsdk.config.rest.adaptors.restconf.url=http://localhost:8181/restconf/

+org.onap.ccsdk.features.rest.adaptors.restconf.type=generic

+org.onap.ccsdk.features.rest.adaptors.restconf.enable=true

+org.onap.ccsdk.features.rest.adaptors.restconf.user=admin

+org.onap.ccsdk.features.rest.adaptors.restconf.passwd=admin

+org.onap.ccsdk.features.rest.adaptors.restconf.url=http://localhost:8181/restconf/

 

 # SSL AAI Adaptor

-org.onap.ccsdk.config.rest.adaptors.aai.propertyfile=aai.properties

-org.onap.ccsdk.config.rest.adaptors.aai.type=ssl

-org.onap.ccsdk.config.rest.adaptors.aai.enable=true

-org.onap.ccsdk.config.rest.adaptors.aai.url=https://localhost:8443/onap-aai/

-org.onap.ccsdk.config.rest.adaptors.aai.ssl.trust=src/test/resources/truststore.client.jks

-org.onap.ccsdk.config.rest.adaptors.aai.ssl.trust.psswd=changeme

-org.onap.ccsdk.config.rest.adaptors.aai.ssl.key=src/test/resources/keystore.client.p12

-org.onap.ccsdk.config.rest.adaptors.aai.ssl.key.psswd=changeme

+org.onap.ccsdk.features.rest.adaptors.aai.propertyfile=aai.properties

+org.onap.ccsdk.features.rest.adaptors.aai.type=ssl

+org.onap.ccsdk.features.rest.adaptors.aai.enable=true

+org.onap.ccsdk.features.rest.adaptors.aai.url=https://localhost:8443/onap-aai/

+org.onap.ccsdk.features.rest.adaptors.aai.ssl.trust=src/test/resources/truststore.client.jks

+org.onap.ccsdk.features.rest.adaptors.aai.ssl.trust.psswd=changeme

+org.onap.ccsdk.features.rest.adaptors.aai.ssl.key=src/test/resources/keystore.client.p12

+org.onap.ccsdk.features.rest.adaptors.aai.ssl.key.psswd=changeme