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>

11 files changed, 31 insertions, 29 deletions

diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/ConfigRestAdaptorConstants.java b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/ConfigRestAdaptorConstants.java
index af6b9f2b8..2f1ad0af2 100644
--- a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/ConfigRestAdaptorConstants.java
+++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/ConfigRestAdaptorConstants.java
@@ -15,7 +15,7 @@
  * limitations under the License.

  */

 

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

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

 

 public class ConfigRestAdaptorConstants {

     private ConfigRestAdaptorConstants() {

@@ -33,7 +33,7 @@ public class ConfigRestAdaptorConstants {
     public static final String PROPERTY_ENV_PROD = "field";

     public static final String PROPERTY_ENV_SOLO = "solo";

 

-    public static final String REST_ADAPTOR_BASE_PROPERTY = "org.onap.ccsdk.config.rest.adaptors.";

+    public static final String REST_ADAPTOR_BASE_PROPERTY = "org.onap.ccsdk.features.rest.adaptors.";

     public static final String REST_ADAPTOR_ENV_TYPE = "envtype";

     public static final String REST_ADAPTOR_TYPE_GENERIC = "generic";

     public static final String REST_ADAPTOR_TYPE_SSL = "ssl";

diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/ConfigRestAdaptorException.java b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/ConfigRestAdaptorException.java
index c6593f128..163c30423 100644
--- a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/ConfigRestAdaptorException.java
+++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/ConfigRestAdaptorException.java
@@ -15,7 +15,7 @@
  * limitations under the License.

  */

 

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

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

 

 /**

  * ConfigRestAdaptorException.java Purpose: Provide Configuration Rest Adaptor Exception

diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/data/RestResponse.java b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/data/RestResponse.java
index d31aa7e8a..f1a3c7290 100644
--- a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/data/RestResponse.java
+++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/data/RestResponse.java
@@ -15,7 +15,7 @@
  * limitations under the License.

  */

 

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

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

 

 import java.util.Map;

 

diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/AbstractConfigRestClientAdapter.java b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/service/AbstractConfigRestClientAdapter.java
index 7829ee6a8..207e87fc3 100644
--- a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/AbstractConfigRestClientAdapter.java
+++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/service/AbstractConfigRestClientAdapter.java
@@ -12,7 +12,7 @@
  * the License.

  */

 

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

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

 

 import java.io.FileInputStream;

 import java.io.InputStream;

@@ -30,10 +30,10 @@ import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;

 import org.apache.http.ssl.SSLContextBuilder;

 import org.apache.http.ssl.TrustStrategy;

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

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

-import org.onap.ccsdk.config.rest.adaptor.data.RestResponse;

-import org.onap.ccsdk.config.rest.adaptor.utils.BasicAuthorizationInterceptor;

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

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

+import org.onap.ccsdk.features.rest.adaptor.data.RestResponse;

+import org.onap.ccsdk.features.rest.adaptor.utils.BasicAuthorizationInterceptor;

 import org.springframework.http.HttpEntity;

 import org.springframework.http.HttpHeaders;

 import org.springframework.http.HttpMethod;

diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/ConfigRestAdaptorService.java b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/service/ConfigRestAdaptorService.java
index 98c598acb..12e734ad3 100644
--- a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/ConfigRestAdaptorService.java
+++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/service/ConfigRestAdaptorService.java
@@ -15,10 +15,10 @@
  * limitations under the License.

  */

 

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

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

 

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

-import org.onap.ccsdk.config.rest.adaptor.data.RestResponse;

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

+import org.onap.ccsdk.features.rest.adaptor.data.RestResponse;

 

 public interface ConfigRestAdaptorService {

 

diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/ConfigRestAdaptorServiceImpl.java b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/service/ConfigRestAdaptorServiceImpl.java
index 65b9defd3..c05d6979a 100644
--- a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/ConfigRestAdaptorServiceImpl.java
+++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/service/ConfigRestAdaptorServiceImpl.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.File;

 import java.io.FileInputStream;

@@ -27,9 +27,10 @@ import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;

 import java.util.stream.Collectors;

 import org.apache.commons.lang3.StringUtils;

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

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

-import org.onap.ccsdk.config.rest.adaptor.data.RestResponse;

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

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

+import org.onap.ccsdk.features.rest.adaptor.data.RestResponse;

+

 import com.att.eelf.configuration.EELFLogger;

 import com.att.eelf.configuration.EELFManager;

 

diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/ConfigRestClientServiceAdapter.java b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/service/ConfigRestClientServiceAdapter.java
index 46e954fb6..7ebc0ef48 100644
--- a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/ConfigRestClientServiceAdapter.java
+++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/service/ConfigRestClientServiceAdapter.java
@@ -15,10 +15,10 @@
  * limitations under the License.

  */

 

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

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

 

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

-import org.onap.ccsdk.config.rest.adaptor.data.RestResponse;

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

+import org.onap.ccsdk.features.rest.adaptor.data.RestResponse;

 

 interface ConfigRestClientServiceAdapter {

 

diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/GenericRestClientAdapterImpl.java b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/service/GenericRestClientAdapterImpl.java
index 8cb5e9bea..6f9840a0b 100644
--- a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/GenericRestClientAdapterImpl.java
+++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/service/GenericRestClientAdapterImpl.java
@@ -15,14 +15,14 @@
  * limitations under the License.

  */

 

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

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

 

 import java.util.Map;

 import java.util.UUID;

 import org.apache.commons.lang3.StringUtils;

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

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

-import org.onap.ccsdk.config.rest.adaptor.data.RestResponse;

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

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

+import org.onap.ccsdk.features.rest.adaptor.data.RestResponse;

 import org.springframework.http.HttpHeaders;

 import org.springframework.http.MediaType;

 import com.att.eelf.configuration.EELFLogger;

diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/SSLRestClientAdapterImpl.java b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/service/SSLRestClientAdapterImpl.java
index e444d9f17..44736deb1 100644
--- a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/SSLRestClientAdapterImpl.java
+++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/service/SSLRestClientAdapterImpl.java
@@ -15,13 +15,14 @@
  * limitations under the License.

  */

 

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

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

 

 import java.util.Map;

 import java.util.UUID;

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

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

-import org.onap.ccsdk.config.rest.adaptor.data.RestResponse;

+

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

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

+import org.onap.ccsdk.features.rest.adaptor.data.RestResponse;

 import org.springframework.http.HttpHeaders;

 import org.springframework.http.MediaType;

 import com.att.eelf.configuration.EELFLogger;

diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/utils/BasicAuthorizationInterceptor.java b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/utils/BasicAuthorizationInterceptor.java
index b28c2c1a1..53b4ddf96 100644
--- a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/utils/BasicAuthorizationInterceptor.java
+++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/utils/BasicAuthorizationInterceptor.java
@@ -15,7 +15,7 @@
  * limitations under the License.

  */

 

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

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

 

 import java.io.IOException;

 import java.nio.charset.Charset;

diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/utils/LoggingRequestInterceptor.java b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/utils/LoggingRequestInterceptor.java
index 4095d62fe..cb618d05a 100644
--- a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/utils/LoggingRequestInterceptor.java
+++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/utils/LoggingRequestInterceptor.java
@@ -15,7 +15,7 @@
  * limitations under the License.

  */

 

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

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

 

 import java.io.BufferedReader;

 import java.io.IOException;