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>

diff --git a/blueprints-processor/adaptors/data-adaptor-provider/pom.xml b/blueprints-processor/adaptors/data-adaptor-provider/pom.xml
index f328ea9..0de0bab 100644 (file)
--- a/blueprints-processor/adaptors/data-adaptor-provider/pom.xml
+++ b/blueprints-processor/adaptors/data-adaptor-provider/pom.xml
@@ -111,11 +111,11 @@
                     <instructions>\r
                         <Bundle-Name>${project.artifactId}</Bundle-Name>
                         <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.onap.ccsdk.config.data.adaptor,\r
-                            org.onap.ccsdk.config.data.adaptor.dao,\r
-                            org.onap.ccsdk.config.data.adaptor.db,\r
-                            org.onap.ccsdk.config.data.adaptor.domain,\r
-                            org.onap.ccsdk.config.data.adaptor.service\r
+                        <Export-Package>org.onap.ccsdk.features.data.adaptor,\r
+                            org.onap.ccsdk.features.data.adaptor.dao,\r
+                            org.onap.ccsdk.features.data.adaptor.db,\r
+                            org.onap.ccsdk.features.data.adaptor.domain,\r
+                            org.onap.ccsdk.features.data.adaptor.service\r
                         </Export-Package>\r
                     </instructions>\r
                 </configuration>\r

diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/ConfigDataAdaptorException.java b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/ConfigDataAdaptorException.java
similarity index 93%
rename from blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/ConfigDataAdaptorException.java
rename to blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/ConfigDataAdaptorException.java
index cd4ac27..d76ee4e 100644 (file)
--- a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/ConfigDataAdaptorException.java
+++ b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/ConfigDataAdaptorException.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.data.adaptor;\r
+package org.onap.ccsdk.features.data.adaptor;\r
 \r
 /**\r
  * ConfigDataAdaptorException.java Purpose: Provide Configuration Data Adaptor Exception\r

diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/DataAdaptorConstants.java b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/DataAdaptorConstants.java
similarity index 95%
rename from blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/DataAdaptorConstants.java
rename to blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/DataAdaptorConstants.java
index 6a61370..df4912c 100644 (file)
--- a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/DataAdaptorConstants.java
+++ b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/DataAdaptorConstants.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.data.adaptor;\r
+package org.onap.ccsdk.features.data.adaptor;\r
 \r
 @SuppressWarnings("squid:S1118")\r
 public class DataAdaptorConstants {\r
@@ -23,7 +23,7 @@ public class DataAdaptorConstants {
     public static final String OUTPUT_STATUS_SUCCESS = "success";\r
     public static final String OUTPUT_STATUS_FAILURE = "failure";\r
 \r
-    public static final String PROPERTY_ENV_TYPE = "org.onap.ccsdk.config.rest.adaptors.envtype";\r
+    public static final String PROPERTY_ENV_TYPE = "org.onap.ccsdk.features.rest.adaptors.envtype";\r
     public static final String PROPERTY_ENV_PROD = "field";\r
     public static final String PROPERTY_ENV_SOLO = "solo";\r
 \r

diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/ConfigPropertyMapDao.java b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/dao/ConfigPropertyMapDao.java
similarity index 93%
rename from blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/ConfigPropertyMapDao.java
rename to blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/dao/ConfigPropertyMapDao.java
index 2bf9682..4a77f7f 100644 (file)
--- a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/ConfigPropertyMapDao.java
+++ b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/dao/ConfigPropertyMapDao.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.data.adaptor.dao;\r
+package org.onap.ccsdk.features.data.adaptor.dao;\r
 \r
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;\r
 \r

diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/ConfigPropertyMapDaoImpl.java b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/dao/ConfigPropertyMapDaoImpl.java
similarity index 94%
rename from blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/ConfigPropertyMapDaoImpl.java
rename to blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/dao/ConfigPropertyMapDaoImpl.java
index 65e241e..a5248d2 100644 (file)
--- a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/ConfigPropertyMapDaoImpl.java
+++ b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/dao/ConfigPropertyMapDaoImpl.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.data.adaptor.dao;\r
+package org.onap.ccsdk.features.data.adaptor.dao;\r
 \r
 import java.util.Map;\r
 import java.util.concurrent.ConcurrentHashMap;\r
@@ -23,7 +23,7 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;\r
 import java.util.concurrent.TimeUnit;\r
 import org.apache.commons.lang3.StringUtils;\r
-import org.onap.ccsdk.config.data.adaptor.DataAdaptorConstants;\r
+import org.onap.ccsdk.features.data.adaptor.DataAdaptorConstants;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;\r
 import org.springframework.jdbc.CannotGetJdbcConnectionException;\r
 import org.springframework.jdbc.core.JdbcTemplate;\r

diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/ConfigResourceDao.java b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/dao/ConfigResourceDao.java
similarity index 93%
rename from blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/ConfigResourceDao.java
rename to blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/dao/ConfigResourceDao.java
index 6362886..5e50d6f 100644 (file)
--- a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/ConfigResourceDao.java
+++ b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/dao/ConfigResourceDao.java
@@ -15,10 +15,11 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.data.adaptor.dao;\r
+package org.onap.ccsdk.features.data.adaptor.dao;\r
 \r
 import java.util.List;\r
-import org.onap.ccsdk.config.data.adaptor.domain.ConfigResource;\r
+\r
+import org.onap.ccsdk.features.data.adaptor.domain.ConfigResource;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;\r
 \r
 public interface ConfigResourceDao {\r

diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/ConfigResourceDaoImpl.java b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/dao/ConfigResourceDaoImpl.java
similarity index 97%
rename from blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/ConfigResourceDaoImpl.java
rename to blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/dao/ConfigResourceDaoImpl.java
index 42cbbd1..7661e96 100644 (file)
--- a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/ConfigResourceDaoImpl.java
+++ b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/dao/ConfigResourceDaoImpl.java
@@ -15,15 +15,15 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.data.adaptor.dao;\r
+package org.onap.ccsdk.features.data.adaptor.dao;\r
 \r
 import java.sql.ResultSet;\r
 import java.sql.SQLException;\r
 import java.util.ArrayList;\r
 import java.util.List;\r
 import org.apache.commons.lang3.StringUtils;\r
-import org.onap.ccsdk.config.data.adaptor.domain.ConfigResource;\r
-import org.onap.ccsdk.config.data.adaptor.domain.ResourceAssignmentData;\r
+import org.onap.ccsdk.features.data.adaptor.domain.ConfigResource;\r
+import org.onap.ccsdk.features.data.adaptor.domain.ResourceAssignmentData;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;\r
 import org.springframework.jdbc.core.JdbcTemplate;\r
 import org.springframework.jdbc.core.RowMapper;\r

diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/NamedQueryExecutorDao.java b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/dao/NamedQueryExecutorDao.java
similarity index 95%
rename from blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/NamedQueryExecutorDao.java
rename to blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/dao/NamedQueryExecutorDao.java
index 4cebb30..7a06e23 100644 (file)
--- a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/NamedQueryExecutorDao.java
+++ b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/dao/NamedQueryExecutorDao.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.data.adaptor.dao;\r
+package org.onap.ccsdk.features.data.adaptor.dao;\r
 \r
 import java.util.List;\r
 import java.util.Map;\r

diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/NamedQueryExecutorDaoImpl.java b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/dao/NamedQueryExecutorDaoImpl.java
similarity index 95%
rename from blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/NamedQueryExecutorDaoImpl.java
rename to blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/dao/NamedQueryExecutorDaoImpl.java
index bcfe6b6..ac59c51 100644 (file)
--- a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/NamedQueryExecutorDaoImpl.java
+++ b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/dao/NamedQueryExecutorDaoImpl.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.data.adaptor.dao;\r
+package org.onap.ccsdk.features.data.adaptor.dao;\r
 \r
 import java.util.List;\r
 import java.util.Map;\r

diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/QueryExecutorDao.java b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/dao/QueryExecutorDao.java
similarity index 95%
rename from blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/QueryExecutorDao.java
rename to blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/dao/QueryExecutorDao.java
index 0c39524..9077d09 100644 (file)
--- a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/QueryExecutorDao.java
+++ b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/dao/QueryExecutorDao.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.data.adaptor.dao;\r
+package org.onap.ccsdk.features.data.adaptor.dao;\r
 \r
 import java.util.List;\r
 import java.util.Map;\r

diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/QueryExecutorDaoImpl.java b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/dao/QueryExecutorDaoImpl.java
similarity index 94%
rename from blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/QueryExecutorDaoImpl.java
rename to blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/dao/QueryExecutorDaoImpl.java
index 076ec1d..f52c4c5 100644 (file)
--- a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/QueryExecutorDaoImpl.java
+++ b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/dao/QueryExecutorDaoImpl.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.data.adaptor.dao;\r
+package org.onap.ccsdk.features.data.adaptor.dao;\r
 \r
 import java.util.List;\r
 import java.util.Map;\r

diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/TransactionLogDao.java b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/dao/TransactionLogDao.java
similarity index 93%
rename from blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/TransactionLogDao.java
rename to blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/dao/TransactionLogDao.java
index c4747e2..c9c5f8a 100644 (file)
--- a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/TransactionLogDao.java
+++ b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/dao/TransactionLogDao.java
@@ -15,10 +15,11 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.data.adaptor.dao;\r
+package org.onap.ccsdk.features.data.adaptor.dao;\r
 \r
 import java.util.List;\r
-import org.onap.ccsdk.config.data.adaptor.domain.TransactionLog;\r
+\r
+import org.onap.ccsdk.features.data.adaptor.domain.TransactionLog;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;\r
 \r
 public interface TransactionLogDao {\r

diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/TransactionLogDaoImpl.java b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/dao/TransactionLogDaoImpl.java
similarity index 95%
rename from blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/TransactionLogDaoImpl.java
rename to blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/dao/TransactionLogDaoImpl.java
index fd3d810..ea6567e 100644 (file)
--- a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/TransactionLogDaoImpl.java
+++ b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/dao/TransactionLogDaoImpl.java
@@ -15,13 +15,13 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.data.adaptor.dao;\r
+package org.onap.ccsdk.features.data.adaptor.dao;\r
 \r
 import java.sql.ResultSet;\r
 import java.sql.SQLException;\r
 import java.util.List;\r
 import org.apache.commons.lang3.StringUtils;\r
-import org.onap.ccsdk.config.data.adaptor.domain.TransactionLog;\r
+import org.onap.ccsdk.features.data.adaptor.domain.TransactionLog;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;\r
 import org.springframework.jdbc.core.JdbcTemplate;\r
 import org.springframework.jdbc.core.RowMapper;\r

diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/db/DataSourceWrap.java b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/db/DataSourceWrap.java
similarity index 95%
rename from blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/db/DataSourceWrap.java
rename to blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/db/DataSourceWrap.java
index 18ca945..5ec3edd 100644 (file)
--- a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/db/DataSourceWrap.java
+++ b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/db/DataSourceWrap.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.data.adaptor.db;\r
+package org.onap.ccsdk.features.data.adaptor.db;\r
 \r
 import java.io.PrintWriter;\r
 import java.sql.Connection;\r

diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/domain/ConfigPropertyMapData.java b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/domain/ConfigPropertyMapData.java
similarity index 93%
rename from blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/domain/ConfigPropertyMapData.java
rename to blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/domain/ConfigPropertyMapData.java
index 7d6bff9..d9503b3 100644 (file)
--- a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/domain/ConfigPropertyMapData.java
+++ b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/domain/ConfigPropertyMapData.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.data.adaptor.domain;\r
+package org.onap.ccsdk.features.data.adaptor.domain;\r
 \r
 import java.io.Serializable;\r
 \r

diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/domain/ConfigResource.java b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/domain/ConfigResource.java
similarity index 95%
rename from blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/domain/ConfigResource.java
rename to blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/domain/ConfigResource.java
index c8394a7..5010270 100644 (file)
--- a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/domain/ConfigResource.java
+++ b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/domain/ConfigResource.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.data.adaptor.domain;\r
+package org.onap.ccsdk.features.data.adaptor.domain;\r
 \r
 import java.io.Serializable;\r
 import java.util.Date;\r

diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/domain/ResourceAssignmentData.java b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/domain/ResourceAssignmentData.java
similarity index 94%
rename from blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/domain/ResourceAssignmentData.java
rename to blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/domain/ResourceAssignmentData.java
index 75c1a49..45e83c2 100644 (file)
--- a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/domain/ResourceAssignmentData.java
+++ b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/domain/ResourceAssignmentData.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.data.adaptor.domain;\r
+package org.onap.ccsdk.features.data.adaptor.domain;\r
 \r
 import java.io.Serializable;\r
 import java.util.Date;\r

diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/domain/TransactionLog.java b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/domain/TransactionLog.java
similarity index 94%
rename from blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/domain/TransactionLog.java
rename to blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/domain/TransactionLog.java
index 77235d1..f45fdc6 100644 (file)
--- a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/domain/TransactionLog.java
+++ b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/domain/TransactionLog.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.data.adaptor.domain;\r
+package org.onap.ccsdk.features.data.adaptor.domain;\r
 \r
 import java.io.Serializable;\r
 import java.util.Date;\r

diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/service/ConfigResourceNode.java b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/service/ConfigResourceNode.java
similarity index 90%
rename from blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/service/ConfigResourceNode.java
rename to blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/service/ConfigResourceNode.java
index f85da14..2eca207 100644 (file)
--- a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/service/ConfigResourceNode.java
+++ b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/service/ConfigResourceNode.java
@@ -15,12 +15,12 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.data.adaptor.service;\r
+package org.onap.ccsdk.features.data.adaptor.service;\r
 \r
 import java.util.Map;\r
 import org.apache.commons.lang3.StringUtils;\r
-import org.onap.ccsdk.config.data.adaptor.DataAdaptorConstants;\r
-import org.onap.ccsdk.config.data.adaptor.domain.TransactionLog;\r
+import org.onap.ccsdk.features.data.adaptor.DataAdaptorConstants;\r
+import org.onap.ccsdk.features.data.adaptor.domain.TransactionLog;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin;\r

diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/service/ConfigResourceService.java b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/service/ConfigResourceService.java
similarity index 95%
rename from blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/service/ConfigResourceService.java
rename to blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/service/ConfigResourceService.java
index b99b74f..2f01749 100644 (file)
--- a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/service/ConfigResourceService.java
+++ b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/service/ConfigResourceService.java
@@ -15,12 +15,13 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.data.adaptor.service;\r
+package org.onap.ccsdk.features.data.adaptor.service;\r
 \r
 import java.util.List;\r
 import java.util.Map;\r
-import org.onap.ccsdk.config.data.adaptor.domain.ConfigResource;\r
-import org.onap.ccsdk.config.data.adaptor.domain.TransactionLog;\r
+\r
+import org.onap.ccsdk.features.data.adaptor.domain.ConfigResource;\r
+import org.onap.ccsdk.features.data.adaptor.domain.TransactionLog;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;\r
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;\r
 \r

diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/service/ConfigResourceServiceImpl.java b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/service/ConfigResourceServiceImpl.java
similarity index 86%
rename from blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/service/ConfigResourceServiceImpl.java
rename to blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/service/ConfigResourceServiceImpl.java
index c880309..bf19903 100644 (file)
--- a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/service/ConfigResourceServiceImpl.java
+++ b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/service/ConfigResourceServiceImpl.java
@@ -15,17 +15,18 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.data.adaptor.service;\r
+package org.onap.ccsdk.features.data.adaptor.service;\r
 \r
 import java.util.List;\r
 import java.util.Map;\r
-import org.onap.ccsdk.config.data.adaptor.dao.ConfigPropertyMapDao;\r
-import org.onap.ccsdk.config.data.adaptor.dao.ConfigResourceDao;\r
-import org.onap.ccsdk.config.data.adaptor.dao.NamedQueryExecutorDao;\r
-import org.onap.ccsdk.config.data.adaptor.dao.QueryExecutorDao;\r
-import org.onap.ccsdk.config.data.adaptor.dao.TransactionLogDao;\r
-import org.onap.ccsdk.config.data.adaptor.domain.ConfigResource;\r
-import org.onap.ccsdk.config.data.adaptor.domain.TransactionLog;\r
+\r
+import org.onap.ccsdk.features.data.adaptor.dao.ConfigPropertyMapDao;\r
+import org.onap.ccsdk.features.data.adaptor.dao.ConfigResourceDao;\r
+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.domain.ConfigResource;\r
+import org.onap.ccsdk.features.data.adaptor.domain.TransactionLog;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;\r
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;\r
 import com.att.eelf.configuration.EELFLogger;\r

diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml b/blueprints-processor/adaptors/data-adaptor-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
index 644fd77..e38bcd3 100644 (file)
--- a/blueprints-processor/adaptors/data-adaptor-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
+++ b/blueprints-processor/adaptors/data-adaptor-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
@@ -27,7 +27,7 @@
        <!-- Data SourceInitialisation -->\r
 \r
        <bean id="config.dataSource"\r
-               class="org.onap.ccsdk.config.data.adaptor.db.DataSourceWrap">\r
+               class="org.onap.ccsdk.features.data.adaptor.db.DataSourceWrap">\r
                <argument ref="dataSource" />\r
        </bean>\r
 \r
@@ -43,34 +43,34 @@
 \r
        <!-- DAO Initialisation -->\r
        <bean id="transactionLogDao"\r
-               class="org.onap.ccsdk.config.data.adaptor.dao.TransactionLogDaoImpl">\r
+               class="org.onap.ccsdk.features.data.adaptor.dao.TransactionLogDaoImpl">\r
                <argument ref="jdbcTemplate" />\r
        </bean>\r
 \r
        <bean id="configResourceDao"\r
-               class="org.onap.ccsdk.config.data.adaptor.dao.ConfigResourceDaoImpl">\r
+               class="org.onap.ccsdk.features.data.adaptor.dao.ConfigResourceDaoImpl">\r
                <argument ref="jdbcTemplate" />\r
        </bean>\r
 \r
        <bean id="queryExecutorDao"\r
-               class="org.onap.ccsdk.config.data.adaptor.dao.QueryExecutorDaoImpl">\r
+               class="org.onap.ccsdk.features.data.adaptor.dao.QueryExecutorDaoImpl">\r
                <argument ref="jdbcTemplate" />\r
        </bean>\r
 \r
        <bean id="namedQueryExecutorDao"\r
-               class="org.onap.ccsdk.config.data.adaptor.dao.NamedQueryExecutorDaoImpl">\r
+               class="org.onap.ccsdk.features.data.adaptor.dao.NamedQueryExecutorDaoImpl">\r
                <argument ref="namedParameterJdbcTemplate" />\r
        </bean>\r
 \r
        <bean id="configPropertyMapDao"\r
-               class="org.onap.ccsdk.config.data.adaptor.dao.ConfigPropertyMapDaoImpl">\r
+               class="org.onap.ccsdk.features.data.adaptor.dao.ConfigPropertyMapDaoImpl">\r
                <argument ref="jdbcTemplate" />\r
        </bean>\r
 \r
        <!-- Expose the Common Component Bean -->\r
 \r
        <bean id="configResourceService"\r
-       class="org.onap.ccsdk.config.data.adaptor.service.ConfigResourceServiceImpl">\r
+       class="org.onap.ccsdk.features.data.adaptor.service.ConfigResourceServiceImpl">\r
                <argument ref="transactionLogDao" />\r
                <argument ref="configResourceDao" />\r
                <argument ref="queryExecutorDao" />\r
@@ -79,6 +79,6 @@
        </bean>\r
 \r
        <service ref="configResourceService"\r
-       interface="org.onap.ccsdk.config.data.adaptor.service.ConfigResourceService" />\r
+       interface="org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService" />\r
 \r
 </blueprint>\r

diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/config/data/adaptor/dao/ConfigPropertyMapDaoTest.java b/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/dao/ConfigPropertyMapDaoTest.java
similarity index 86%
rename from blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/config/data/adaptor/dao/ConfigPropertyMapDaoTest.java
rename to blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/dao/ConfigPropertyMapDaoTest.java
index 2873638..1915017 100644 (file)
--- a/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/config/data/adaptor/dao/ConfigPropertyMapDaoTest.java
+++ b/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/dao/ConfigPropertyMapDaoTest.java
@@ -15,13 +15,15 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.data.adaptor.dao;\r
+package org.onap.ccsdk.features.data.adaptor.dao;\r
 \r
 import org.junit.Assert;\r
 import org.junit.FixMethodOrder;\r
 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.ConfigPropertyMapDao;\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
@@ -44,7 +46,7 @@ public class ConfigPropertyMapDaoTest {
         int result = queryExecutorDao.update(sql, data);\r
         Assert.assertNotNull("Failed to get Query Result", result);\r
 \r
-        String propKeyValye = configPropertyMapDao.getConfigPropertyByKey("org.onap.ccsdk.config.rest.adaptors.test");\r
+        String propKeyValye = configPropertyMapDao.getConfigPropertyByKey("org.onap.ccsdk.features.rest.adaptors.test");\r
         Assert.assertNull("propKeyValue is null", propKeyValye);\r
     }\r
 \r

diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/config/data/adaptor/dao/ConfigResourceDaoTest.java b/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/dao/ConfigResourceDaoTest.java
similarity index 93%
rename from blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/config/data/adaptor/dao/ConfigResourceDaoTest.java
rename to blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/dao/ConfigResourceDaoTest.java
index 0e57d3b..7bc9189 100644 (file)
--- a/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/config/data/adaptor/dao/ConfigResourceDaoTest.java
+++ b/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/dao/ConfigResourceDaoTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.data.adaptor.dao;\r
+package org.onap.ccsdk.features.data.adaptor.dao;\r
 \r
 import java.nio.charset.Charset;\r
 import java.util.ArrayList;\r
@@ -28,8 +28,9 @@ 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.config.data.adaptor.domain.ConfigResource;\r
-import org.onap.ccsdk.config.data.adaptor.domain.ResourceAssignmentData;\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
 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/config/data/adaptor/dao/ConfigTransactionLogDaoTest.java b/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/dao/ConfigTransactionLogDaoTest.java
similarity index 87%
rename from blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/config/data/adaptor/dao/ConfigTransactionLogDaoTest.java
rename to blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/dao/ConfigTransactionLogDaoTest.java
index ba150d5..22e9be9 100644 (file)
--- a/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/config/data/adaptor/dao/ConfigTransactionLogDaoTest.java
+++ b/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/dao/ConfigTransactionLogDaoTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.data.adaptor.dao;\r
+package org.onap.ccsdk.features.data.adaptor.dao;\r
 \r
 import java.util.HashMap;\r
 import java.util.List;\r
@@ -26,8 +26,10 @@ 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.config.data.adaptor.DataAdaptorConstants;\r
-import org.onap.ccsdk.config.data.adaptor.domain.TransactionLog;\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
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;\r

diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/config/data/adaptor/dao/QueryExecutorDaoTest.java b/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/dao/QueryExecutorDaoTest.java
similarity index 94%
rename from blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/config/data/adaptor/dao/QueryExecutorDaoTest.java
rename to blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/dao/QueryExecutorDaoTest.java
index 257bc31..ee7029f 100644 (file)
--- a/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/config/data/adaptor/dao/QueryExecutorDaoTest.java
+++ b/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/dao/QueryExecutorDaoTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.data.adaptor.dao;\r
+package org.onap.ccsdk.features.data.adaptor.dao;\r
 \r
 import java.util.Date;\r
 import org.junit.Assert;\r
@@ -24,6 +24,7 @@ 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/config/data/adaptor/service/ConfigResourceNodeTest.java b/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/service/ConfigResourceNodeTest.java
similarity index 78%
rename from blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/config/data/adaptor/service/ConfigResourceNodeTest.java
rename to blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/service/ConfigResourceNodeTest.java
index b2f24bf..53724c5 100644 (file)
--- a/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/config/data/adaptor/service/ConfigResourceNodeTest.java
+++ b/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/service/ConfigResourceNodeTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.data.adaptor.service;\r
+package org.onap.ccsdk.features.data.adaptor.service;\r
 \r
 import java.util.HashMap;\r
 import java.util.Map;\r
@@ -23,12 +23,15 @@ import org.junit.Assert;
 import org.junit.Before;\r
 import org.junit.Test;\r
 import org.junit.runner.RunWith;\r
-import org.onap.ccsdk.config.data.adaptor.DataAdaptorConstants;\r
-import org.onap.ccsdk.config.data.adaptor.dao.ConfigPropertyMapDao;\r
-import org.onap.ccsdk.config.data.adaptor.dao.ConfigResourceDao;\r
-import org.onap.ccsdk.config.data.adaptor.dao.NamedQueryExecutorDao;\r
-import org.onap.ccsdk.config.data.adaptor.dao.QueryExecutorDao;\r
-import org.onap.ccsdk.config.data.adaptor.dao.TransactionLogDao;\r
+import org.onap.ccsdk.features.data.adaptor.DataAdaptorConstants;\r
+import org.onap.ccsdk.features.data.adaptor.dao.ConfigPropertyMapDao;\r
+import org.onap.ccsdk.features.data.adaptor.dao.ConfigResourceDao;\r
+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/config/data/adaptor/service/ConfigResourceServiceTest.java b/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/service/ConfigResourceServiceTest.java
similarity index 89%
rename from blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/config/data/adaptor/service/ConfigResourceServiceTest.java
rename to blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/service/ConfigResourceServiceTest.java
index 6f861a3..2d599e2 100644 (file)
--- a/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/config/data/adaptor/service/ConfigResourceServiceTest.java
+++ b/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/service/ConfigResourceServiceTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.data.adaptor.service;\r
+package org.onap.ccsdk.features.data.adaptor.service;\r
 \r
 import java.nio.charset.Charset;\r
 import java.util.ArrayList;\r
@@ -29,15 +29,17 @@ import org.junit.Assert;
 import org.junit.Before;\r
 import org.junit.Test;\r
 import org.junit.runner.RunWith;\r
-import org.onap.ccsdk.config.data.adaptor.dao.ConfigPropertyMapDao;\r
-import org.onap.ccsdk.config.data.adaptor.dao.ConfigResourceDao;\r
-import org.onap.ccsdk.config.data.adaptor.dao.ConfigResourceDaoTest;\r
-import org.onap.ccsdk.config.data.adaptor.dao.NamedQueryExecutorDao;\r
-import org.onap.ccsdk.config.data.adaptor.dao.QueryExecutorDao;\r
-import org.onap.ccsdk.config.data.adaptor.dao.TransactionLogDao;\r
-import org.onap.ccsdk.config.data.adaptor.domain.ConfigResource;\r
-import org.onap.ccsdk.config.data.adaptor.domain.ResourceAssignmentData;\r
-import org.onap.ccsdk.config.data.adaptor.domain.TransactionLog;\r
+import org.onap.ccsdk.features.data.adaptor.dao.ConfigPropertyMapDao;\r
+import org.onap.ccsdk.features.data.adaptor.dao.ConfigResourceDao;\r
+import org.onap.ccsdk.features.data.adaptor.dao.ConfigResourceDaoTest;\r
+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.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/data-adaptor-provider/src/test/resources/test-context-h2db.xml b/blueprints-processor/adaptors/data-adaptor-provider/src/test/resources/test-context-h2db.xml
index f0a50f4..baffb54 100644 (file)
--- a/blueprints-processor/adaptors/data-adaptor-provider/src/test/resources/test-context-h2db.xml
+++ b/blueprints-processor/adaptors/data-adaptor-provider/src/test/resources/test-context-h2db.xml
@@ -53,31 +53,31 @@
        </bean>\r
 \r
        <bean id="configResourceDao"\r
-               class="org.onap.ccsdk.config.data.adaptor.dao.ConfigResourceDaoImpl">\r
+               class="org.onap.ccsdk.features.data.adaptor.dao.ConfigResourceDaoImpl">\r
                <constructor-arg ref="jdbcTemplate" />\r
        </bean>\r
 \r
        <bean id="configPropertyMapDao"\r
-               class="org.onap.ccsdk.config.data.adaptor.dao.ConfigPropertyMapDaoImpl">\r
+               class="org.onap.ccsdk.features.data.adaptor.dao.ConfigPropertyMapDaoImpl">\r
                <constructor-arg ref="jdbcTemplate" />\r
        </bean>\r
 \r
        <bean id="queryExecutorDao"\r
-               class="org.onap.ccsdk.config.data.adaptor.dao.QueryExecutorDaoImpl">\r
+               class="org.onap.ccsdk.features.data.adaptor.dao.QueryExecutorDaoImpl">\r
                <constructor-arg ref="jdbcTemplate" />\r
        </bean>\r
 \r
        <bean id="namedQueryExecutorDao"\r
-               class="org.onap.ccsdk.config.data.adaptor.dao.NamedQueryExecutorDaoImpl">\r
+               class="org.onap.ccsdk.features.data.adaptor.dao.NamedQueryExecutorDaoImpl">\r
                <constructor-arg ref="namedParameterJdbcTemplate" />\r
        </bean>\r
 \r
        <bean id="transactionLogDao"\r
-               class="org.onap.ccsdk.config.data.adaptor.dao.TransactionLogDaoImpl">\r
+               class="org.onap.ccsdk.features.data.adaptor.dao.TransactionLogDaoImpl">\r
                <constructor-arg ref="jdbcTemplate" />\r
        </bean>\r
 \r
        <context:component-scan\r
-               base-package="org.onap.ccsdk.config.data.adaptor" />\r
+               base-package="org.onap.ccsdk.features.data.adaptor" />\r
 \r
 </beans>\r

diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/test/resources/test-context.xml b/blueprints-processor/adaptors/data-adaptor-provider/src/test/resources/test-context.xml
index 17189f2..ee3d331 100644 (file)
--- a/blueprints-processor/adaptors/data-adaptor-provider/src/test/resources/test-context.xml
+++ b/blueprints-processor/adaptors/data-adaptor-provider/src/test/resources/test-context.xml
@@ -53,10 +53,10 @@
        <!-- <jdbc:script location="sql/schema.sql" /> -->\r
        <!-- </jdbc:initialize-database> -->\r
        <!-- <bean id="dataSetup" -->\r
-       <!-- class="org.onap.ccsdk.config.data.adaptor.db.utils.DataSetup"> -->\r
+       <!-- class="org.onap.ccsdk.features.data.adaptor.db.utils.DataSetup"> -->\r
        <!-- <property name="testDb" ref="testDb" /> -->\r
        <!-- </bean> -->\r
-       <!-- <bean id="testDb" class="org.onap.ccsdk.config.data.adaptor.db.utils.TestDb"> -->\r
+       <!-- <bean id="testDb" class="org.onap.ccsdk.features.data.adaptor.db.utils.TestDb"> -->\r
        <!-- <property name="jdbcTemplate" ref="jdbcTemplate" /> -->\r
        <!-- </bean> -->\r
 \r
@@ -71,26 +71,26 @@
        </bean>\r
 \r
        <bean id="configResourcelDao"\r
-               class="org.onap.ccsdk.config.data.adaptor.dao.ConfigResourceDaoImpl">\r
+               class="org.onap.ccsdk.features.data.adaptor.dao.ConfigResourceDaoImpl">\r
                <constructor-arg ref="jdbcTemplate" />\r
        </bean>\r
 \r
        <bean id="ConfigPropertyMapDao"\r
-               class="org.onap.ccsdk.config.data.adaptor.dao.ConfigPropertyMapDaoImpl">\r
+               class="org.onap.ccsdk.features.data.adaptor.dao.ConfigPropertyMapDaoImpl">\r
                <constructor-arg ref="jdbcTemplate" />\r
        </bean>\r
 \r
        <bean id="queryExecutorDao"\r
-               class="org.onap.ccsdk.config.data.adaptor.dao.QueryExecutorDaoImpl">\r
+               class="org.onap.ccsdk.features.data.adaptor.dao.QueryExecutorDaoImpl">\r
                <constructor-arg ref="jdbcTemplate" />\r
        </bean>\r
 \r
        <bean id="namedQueryExecutorDao"\r
-               class="org.onap.ccsdk.config.data.adaptor.dao.NamedQueryExecutorDaoImpl">\r
+               class="org.onap.ccsdk.features.data.adaptor.dao.NamedQueryExecutorDaoImpl">\r
                <constructor-arg ref="namedParameterJdbcTemplate" />\r
        </bean>\r
 \r
        <context:component-scan\r
-               base-package="org.onap.ccsdk.config.data.adaptor" />\r
+               base-package="org.onap.ccsdk.features.data.adaptor" />\r
 \r
 </beans>\r

diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml b/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml
index ee5f9f6..0bf0d73 100644 (file)
--- a/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml
+++ b/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml
@@ -97,10 +97,10 @@
                     <instructions>\r
                         <Bundle-Name>${project.artifactId}</Bundle-Name>
                         <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.onap.ccsdk.config.rest.adaptor,\r
-                            org.onap.ccsdk.config.rest.adaptor.data,\r
-                            org.onap.ccsdk.config.rest.adaptor.service,\r
-                            org.onap.ccsdk.config.rest.adaptor.utils\r
+                        <Export-Package>org.onap.ccsdk.features.rest.adaptor,\r
+                            org.onap.ccsdk.features.rest.adaptor.data,\r
+                            org.onap.ccsdk.features.rest.adaptor.service,\r
+                            org.onap.ccsdk.features.rest.adaptor.utils\r
                         </Export-Package>\r
                     </instructions>\r
                 </configuration>\r

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
similarity index 95%
rename from blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/ConfigRestAdaptorConstants.java
rename to blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/ConfigRestAdaptorConstants.java
index af6b9f2..2f1ad0a 100644 (file)
--- 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.\r
  */\r
 \r
-package org.onap.ccsdk.config.rest.adaptor;\r
+package org.onap.ccsdk.features.rest.adaptor;\r
 \r
 public class ConfigRestAdaptorConstants {\r
     private ConfigRestAdaptorConstants() {\r
@@ -33,7 +33,7 @@ public class ConfigRestAdaptorConstants {
     public static final String PROPERTY_ENV_PROD = "field";\r
     public static final String PROPERTY_ENV_SOLO = "solo";\r
 \r
-    public static final String REST_ADAPTOR_BASE_PROPERTY = "org.onap.ccsdk.config.rest.adaptors.";\r
+    public static final String REST_ADAPTOR_BASE_PROPERTY = "org.onap.ccsdk.features.rest.adaptors.";\r
     public static final String REST_ADAPTOR_ENV_TYPE = "envtype";\r
     public static final String REST_ADAPTOR_TYPE_GENERIC = "generic";\r
     public static final String REST_ADAPTOR_TYPE_SSL = "ssl";\r

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
similarity index 93%
rename from blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/ConfigRestAdaptorException.java
rename to blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/ConfigRestAdaptorException.java
index c6593f1..163c304 100644 (file)
--- 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.\r
  */\r
 \r
-package org.onap.ccsdk.config.rest.adaptor;\r
+package org.onap.ccsdk.features.rest.adaptor;\r
 \r
 /**\r
  * ConfigRestAdaptorException.java Purpose: Provide Configuration Rest Adaptor Exception\r

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
similarity index 94%
rename from blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/data/RestResponse.java
rename to blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/data/RestResponse.java
index d31aa7e..f1a3c72 100644 (file)
--- 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.\r
  */\r
 \r
-package org.onap.ccsdk.config.rest.adaptor.data;\r
+package org.onap.ccsdk.features.rest.adaptor.data;\r
 \r
 import java.util.Map;\r
 \r

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
similarity index 95%
rename from blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/AbstractConfigRestClientAdapter.java
rename to blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/service/AbstractConfigRestClientAdapter.java
index 7829ee6..207e87f 100644 (file)
--- 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.\r
  */\r
 \r
-package org.onap.ccsdk.config.rest.adaptor.service;\r
+package org.onap.ccsdk.features.rest.adaptor.service;\r
 \r
 import java.io.FileInputStream;\r
 import java.io.InputStream;\r
@@ -30,10 +30,10 @@ import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;\r
 import org.apache.http.ssl.SSLContextBuilder;\r
 import org.apache.http.ssl.TrustStrategy;\r
-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorConstants;\r
-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorException;\r
-import org.onap.ccsdk.config.rest.adaptor.data.RestResponse;\r
-import org.onap.ccsdk.config.rest.adaptor.utils.BasicAuthorizationInterceptor;\r
+import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorConstants;\r
+import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorException;\r
+import org.onap.ccsdk.features.rest.adaptor.data.RestResponse;\r
+import org.onap.ccsdk.features.rest.adaptor.utils.BasicAuthorizationInterceptor;\r
 import org.springframework.http.HttpEntity;\r
 import org.springframework.http.HttpHeaders;\r
 import org.springframework.http.HttpMethod;\r

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
similarity index 93%
rename from blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/ConfigRestAdaptorService.java
rename to blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/service/ConfigRestAdaptorService.java
index 98c598a..12e734a 100644 (file)
--- 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.\r
  */\r
 \r
-package org.onap.ccsdk.config.rest.adaptor.service;\r
+package org.onap.ccsdk.features.rest.adaptor.service;\r
 \r
-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorException;\r
-import org.onap.ccsdk.config.rest.adaptor.data.RestResponse;\r
+import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorException;\r
+import org.onap.ccsdk.features.rest.adaptor.data.RestResponse;\r
 \r
 public interface ConfigRestAdaptorService {\r
 \r

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
similarity index 94%
rename from blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/ConfigRestAdaptorServiceImpl.java
rename to blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/service/ConfigRestAdaptorServiceImpl.java
index 65b9def..c05d697 100644 (file)
--- 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.\r
  */\r
 \r
-package org.onap.ccsdk.config.rest.adaptor.service;\r
+package org.onap.ccsdk.features.rest.adaptor.service;\r
 \r
 import java.io.File;\r
 import java.io.FileInputStream;\r
@@ -27,9 +27,10 @@ import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;\r
 import java.util.stream.Collectors;\r
 import org.apache.commons.lang3.StringUtils;\r
-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorConstants;\r
-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorException;\r
-import org.onap.ccsdk.config.rest.adaptor.data.RestResponse;\r
+import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorConstants;\r
+import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorException;\r
+import org.onap.ccsdk.features.rest.adaptor.data.RestResponse;\r
+\r
 import com.att.eelf.configuration.EELFLogger;\r
 import com.att.eelf.configuration.EELFManager;\r
 \r

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
similarity index 85%
rename from blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/ConfigRestClientServiceAdapter.java
rename to blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/service/ConfigRestClientServiceAdapter.java
index 46e954f..7ebc0ef 100644 (file)
--- 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.\r
  */\r
 \r
-package org.onap.ccsdk.config.rest.adaptor.service;\r
+package org.onap.ccsdk.features.rest.adaptor.service;\r
 \r
-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorException;\r
-import org.onap.ccsdk.config.rest.adaptor.data.RestResponse;\r
+import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorException;\r
+import org.onap.ccsdk.features.rest.adaptor.data.RestResponse;\r
 \r
 interface ConfigRestClientServiceAdapter {\r
 \r

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
similarity index 93%
rename from blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/GenericRestClientAdapterImpl.java
rename to blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/service/GenericRestClientAdapterImpl.java
index 8cb5e9b..6f9840a 100644 (file)
--- 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.\r
  */\r
 \r
-package org.onap.ccsdk.config.rest.adaptor.service;\r
+package org.onap.ccsdk.features.rest.adaptor.service;\r
 \r
 import java.util.Map;\r
 import java.util.UUID;\r
 import org.apache.commons.lang3.StringUtils;\r
-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorConstants;\r
-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorException;\r
-import org.onap.ccsdk.config.rest.adaptor.data.RestResponse;\r
+import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorConstants;\r
+import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorException;\r
+import org.onap.ccsdk.features.rest.adaptor.data.RestResponse;\r
 import org.springframework.http.HttpHeaders;\r
 import org.springframework.http.MediaType;\r
 import com.att.eelf.configuration.EELFLogger;\r

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
similarity index 93%
rename from blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/SSLRestClientAdapterImpl.java
rename to blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/service/SSLRestClientAdapterImpl.java
index e444d9f..44736de 100644 (file)
--- 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.\r
  */\r
 \r
-package org.onap.ccsdk.config.rest.adaptor.service;\r
+package org.onap.ccsdk.features.rest.adaptor.service;\r
 \r
 import java.util.Map;\r
 import java.util.UUID;\r
-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorConstants;\r
-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorException;\r
-import org.onap.ccsdk.config.rest.adaptor.data.RestResponse;\r
+\r
+import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorConstants;\r
+import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorException;\r
+import org.onap.ccsdk.features.rest.adaptor.data.RestResponse;\r
 import org.springframework.http.HttpHeaders;\r
 import org.springframework.http.MediaType;\r
 import com.att.eelf.configuration.EELFLogger;\r

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
similarity index 95%
rename from blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/utils/BasicAuthorizationInterceptor.java
rename to blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/utils/BasicAuthorizationInterceptor.java
index b28c2c1..53b4ddf 100644 (file)
--- 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.\r
  */\r
 \r
-package org.onap.ccsdk.config.rest.adaptor.utils;\r
+package org.onap.ccsdk.features.rest.adaptor.utils;\r
 \r
 import java.io.IOException;\r
 import java.nio.charset.Charset;\r

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
similarity index 96%
rename from blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/utils/LoggingRequestInterceptor.java
rename to blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/utils/LoggingRequestInterceptor.java
index 4095d62..cb618d0 100644 (file)
--- 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.\r
  */\r
 \r
-package org.onap.ccsdk.config.rest.adaptor.utils;\r
+package org.onap.ccsdk.features.rest.adaptor.utils;\r
 \r
 import java.io.BufferedReader;\r
 import java.io.IOException;\r

diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
index 0b6a6ae..dbc8b52 100644 (file)
--- a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
+++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
@@ -23,11 +23,11 @@
        <!-- Expose the Common Component Bean -->\r
 \r
        <bean id="configRestAdaptorService"\r
-               class="org.onap.ccsdk.config.rest.adaptor.service.ConfigRestAdaptorServiceImpl">\r
+               class="org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorServiceImpl">\r
                <argument value="/opt/sdnc/data/properties" />\r
        </bean>\r
 \r
        <service ref="configRestAdaptorService"\r
-               interface="org.onap.ccsdk.config.rest.adaptor.service.ConfigRestAdaptorService" />\r
+               interface="org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorService" />\r
 \r
 </blueprint>\r

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
similarity index 84%
rename from blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/config/rest/adaptor/service/AbstractConfigRestClientAdapterTest.java
rename to blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/features/rest/adaptor/service/AbstractConfigRestClientAdapterTest.java
index 6c7f114..2e09159 100644 (file)
--- 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.\r
  */\r
 \r
-package org.onap.ccsdk.config.rest.adaptor.service;\r
+package org.onap.ccsdk.features.rest.adaptor.service;\r
 \r
 import java.io.FileInputStream;\r
 import java.util.HashMap;\r
@@ -25,6 +25,9 @@ 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/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
similarity index 91%
rename from blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/config/rest/adaptor/service/GenericRestClientServiceTest.java
rename to blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/features/rest/adaptor/service/GenericRestClientServiceTest.java
index 7e7f522..f660cca 100644 (file)
--- 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.\r
  */\r
 \r
-package org.onap.ccsdk.config.rest.adaptor.service;\r
+package org.onap.ccsdk.features.rest.adaptor.service;\r
 \r
 import static org.powermock.api.mockito.PowerMockito.mock;\r
 import static org.powermock.api.mockito.PowerMockito.when;\r
@@ -25,7 +25,10 @@ import org.junit.Before;
 import org.junit.Test;\r
 import org.junit.runner.RunWith;\r
 import org.mockito.Matchers;\r
-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorException;\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/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
similarity index 90%
rename from blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/config/rest/adaptor/service/SSLClientServiceTest.java
rename to blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/features/rest/adaptor/service/SSLClientServiceTest.java
index a5e7572..e8b3a02 100644 (file)
--- 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.\r
  */\r
 \r
-package org.onap.ccsdk.config.rest.adaptor.service;\r
+package org.onap.ccsdk.features.rest.adaptor.service;\r
 \r
 import static org.powermock.api.mockito.PowerMockito.mock;\r
 import static org.powermock.api.mockito.PowerMockito.when;\r
@@ -25,7 +25,10 @@ import org.junit.Before;
 import org.junit.Test;\r
 import org.junit.runner.RunWith;\r
 import org.mockito.Matchers;\r
-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorException;\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/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
similarity index 84%
rename from blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/config/rest/adaptor/utils/RestTemplateFactoryTest.java
rename to blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/features/rest/adaptor/utils/RestTemplateFactoryTest.java
index e1d0268..cee91d2 100644 (file)
--- 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.\r
  */\r
 \r
-package org.onap.ccsdk.config.rest.adaptor.utils;\r
+package org.onap.ccsdk.features.rest.adaptor.utils;\r
 \r
-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorConstants;\r
-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorException;\r
-import org.onap.ccsdk.config.rest.adaptor.service.ConfigRestAdaptorServiceImpl;\r
+import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorConstants;\r
+import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorException;\r
+import org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorServiceImpl;\r
 \r
 @SuppressWarnings("squid:S2187")\r
 public class RestTemplateFactoryTest {\r

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 4527e89..2274825 100644 (file)
--- 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\r
 #\r
 \r
-org.onap.ccsdk.config.rest.adaptors.envtype=solo\r
+org.onap.ccsdk.features.rest.adaptors.envtype=solo\r
 \r
 # Config Generator Microservices\r
-org.onap.ccsdk.config.rest.adaptors.modelservice.type=generic\r
-org.onap.ccsdk.config.rest.adaptors.modelservice.enable=true\r
-org.onap.ccsdk.config.rest.adaptors.modelservice.url=http://localhost:8080/configgenerator/service/\r
-org.onap.ccsdk.config.rest.adaptors.modelservice.user=admin\r
-org.onap.ccsdk.config.rest.adaptors.modelservice.passwd=admin\r
+org.onap.ccsdk.features.rest.adaptors.modelservice.type=generic\r
+org.onap.ccsdk.features.rest.adaptors.modelservice.enable=true\r
+org.onap.ccsdk.features.rest.adaptors.modelservice.url=http://localhost:8080/configgenerator/service/\r
+org.onap.ccsdk.features.rest.adaptors.modelservice.user=admin\r
+org.onap.ccsdk.features.rest.adaptors.modelservice.passwd=admin\r
 \r
 # Generic RESTCONF Adaptor\r
-org.onap.ccsdk.config.rest.adaptors.restconf.type=generic\r
-org.onap.ccsdk.config.rest.adaptors.restconf.enable=true\r
-org.onap.ccsdk.config.rest.adaptors.restconf.user=admin\r
-org.onap.ccsdk.config.rest.adaptors.restconf.passwd=admin\r
-org.onap.ccsdk.config.rest.adaptors.restconf.url=http://localhost:8181/restconf/\r
+org.onap.ccsdk.features.rest.adaptors.restconf.type=generic\r
+org.onap.ccsdk.features.rest.adaptors.restconf.enable=true\r
+org.onap.ccsdk.features.rest.adaptors.restconf.user=admin\r
+org.onap.ccsdk.features.rest.adaptors.restconf.passwd=admin\r
+org.onap.ccsdk.features.rest.adaptors.restconf.url=http://localhost:8181/restconf/\r
 \r
 # SSL AAI Adaptor\r
-org.onap.ccsdk.config.rest.adaptors.aai.propertyfile=aai.properties\r
-org.onap.ccsdk.config.rest.adaptors.aai.type=ssl\r
-org.onap.ccsdk.config.rest.adaptors.aai.enable=true\r
-org.onap.ccsdk.config.rest.adaptors.aai.url=https://localhost:8443/onap-aai/\r
-org.onap.ccsdk.config.rest.adaptors.aai.ssl.trust=src/test/resources/truststore.client.jks\r
-org.onap.ccsdk.config.rest.adaptors.aai.ssl.trust.psswd=changeme\r
-org.onap.ccsdk.config.rest.adaptors.aai.ssl.key=src/test/resources/keystore.client.p12\r
-org.onap.ccsdk.config.rest.adaptors.aai.ssl.key.psswd=changeme\r
+org.onap.ccsdk.features.rest.adaptors.aai.propertyfile=aai.properties\r
+org.onap.ccsdk.features.rest.adaptors.aai.type=ssl\r
+org.onap.ccsdk.features.rest.adaptors.aai.enable=true\r
+org.onap.ccsdk.features.rest.adaptors.aai.url=https://localhost:8443/onap-aai/\r
+org.onap.ccsdk.features.rest.adaptors.aai.ssl.trust=src/test/resources/truststore.client.jks\r
+org.onap.ccsdk.features.rest.adaptors.aai.ssl.trust.psswd=changeme\r
+org.onap.ccsdk.features.rest.adaptors.aai.ssl.key=src/test/resources/keystore.client.p12\r
+org.onap.ccsdk.features.rest.adaptors.aai.ssl.key.psswd=changeme\r

diff --git a/blueprints-processor/plugin/assignment-provider/pom.xml b/blueprints-processor/plugin/assignment-provider/pom.xml
index 4f6b293..5ca679b 100644 (file)
--- a/blueprints-processor/plugin/assignment-provider/pom.xml
+++ b/blueprints-processor/plugin/assignment-provider/pom.xml
@@ -105,11 +105,11 @@
                     <instructions>\r
                         <Bundle-Name>${project.artifactId}</Bundle-Name>
                         <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.onap.ccsdk.config.assignment,\r
-                            org.onap.ccsdk.config.assignment.data,\r
-                            org.onap.ccsdk.config.assignment.service,\r
-                            org.onap.ccsdk.config.assignment.processor,\r
-                            org.onap.ccsdk.config.assignment.processor.custom\r
+                        <Export-Package>org.onap.ccsdk.features.assignment,\r
+                            org.onap.ccsdk.features.assignment.data,\r
+                            org.onap.ccsdk.features.assignment.service,\r
+                            org.onap.ccsdk.features.assignment.processor,\r
+                            org.onap.ccsdk.features.assignment.processor.custom\r
                         </Export-Package>\r
                     </instructions>\r
                 </configuration>\r

diff --git a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/ConfigAssignmentConstants.java b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/ConfigAssignmentConstants.java
similarity index 95%
rename from blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/ConfigAssignmentConstants.java
rename to blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/ConfigAssignmentConstants.java
index 10e217b..3052a86 100644 (file)
--- a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/ConfigAssignmentConstants.java
+++ b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/ConfigAssignmentConstants.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.assignment;\r
+package org.onap.ccsdk.features.assignment;\r
 \r
 @SuppressWarnings("squid:S1118")\r
 public class ConfigAssignmentConstants {\r

diff --git a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/data/ResourceAssignmentData.java b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/data/ResourceAssignmentData.java
similarity index 94%
rename from blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/data/ResourceAssignmentData.java
rename to blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/data/ResourceAssignmentData.java
index 816c943..2bd0674 100644 (file)
--- a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/data/ResourceAssignmentData.java
+++ b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/data/ResourceAssignmentData.java
@@ -15,12 +15,13 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.assignment.data;\r
+package org.onap.ccsdk.features.assignment.data;\r
 \r
 import java.util.HashMap;\r
 import java.util.List;\r
 import java.util.Map;\r
-import org.onap.ccsdk.config.model.data.ResourceAssignment;\r
+\r
+import org.onap.ccsdk.features.model.data.ResourceAssignment;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;\r
 \r
 public class ResourceAssignmentData {\r

diff --git a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/processor/DBResourceProcessor.java b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/processor/DBResourceProcessor.java
similarity index 92%
rename from blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/processor/DBResourceProcessor.java
rename to blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/processor/DBResourceProcessor.java
index 5f3e609..132d03c 100644 (file)
--- a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/processor/DBResourceProcessor.java
+++ b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/processor/DBResourceProcessor.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.assignment.processor;\r
+package org.onap.ccsdk.features.assignment.processor;\r
 \r
 import java.util.HashMap;\r
 import java.util.List;\r
@@ -23,17 +23,17 @@ import java.util.Map;
 import org.apache.commons.collections.CollectionUtils;\r
 import org.apache.commons.collections.MapUtils;\r
 import org.apache.commons.lang3.StringUtils;\r
-import org.onap.ccsdk.config.assignment.service.ConfigAssignmentUtils;\r
-import org.onap.ccsdk.config.data.adaptor.service.ConfigResourceService;\r
-import org.onap.ccsdk.config.model.ConfigModelConstant;\r
-import org.onap.ccsdk.config.model.ConfigModelException;\r
-import org.onap.ccsdk.config.model.ValidTypes;\r
-import org.onap.ccsdk.config.model.data.ResourceAssignment;\r
-import org.onap.ccsdk.config.model.data.dict.ResourceDefinition;\r
-import org.onap.ccsdk.config.model.data.dict.SourcesDefinition;\r
-import org.onap.ccsdk.config.model.service.ComponentNode;\r
-import org.onap.ccsdk.config.model.utils.JsonUtils;\r
-import org.onap.ccsdk.config.model.utils.ResourceAssignmentUtils;\r
+import org.onap.ccsdk.features.assignment.service.ConfigAssignmentUtils;\r
+import org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService;\r
+import org.onap.ccsdk.features.model.ConfigModelConstant;\r
+import org.onap.ccsdk.features.model.ConfigModelException;\r
+import org.onap.ccsdk.features.model.ValidTypes;\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.data.dict.SourcesDefinition;\r
+import org.onap.ccsdk.features.model.service.ComponentNode;\r
+import org.onap.ccsdk.features.model.utils.JsonUtils;\r
+import org.onap.ccsdk.features.model.utils.ResourceAssignmentUtils;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;\r
 import com.att.eelf.configuration.EELFLogger;\r

diff --git a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/processor/DefaultResourceProcessor.java b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/processor/DefaultResourceProcessor.java
similarity index 87%
rename from blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/processor/DefaultResourceProcessor.java
rename to blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/processor/DefaultResourceProcessor.java
index aac13cb..563d5b5 100644 (file)
--- a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/processor/DefaultResourceProcessor.java
+++ b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/processor/DefaultResourceProcessor.java
@@ -15,18 +15,18 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.assignment.processor;\r
+package org.onap.ccsdk.features.assignment.processor;\r
 \r
 import java.util.List;\r
 import java.util.Map;\r
 import org.apache.commons.lang3.StringUtils;\r
-import org.onap.ccsdk.config.assignment.service.ConfigAssignmentUtils;\r
-import org.onap.ccsdk.config.data.adaptor.service.ConfigResourceService;\r
-import org.onap.ccsdk.config.model.ConfigModelConstant;\r
-import org.onap.ccsdk.config.model.ConfigModelException;\r
-import org.onap.ccsdk.config.model.data.ResourceAssignment;\r
-import org.onap.ccsdk.config.model.service.ComponentNode;\r
-import org.onap.ccsdk.config.model.utils.ResourceAssignmentUtils;\r
+import org.onap.ccsdk.features.assignment.service.ConfigAssignmentUtils;\r
+import org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService;\r
+import org.onap.ccsdk.features.model.ConfigModelConstant;\r
+import org.onap.ccsdk.features.model.ConfigModelException;\r
+import org.onap.ccsdk.features.model.data.ResourceAssignment;\r
+import org.onap.ccsdk.features.model.service.ComponentNode;\r
+import org.onap.ccsdk.features.model.utils.ResourceAssignmentUtils;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;\r
 \r

diff --git a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/processor/InputResourceProcessor.java b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/processor/InputResourceProcessor.java
similarity index 87%
rename from blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/processor/InputResourceProcessor.java
rename to blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/processor/InputResourceProcessor.java
index e32e7af..6c73b08 100644 (file)
--- a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/processor/InputResourceProcessor.java
+++ b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/processor/InputResourceProcessor.java
@@ -15,17 +15,17 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.assignment.processor;\r
+package org.onap.ccsdk.features.assignment.processor;\r
 \r
 import java.util.List;\r
 import java.util.Map;\r
 import org.apache.commons.lang3.StringUtils;\r
-import org.onap.ccsdk.config.data.adaptor.service.ConfigResourceService;\r
-import org.onap.ccsdk.config.model.ConfigModelConstant;\r
-import org.onap.ccsdk.config.model.ConfigModelException;\r
-import org.onap.ccsdk.config.model.data.ResourceAssignment;\r
-import org.onap.ccsdk.config.model.service.ComponentNode;\r
-import org.onap.ccsdk.config.model.utils.ResourceAssignmentUtils;\r
+import org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService;\r
+import org.onap.ccsdk.features.model.ConfigModelConstant;\r
+import org.onap.ccsdk.features.model.ConfigModelException;\r
+import org.onap.ccsdk.features.model.data.ResourceAssignment;\r
+import org.onap.ccsdk.features.model.service.ComponentNode;\r
+import org.onap.ccsdk.features.model.utils.ResourceAssignmentUtils;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;\r
 \r

diff --git a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/processor/MdsalResourceProcessor.java b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/processor/MdsalResourceProcessor.java
similarity index 91%
rename from blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/processor/MdsalResourceProcessor.java
rename to blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/processor/MdsalResourceProcessor.java
index 15528e1..dfc041c 100644 (file)
--- a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/processor/MdsalResourceProcessor.java
+++ b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/processor/MdsalResourceProcessor.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.assignment.processor;\r
+package org.onap.ccsdk.features.assignment.processor;\r
 \r
 import java.util.HashMap;\r
 import java.util.List;\r
@@ -23,17 +23,17 @@ import java.util.Map;
 import org.apache.commons.collections.CollectionUtils;\r
 import org.apache.commons.collections.MapUtils;\r
 import org.apache.commons.lang3.StringUtils;\r
-import org.onap.ccsdk.config.assignment.service.ConfigAssignmentUtils;\r
-import org.onap.ccsdk.config.model.ConfigModelConstant;\r
-import org.onap.ccsdk.config.model.ConfigModelException;\r
-import org.onap.ccsdk.config.model.data.ResourceAssignment;\r
-import org.onap.ccsdk.config.model.data.dict.ResourceDefinition;\r
-import org.onap.ccsdk.config.model.data.dict.SourcesDefinition;\r
-import org.onap.ccsdk.config.model.service.ComponentNode;\r
-import org.onap.ccsdk.config.model.utils.ResourceAssignmentUtils;\r
-import org.onap.ccsdk.config.model.utils.TransformationUtils;\r
-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorConstants;\r
-import org.onap.ccsdk.config.rest.adaptor.service.ConfigRestAdaptorService;\r
+import org.onap.ccsdk.features.assignment.service.ConfigAssignmentUtils;\r
+import org.onap.ccsdk.features.model.ConfigModelConstant;\r
+import org.onap.ccsdk.features.model.ConfigModelException;\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.data.dict.SourcesDefinition;\r
+import org.onap.ccsdk.features.model.service.ComponentNode;\r
+import org.onap.ccsdk.features.model.utils.ResourceAssignmentUtils;\r
+import org.onap.ccsdk.features.model.utils.TransformationUtils;\r
+import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorConstants;\r
+import org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorService;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;\r
 import com.att.eelf.configuration.EELFLogger;\r

diff --git a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/processor/ProcessorFactory.java b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/processor/ProcessorFactory.java
similarity index 80%
rename from blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/processor/ProcessorFactory.java
rename to blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/processor/ProcessorFactory.java
index 5fcedd8..bb620a1 100644 (file)
--- a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/processor/ProcessorFactory.java
+++ b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/processor/ProcessorFactory.java
@@ -15,13 +15,13 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.assignment.processor;\r
+package org.onap.ccsdk.features.assignment.processor;\r
 \r
-import org.onap.ccsdk.config.data.adaptor.service.ConfigResourceService;\r
-import org.onap.ccsdk.config.model.ConfigModelConstant;\r
-import org.onap.ccsdk.config.model.service.ComponentNode;\r
-import org.onap.ccsdk.config.model.service.ComponentNodeService;\r
-import org.onap.ccsdk.config.rest.adaptor.service.ConfigRestAdaptorService;\r
+import org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService;\r
+import org.onap.ccsdk.features.model.ConfigModelConstant;\r
+import org.onap.ccsdk.features.model.service.ComponentNode;\r
+import org.onap.ccsdk.features.model.service.ComponentNodeService;\r
+import org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorService;\r
 \r
 public class ProcessorFactory {\r
 \r

diff --git a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/processor/ResourceAssignmentProcessor.java b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/processor/ResourceAssignmentProcessor.java
similarity index 94%
rename from blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/processor/ResourceAssignmentProcessor.java
rename to blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/processor/ResourceAssignmentProcessor.java
index 70d9abc..3ee49f0 100644 (file)
--- a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/processor/ResourceAssignmentProcessor.java
+++ b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/processor/ResourceAssignmentProcessor.java
@@ -15,15 +15,15 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.assignment.processor;\r
+package org.onap.ccsdk.features.assignment.processor;\r
 \r
 import java.util.ArrayList;\r
 import java.util.HashMap;\r
 import java.util.List;\r
 import java.util.Map;\r
 import org.apache.commons.collections.CollectionUtils;\r
-import org.onap.ccsdk.config.model.data.ResourceAssignment;\r
-import org.onap.ccsdk.config.model.utils.TopologicalSortingUtils;\r
+import org.onap.ccsdk.features.model.data.ResourceAssignment;\r
+import org.onap.ccsdk.features.model.utils.TopologicalSortingUtils;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;\r
 import com.att.eelf.configuration.EELFLogger;\r
 import com.att.eelf.configuration.EELFManager;\r

diff --git a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ConfigAssignmentNode.java b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ConfigAssignmentNode.java
similarity index 92%
rename from blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ConfigAssignmentNode.java
rename to blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ConfigAssignmentNode.java
index 8ed0b71..aaeadca 100644 (file)
--- a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ConfigAssignmentNode.java
+++ b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ConfigAssignmentNode.java
@@ -15,23 +15,23 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.assignment.service;\r
+package org.onap.ccsdk.features.assignment.service;\r
 \r
 import java.util.HashMap;\r
 import java.util.List;\r
 import java.util.Map;\r
 import org.apache.commons.collections.MapUtils;\r
 import org.apache.commons.lang3.StringUtils;\r
-import org.onap.ccsdk.config.assignment.ConfigAssignmentConstants;\r
-import org.onap.ccsdk.config.assignment.data.ResourceAssignmentData;\r
-import org.onap.ccsdk.config.data.adaptor.service.ConfigResourceService;\r
-import org.onap.ccsdk.config.generator.service.ConfigGeneratorService;\r
-import org.onap.ccsdk.config.model.ConfigModelConstant;\r
-import org.onap.ccsdk.config.model.service.ComponentNode;\r
-import org.onap.ccsdk.config.model.service.ComponentNodeService;\r
-import org.onap.ccsdk.config.model.service.ConfigModelService;\r
-import org.onap.ccsdk.config.model.utils.TransformationUtils;\r
-import org.onap.ccsdk.config.rest.adaptor.service.ConfigRestAdaptorService;\r
+import org.onap.ccsdk.features.assignment.ConfigAssignmentConstants;\r
+import org.onap.ccsdk.features.assignment.data.ResourceAssignmentData;\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.model.ConfigModelConstant;\r
+import org.onap.ccsdk.features.model.service.ComponentNode;\r
+import org.onap.ccsdk.features.model.service.ComponentNodeService;\r
+import org.onap.ccsdk.features.model.service.ConfigModelService;\r
+import org.onap.ccsdk.features.model.utils.TransformationUtils;\r
+import org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorService;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;\r
 import com.att.eelf.configuration.EELFLogger;\r

diff --git a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ConfigAssignmentPersistService.java b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ConfigAssignmentPersistService.java
similarity index 85%
rename from blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ConfigAssignmentPersistService.java
rename to blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ConfigAssignmentPersistService.java
index 320f436..c4083f8 100644 (file)
--- a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ConfigAssignmentPersistService.java
+++ b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ConfigAssignmentPersistService.java
@@ -15,20 +15,20 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.assignment.service;\r
+package org.onap.ccsdk.features.assignment.service;\r
 \r
 import java.util.List;\r
 import org.apache.commons.collections.CollectionUtils;\r
 import org.apache.commons.lang3.StringUtils;\r
-import org.onap.ccsdk.config.data.adaptor.DataAdaptorConstants;\r
-import org.onap.ccsdk.config.data.adaptor.domain.ConfigResource;\r
-import org.onap.ccsdk.config.data.adaptor.domain.ResourceAssignmentData;\r
-import org.onap.ccsdk.config.data.adaptor.domain.TransactionLog;\r
-import org.onap.ccsdk.config.data.adaptor.service.ConfigResourceService;\r
-import org.onap.ccsdk.config.model.ConfigModelConstant;\r
-import org.onap.ccsdk.config.model.data.ResourceAssignment;\r
-import org.onap.ccsdk.config.model.utils.ResourceAssignmentUtils;\r
-import org.onap.ccsdk.config.model.utils.TransformationUtils;\r
+import org.onap.ccsdk.features.data.adaptor.DataAdaptorConstants;\r
+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.model.ConfigModelConstant;\r
+import org.onap.ccsdk.features.model.data.ResourceAssignment;\r
+import org.onap.ccsdk.features.model.utils.ResourceAssignmentUtils;\r
+import org.onap.ccsdk.features.model.utils.TransformationUtils;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;\r
 import com.att.eelf.configuration.EELFLogger;\r
 import com.att.eelf.configuration.EELFManager;\r
@@ -43,7 +43,7 @@ public class ConfigAssignmentPersistService {
         this.configResourceService = configResourceService;\r
     }\r
 \r
-    public void saveResourceMapping(org.onap.ccsdk.config.assignment.data.ResourceAssignmentData resourceAssignmentData,\r
+    public void saveResourceMapping(org.onap.ccsdk.features.assignment.data.ResourceAssignmentData resourceAssignmentData,\r
             String templateName, List<ResourceAssignment> resourceAssignments) throws SvcLogicException {\r
         try {\r
 \r

diff --git a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ConfigAssignmentProcessService.java b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ConfigAssignmentProcessService.java
similarity index 90%
rename from blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ConfigAssignmentProcessService.java
rename to blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ConfigAssignmentProcessService.java
index 85ff82d..61c0359 100644 (file)
--- a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ConfigAssignmentProcessService.java
+++ b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ConfigAssignmentProcessService.java
@@ -15,28 +15,28 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.assignment.service;\r
+package org.onap.ccsdk.features.assignment.service;\r
 \r
 import java.util.HashMap;\r
 import java.util.List;\r
 import java.util.Map;\r
 import org.apache.commons.collections.CollectionUtils;\r
 import org.apache.commons.lang3.StringUtils;\r
-import org.onap.ccsdk.config.assignment.ConfigAssignmentConstants;\r
-import org.onap.ccsdk.config.assignment.data.ResourceAssignmentData;\r
-import org.onap.ccsdk.config.assignment.processor.ProcessorFactory;\r
-import org.onap.ccsdk.config.assignment.processor.ResourceAssignmentProcessor;\r
-import org.onap.ccsdk.config.data.adaptor.service.ConfigResourceService;\r
-import org.onap.ccsdk.config.generator.service.ConfigGeneratorService;\r
-import org.onap.ccsdk.config.model.ConfigModelConstant;\r
-import org.onap.ccsdk.config.model.data.ResourceAssignment;\r
-import org.onap.ccsdk.config.model.data.dict.ResourceDefinition;\r
-import org.onap.ccsdk.config.model.service.ComponentNode;\r
-import org.onap.ccsdk.config.model.service.ComponentNodeService;\r
-import org.onap.ccsdk.config.model.service.ConfigModelService;\r
-import org.onap.ccsdk.config.model.utils.ResourceAssignmentUtils;\r
-import org.onap.ccsdk.config.model.utils.TransformationUtils;\r
-import org.onap.ccsdk.config.rest.adaptor.service.ConfigRestAdaptorService;\r
+import org.onap.ccsdk.features.assignment.ConfigAssignmentConstants;\r
+import org.onap.ccsdk.features.assignment.data.ResourceAssignmentData;\r
+import org.onap.ccsdk.features.assignment.processor.ProcessorFactory;\r
+import org.onap.ccsdk.features.assignment.processor.ResourceAssignmentProcessor;\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.model.ConfigModelConstant;\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.service.ComponentNode;\r
+import org.onap.ccsdk.features.model.service.ComponentNodeService;\r
+import org.onap.ccsdk.features.model.service.ConfigModelService;\r
+import org.onap.ccsdk.features.model.utils.ResourceAssignmentUtils;\r
+import org.onap.ccsdk.features.model.utils.TransformationUtils;\r
+import org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorService;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;\r
 import com.att.eelf.configuration.EELFLogger;\r

diff --git a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ConfigAssignmentService.java b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ConfigAssignmentService.java
similarity index 84%
rename from blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ConfigAssignmentService.java
rename to blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ConfigAssignmentService.java
index 4866f25..969f846 100644 (file)
--- a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ConfigAssignmentService.java
+++ b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ConfigAssignmentService.java
@@ -15,11 +15,12 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.assignment.service;\r
+package org.onap.ccsdk.features.assignment.service;\r
 \r
 import java.util.List;\r
-import org.onap.ccsdk.config.assignment.data.ResourceAssignmentData;\r
-import org.onap.ccsdk.config.model.data.ResourceAssignment;\r
+\r
+import org.onap.ccsdk.features.assignment.data.ResourceAssignmentData;\r
+import org.onap.ccsdk.features.model.data.ResourceAssignment;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;\r
 \r
 public interface ConfigAssignmentService {\r

diff --git a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ConfigAssignmentServiceImpl.java b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ConfigAssignmentServiceImpl.java
similarity index 84%
rename from blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ConfigAssignmentServiceImpl.java
rename to blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ConfigAssignmentServiceImpl.java
index 9e2bdcf..560d0b1 100644 (file)
--- a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ConfigAssignmentServiceImpl.java
+++ b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ConfigAssignmentServiceImpl.java
@@ -15,16 +15,17 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.assignment.service;\r
+package org.onap.ccsdk.features.assignment.service;\r
 \r
 import java.util.List;\r
-import org.onap.ccsdk.config.assignment.data.ResourceAssignmentData;\r
-import org.onap.ccsdk.config.data.adaptor.service.ConfigResourceService;\r
-import org.onap.ccsdk.config.generator.service.ConfigGeneratorService;\r
-import org.onap.ccsdk.config.model.data.ResourceAssignment;\r
-import org.onap.ccsdk.config.model.service.ComponentNodeService;\r
-import org.onap.ccsdk.config.model.service.ConfigModelService;\r
-import org.onap.ccsdk.config.rest.adaptor.service.ConfigRestAdaptorService;\r
+\r
+import org.onap.ccsdk.features.assignment.data.ResourceAssignmentData;\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.model.data.ResourceAssignment;\r
+import org.onap.ccsdk.features.model.service.ComponentNodeService;\r
+import org.onap.ccsdk.features.model.service.ConfigModelService;\r
+import org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorService;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;\r
 import com.att.eelf.configuration.EELFLogger;\r
 import com.att.eelf.configuration.EELFManager;\r

diff --git a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ConfigAssignmentUtils.java b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ConfigAssignmentUtils.java
similarity index 93%
rename from blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ConfigAssignmentUtils.java
rename to blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ConfigAssignmentUtils.java
index 32adbe2..1d7df6b 100644 (file)
--- a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ConfigAssignmentUtils.java
+++ b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ConfigAssignmentUtils.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.assignment.service;\r
+package org.onap.ccsdk.features.assignment.service;\r
 \r
 import java.util.ArrayList;\r
 import java.util.List;\r
@@ -24,19 +24,19 @@ import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.IteratorUtils;\r
 import org.apache.commons.collections.MapUtils;\r
 import org.apache.commons.lang3.StringUtils;\r
-import org.onap.ccsdk.config.data.adaptor.domain.ResourceAssignmentData;\r
-import org.onap.ccsdk.config.model.ConfigModelConstant;\r
-import org.onap.ccsdk.config.model.ConfigModelException;\r
-import org.onap.ccsdk.config.model.ValidTypes;\r
-import org.onap.ccsdk.config.model.data.DataType;\r
-import org.onap.ccsdk.config.model.data.EntrySchema;\r
-import org.onap.ccsdk.config.model.data.PropertyDefinition;\r
-import org.onap.ccsdk.config.model.data.ResourceAssignment;\r
-import org.onap.ccsdk.config.model.data.dict.ResourceDefinition;\r
-import org.onap.ccsdk.config.model.domain.ResourceDictionary;\r
-import org.onap.ccsdk.config.model.utils.JsonUtils;\r
-import org.onap.ccsdk.config.model.utils.ResourceAssignmentUtils;\r
-import org.onap.ccsdk.config.model.utils.TransformationUtils;\r
+import org.onap.ccsdk.features.data.adaptor.domain.ResourceAssignmentData;\r
+import org.onap.ccsdk.features.model.ConfigModelConstant;\r
+import org.onap.ccsdk.features.model.ConfigModelException;\r
+import org.onap.ccsdk.features.model.ValidTypes;\r
+import org.onap.ccsdk.features.model.data.DataType;\r
+import org.onap.ccsdk.features.model.data.EntrySchema;\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
+import org.onap.ccsdk.features.model.domain.ResourceDictionary;\r
+import org.onap.ccsdk.features.model.utils.JsonUtils;\r
+import org.onap.ccsdk.features.model.utils.ResourceAssignmentUtils;\r
+import org.onap.ccsdk.features.model.utils.TransformationUtils;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;\r
 import com.att.eelf.configuration.EELFLogger;\r

diff --git a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ConfigPreviewService.java b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ConfigPreviewService.java
similarity index 89%
rename from blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ConfigPreviewService.java
rename to blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ConfigPreviewService.java
index ae5c01c..071b5a5 100644 (file)
--- a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ConfigPreviewService.java
+++ b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ConfigPreviewService.java
@@ -15,20 +15,20 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.assignment.service;\r
+package org.onap.ccsdk.features.assignment.service;\r
 \r
 import java.util.HashMap;\r
 import java.util.List;\r
 import java.util.Map;\r
 import org.apache.commons.collections.CollectionUtils;\r
 import org.apache.commons.lang3.StringUtils;\r
-import org.onap.ccsdk.config.assignment.data.ResourceAssignmentData;\r
-import org.onap.ccsdk.config.data.adaptor.domain.ConfigResource;\r
-import org.onap.ccsdk.config.data.adaptor.service.ConfigResourceService;\r
-import org.onap.ccsdk.config.generator.data.ConfigGeneratorInfo;\r
-import org.onap.ccsdk.config.generator.service.ConfigGeneratorService;\r
-import org.onap.ccsdk.config.model.ConfigModelConstant;\r
-import org.onap.ccsdk.config.model.service.ConfigModelService;\r
+import org.onap.ccsdk.features.assignment.data.ResourceAssignmentData;\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.data.ConfigGeneratorInfo;\r
+import org.onap.ccsdk.features.generator.service.ConfigGeneratorService;\r
+import org.onap.ccsdk.features.model.ConfigModelConstant;\r
+import org.onap.ccsdk.features.model.service.ConfigModelService;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;\r
 import com.att.eelf.configuration.EELFLogger;\r
 import com.att.eelf.configuration.EELFManager;\r

diff --git a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ResourceDictionaryService.java b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ResourceDictionaryService.java
similarity index 88%
rename from blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ResourceDictionaryService.java
rename to blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ResourceDictionaryService.java
index 50562b0..ec586f4 100644 (file)
--- a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ResourceDictionaryService.java
+++ b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ResourceDictionaryService.java
@@ -15,20 +15,20 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.assignment.service;\r
+package org.onap.ccsdk.features.assignment.service;\r
 \r
 import java.util.ArrayList;\r
 import java.util.HashMap;\r
 import java.util.List;\r
 import java.util.Map;\r
 import org.apache.commons.lang3.StringUtils;\r
-import org.onap.ccsdk.config.model.data.ResourceAssignment;\r
-import org.onap.ccsdk.config.model.data.dict.ResourceDefinition;\r
-import org.onap.ccsdk.config.model.domain.ResourceDictionary;\r
-import org.onap.ccsdk.config.model.utils.TransformationUtils;\r
-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorConstants;\r
-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorException;\r
-import org.onap.ccsdk.config.rest.adaptor.service.ConfigRestAdaptorService;\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.domain.ResourceDictionary;\r
+import org.onap.ccsdk.features.model.utils.TransformationUtils;\r
+import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorConstants;\r
+import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorException;\r
+import org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorService;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;\r
 import com.att.eelf.configuration.EELFLogger;\r
 import com.att.eelf.configuration.EELFManager;\r

diff --git a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ResourceModelService.java b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ResourceModelService.java
similarity index 91%
rename from blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ResourceModelService.java
rename to blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ResourceModelService.java
index 9f3013b..befa36a 100644 (file)
--- a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ResourceModelService.java
+++ b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ResourceModelService.java
@@ -15,17 +15,17 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.assignment.service;\r
+package org.onap.ccsdk.features.assignment.service;\r
 \r
 import java.util.HashMap;\r
 import java.util.List;\r
 import java.util.Map;\r
 import org.apache.commons.collections.CollectionUtils;\r
 import org.apache.commons.lang3.StringUtils;\r
-import org.onap.ccsdk.config.model.data.ResourceAssignment;\r
-import org.onap.ccsdk.config.model.service.ConfigModelService;\r
-import org.onap.ccsdk.config.model.utils.TransformationUtils;\r
-import org.onap.ccsdk.config.model.validator.ResourceAssignmentValidator;\r
+import org.onap.ccsdk.features.model.data.ResourceAssignment;\r
+import org.onap.ccsdk.features.model.service.ConfigModelService;\r
+import org.onap.ccsdk.features.model.utils.TransformationUtils;\r
+import org.onap.ccsdk.features.model.validator.ResourceAssignmentValidator;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;\r
 import com.att.eelf.configuration.EELFLogger;\r

diff --git a/blueprints-processor/plugin/assignment-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml b/blueprints-processor/plugin/assignment-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
index baa6bdb..f15429d 100644 (file)
--- a/blueprints-processor/plugin/assignment-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
+++ b/blueprints-processor/plugin/assignment-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
@@ -21,23 +21,23 @@
        odl:use-default-for-reference-types="true">\r
 \r
        <reference id="componentNodeService"\r
-               interface="org.onap.ccsdk.config.model.service.ComponentNodeService" />\r
+               interface="org.onap.ccsdk.features.model.service.ComponentNodeService" />\r
 \r
        <reference id="configResourceService"\r
-               interface="org.onap.ccsdk.config.data.adaptor.service.ConfigResourceService" />\r
+               interface="org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService" />\r
 \r
        <reference id="configModelService"\r
-               interface="org.onap.ccsdk.config.model.service.ConfigModelService" />\r
+               interface="org.onap.ccsdk.features.model.service.ConfigModelService" />\r
 \r
        <reference id="configRestAdaptorService"\r
-               interface="org.onap.ccsdk.config.rest.adaptor.service.ConfigRestAdaptorService" />\r
+               interface="org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorService" />\r
 \r
        <reference id="configGeneratorService"\r
-               interface="org.onap.ccsdk.config.generator.service.ConfigGeneratorService" />\r
+               interface="org.onap.ccsdk.features.generator.service.ConfigGeneratorService" />\r
 \r
        <!-- Expose the Common Component Bean -->\r
        <bean id="configAssignmentNode"\r
-               class="org.onap.ccsdk.config.assignment.service.ConfigAssignmentNode">\r
+               class="org.onap.ccsdk.features.assignment.service.ConfigAssignmentNode">\r
                <argument ref="configResourceService" />\r
                <argument ref="configRestAdaptorService" />\r
                <argument ref="configModelService" />\r
@@ -46,10 +46,10 @@
        </bean>\r
 \r
        <service ref="configAssignmentNode"\r
-               interface="org.onap.ccsdk.config.assignment.service.ConfigAssignmentNode" />\r
+               interface="org.onap.ccsdk.features.assignment.service.ConfigAssignmentNode" />\r
 \r
        <bean id="configAssignmentService"\r
-               class="org.onap.ccsdk.config.assignment.service.ConfigAssignmentServiceImpl">\r
+               class="org.onap.ccsdk.features.assignment.service.ConfigAssignmentServiceImpl">\r
                <argument ref="configResourceService" />\r
                <argument ref="configRestAdaptorService" />\r
                <argument ref="configModelService" />\r
@@ -58,6 +58,6 @@
        </bean>\r
 \r
        <service ref="configAssignmentService"\r
-               interface="org.onap.ccsdk.config.assignment.service.ConfigAssignmentService" />\r
+               interface="org.onap.ccsdk.features.assignment.service.ConfigAssignmentService" />\r
 \r
 </blueprint>\r

diff --git a/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/processor/DBResourceProcessorTest.java b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/processor/DBResourceProcessorTest.java
similarity index 92%
rename from blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/processor/DBResourceProcessorTest.java
rename to blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/processor/DBResourceProcessorTest.java
index 5a704e9..43a4881 100644 (file)
--- a/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/processor/DBResourceProcessorTest.java
+++ b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/processor/DBResourceProcessorTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.assignment.processor;\r
+package org.onap.ccsdk.features.assignment.processor;\r
 \r
 import static org.mockito.Matchers.any;\r
 import java.io.File;\r
@@ -37,13 +37,14 @@ 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.config.assignment.service.ConfigResourceAssignmentTestUtils;\r
-import org.onap.ccsdk.config.data.adaptor.domain.TransactionLog;\r
-import org.onap.ccsdk.config.data.adaptor.service.ConfigResourceService;\r
-import org.onap.ccsdk.config.model.ConfigModelConstant;\r
-import org.onap.ccsdk.config.model.data.ResourceAssignment;\r
-import org.onap.ccsdk.config.model.data.dict.ResourceDefinition;\r
-import org.onap.ccsdk.config.model.utils.TransformationUtils;\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
+import org.onap.ccsdk.features.model.ConfigModelConstant;\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.TransformationUtils;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;\r
 import com.att.eelf.configuration.EELFLogger;\r

diff --git a/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/processor/DefaultResourceProcessorTest.java b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/processor/DefaultResourceProcessorTest.java
similarity index 87%
rename from blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/processor/DefaultResourceProcessorTest.java
rename to blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/processor/DefaultResourceProcessorTest.java
index 7e8d142..df38003 100644 (file)
--- a/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/processor/DefaultResourceProcessorTest.java
+++ b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/processor/DefaultResourceProcessorTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.assignment.processor;\r
+package org.onap.ccsdk.features.assignment.processor;\r
 \r
 import static org.mockito.Matchers.any;\r
 import java.io.File;\r
@@ -35,13 +35,14 @@ 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.config.assignment.service.ConfigResourceAssignmentTestUtils;\r
-import org.onap.ccsdk.config.data.adaptor.domain.TransactionLog;\r
-import org.onap.ccsdk.config.data.adaptor.service.ConfigResourceService;\r
-import org.onap.ccsdk.config.model.ConfigModelConstant;\r
-import org.onap.ccsdk.config.model.data.ResourceAssignment;\r
-import org.onap.ccsdk.config.model.data.dict.ResourceDefinition;\r
-import org.onap.ccsdk.config.model.utils.TransformationUtils;\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
+import org.onap.ccsdk.features.model.ConfigModelConstant;\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.TransformationUtils;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;\r
 import com.att.eelf.configuration.EELFLogger;\r

diff --git a/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/processor/InputResourceProcessorTest.java b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/processor/InputResourceProcessorTest.java
similarity index 91%
rename from blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/processor/InputResourceProcessorTest.java
rename to blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/processor/InputResourceProcessorTest.java
index 2aabdb3..cd0b782 100644 (file)
--- a/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/processor/InputResourceProcessorTest.java
+++ b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/processor/InputResourceProcessorTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.assignment.processor;\r
+package org.onap.ccsdk.features.assignment.processor;\r
 \r
 import static org.mockito.Matchers.any;\r
 import java.io.File;\r
@@ -35,13 +35,14 @@ 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.config.assignment.service.ConfigResourceAssignmentTestUtils;\r
-import org.onap.ccsdk.config.data.adaptor.domain.TransactionLog;\r
-import org.onap.ccsdk.config.data.adaptor.service.ConfigResourceService;\r
-import org.onap.ccsdk.config.model.ConfigModelConstant;\r
-import org.onap.ccsdk.config.model.data.ResourceAssignment;\r
-import org.onap.ccsdk.config.model.data.dict.ResourceDefinition;\r
-import org.onap.ccsdk.config.model.utils.TransformationUtils;\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
+import org.onap.ccsdk.features.model.ConfigModelConstant;\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.TransformationUtils;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;\r
 import com.att.eelf.configuration.EELFLogger;\r

diff --git a/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/processor/MdsalResourceProcessorTest.java b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/processor/MdsalResourceProcessorTest.java
similarity index 94%
rename from blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/processor/MdsalResourceProcessorTest.java
rename to blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/processor/MdsalResourceProcessorTest.java
index 2d651c8..5f73f32 100644 (file)
--- a/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/processor/MdsalResourceProcessorTest.java
+++ b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/processor/MdsalResourceProcessorTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.assignment.processor;\r
+package org.onap.ccsdk.features.assignment.processor;\r
 \r
 import java.io.File;\r
 import java.nio.charset.Charset;\r
@@ -33,12 +33,13 @@ 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.config.assignment.service.ConfigResourceAssignmentTestUtils;\r
-import org.onap.ccsdk.config.model.ConfigModelConstant;\r
-import org.onap.ccsdk.config.model.data.ResourceAssignment;\r
-import org.onap.ccsdk.config.model.data.dict.ResourceDefinition;\r
-import org.onap.ccsdk.config.model.utils.TransformationUtils;\r
-import org.onap.ccsdk.config.rest.adaptor.service.ConfigRestAdaptorService;\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
+import org.onap.ccsdk.features.model.data.dict.ResourceDefinition;\r
+import org.onap.ccsdk.features.model.utils.TransformationUtils;\r
+import org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorService;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;\r
 import com.att.eelf.configuration.EELFLogger;\r
 import com.att.eelf.configuration.EELFManager;\r

diff --git a/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/service/ConfigAssignmentNodeTest.java b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/service/ConfigAssignmentNodeTest.java
similarity index 91%
rename from blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/service/ConfigAssignmentNodeTest.java
rename to blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/service/ConfigAssignmentNodeTest.java
index 9ad94dc..41911e9 100644 (file)
--- a/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/service/ConfigAssignmentNodeTest.java
+++ b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/service/ConfigAssignmentNodeTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.assignment.service;\r
+package org.onap.ccsdk.features.assignment.service;\r
 \r
 import java.io.File;\r
 import java.nio.charset.Charset;\r
@@ -33,17 +33,18 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;\r
 import org.mockito.MockitoAnnotations;\r
 import org.mockito.runners.MockitoJUnitRunner;\r
-import org.onap.ccsdk.config.assignment.ConfigAssignmentConstants;\r
-import org.onap.ccsdk.config.data.adaptor.service.ConfigResourceService;\r
-import org.onap.ccsdk.config.generator.service.ConfigGeneratorService;\r
-import org.onap.ccsdk.config.generator.service.ConfigGeneratorServiceImpl;\r
-import org.onap.ccsdk.config.model.ConfigModelConstant;\r
-import org.onap.ccsdk.config.model.service.ComponentNodeDelegate;\r
-import org.onap.ccsdk.config.model.service.ComponentNodeService;\r
-import org.onap.ccsdk.config.model.service.ComponentNodeServiceImpl;\r
-import org.onap.ccsdk.config.model.service.ConfigModelService;\r
-import org.onap.ccsdk.config.model.service.ConfigModelServiceImpl;\r
-import org.onap.ccsdk.config.rest.adaptor.service.ConfigRestAdaptorService;\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
+import org.onap.ccsdk.features.model.ConfigModelConstant;\r
+import org.onap.ccsdk.features.model.service.ComponentNodeDelegate;\r
+import org.onap.ccsdk.features.model.service.ComponentNodeService;\r
+import org.onap.ccsdk.features.model.service.ComponentNodeServiceImpl;\r
+import org.onap.ccsdk.features.model.service.ConfigModelService;\r
+import org.onap.ccsdk.features.model.service.ConfigModelServiceImpl;\r
+import org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorService;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;\r
 import org.osgi.framework.BundleContext;\r
 import com.att.eelf.configuration.EELFLogger;\r

diff --git a/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/service/ConfigPreviewServiceTest.java b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/service/ConfigPreviewServiceTest.java
similarity index 84%
rename from blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/service/ConfigPreviewServiceTest.java
rename to blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/service/ConfigPreviewServiceTest.java
index 75b7f2e..1e0b4a2 100644 (file)
--- a/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/service/ConfigPreviewServiceTest.java
+++ b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/service/ConfigPreviewServiceTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.assignment.service;\r
+package org.onap.ccsdk.features.assignment.service;\r
 \r
 import java.io.File;\r
 import java.nio.charset.Charset;\r
@@ -29,14 +29,16 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;\r
 import org.mockito.MockitoAnnotations;\r
 import org.mockito.runners.MockitoJUnitRunner;\r
-import org.onap.ccsdk.config.assignment.data.ResourceAssignmentData;\r
-import org.onap.ccsdk.config.data.adaptor.domain.ConfigResource;\r
-import org.onap.ccsdk.config.data.adaptor.service.ConfigResourceService;\r
-import org.onap.ccsdk.config.generator.service.ConfigGeneratorService;\r
-import org.onap.ccsdk.config.generator.service.ConfigGeneratorServiceImpl;\r
-import org.onap.ccsdk.config.model.service.ConfigModelService;\r
-import org.onap.ccsdk.config.model.service.ConfigModelServiceImpl;\r
-import org.onap.ccsdk.config.rest.adaptor.service.ConfigRestAdaptorService;\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
+import org.onap.ccsdk.features.generator.service.ConfigGeneratorServiceImpl;\r
+import org.onap.ccsdk.features.model.service.ConfigModelService;\r
+import org.onap.ccsdk.features.model.service.ConfigModelServiceImpl;\r
+import org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorService;\r
+\r
 import com.att.eelf.configuration.EELFLogger;\r
 import com.att.eelf.configuration.EELFManager;\r
 \r

diff --git a/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/service/ConfigResourceAssignmentTestUtils.java b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/service/ConfigResourceAssignmentTestUtils.java
similarity index 88%
rename from blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/service/ConfigResourceAssignmentTestUtils.java
rename to blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/service/ConfigResourceAssignmentTestUtils.java
index ee1c076..5ce2c9a 100644 (file)
--- a/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/service/ConfigResourceAssignmentTestUtils.java
+++ b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/service/ConfigResourceAssignmentTestUtils.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.assignment.service;\r
+package org.onap.ccsdk.features.assignment.service;\r
 \r
 import static org.mockito.Matchers.any;\r
 import static org.mockito.Matchers.anyString;\r
@@ -33,14 +33,15 @@ import org.mockito.Matchers;
 import org.mockito.Mockito;\r
 import org.mockito.invocation.InvocationOnMock;\r
 import org.mockito.stubbing.Answer;\r
-import org.onap.ccsdk.config.data.adaptor.domain.ConfigResource;\r
-import org.onap.ccsdk.config.data.adaptor.domain.TransactionLog;\r
-import org.onap.ccsdk.config.data.adaptor.service.ConfigResourceService;\r
-import org.onap.ccsdk.config.model.ConfigModelConstant;\r
-import org.onap.ccsdk.config.model.data.dict.ResourceDefinition;\r
-import org.onap.ccsdk.config.model.domain.ConfigModel;\r
-import org.onap.ccsdk.config.model.domain.ConfigModelContent;\r
-import org.onap.ccsdk.config.rest.adaptor.service.ConfigRestAdaptorService;\r
+import org.onap.ccsdk.features.data.adaptor.domain.ConfigResource;\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.model.ConfigModelConstant;\r
+import org.onap.ccsdk.features.model.data.dict.ResourceDefinition;\r
+import org.onap.ccsdk.features.model.domain.ConfigModel;\r
+import org.onap.ccsdk.features.model.domain.ConfigModelContent;\r
+import org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorService;\r
+\r
 import com.att.eelf.configuration.EELFLogger;\r
 import com.att.eelf.configuration.EELFManager;\r
 import com.fasterxml.jackson.core.type.TypeReference;\r
@@ -68,10 +69,10 @@ public class ConfigResourceAssignmentTestUtils {
 \r
         Mockito.doAnswer(new Answer<ConfigModel>() {\r
             @Override\r
-            public org.onap.ccsdk.config.model.domain.ConfigModel answer(InvocationOnMock invocationOnMock)\r
+            public org.onap.ccsdk.features.model.domain.ConfigModel answer(InvocationOnMock invocationOnMock)\r
                     throws Throwable {\r
                 Object[] args = invocationOnMock.getArguments();\r
-                org.onap.ccsdk.config.model.domain.ConfigModel serviceArtifact = null;\r
+                org.onap.ccsdk.features.model.domain.ConfigModel serviceArtifact = null;\r
                 if (args != null && args.length == 3) {\r
 \r
                     logger.info("Artifact info " + Arrays.asList(args));\r
@@ -102,7 +103,7 @@ public class ConfigResourceAssignmentTestUtils {
                         configModelContents.add(configModelTemplateContent);\r
                     }\r
 \r
-                    serviceArtifact = new org.onap.ccsdk.config.model.domain.ConfigModel();\r
+                    serviceArtifact = new org.onap.ccsdk.features.model.domain.ConfigModel();\r
                     serviceArtifact.setArtifactName(String.valueOf(args[0]));\r
                     serviceArtifact.setArtifactVersion(String.valueOf(args[1]));\r
                     serviceArtifact.setPublished("Y");\r

diff --git a/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/service/ResourceAssignmentGenerationTest.java b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/service/ResourceAssignmentGenerationTest.java
similarity index 91%
rename from blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/service/ResourceAssignmentGenerationTest.java
rename to blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/service/ResourceAssignmentGenerationTest.java
index 3dc7da7..04147d9 100644 (file)
--- a/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/service/ResourceAssignmentGenerationTest.java
+++ b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/service/ResourceAssignmentGenerationTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.assignment.service;\r
+package org.onap.ccsdk.features.assignment.service;\r
 \r
 import java.nio.charset.Charset;\r
 import java.util.HashMap;\r
@@ -24,11 +24,12 @@ import java.util.Map;
 import org.apache.commons.io.IOUtils;\r
 import org.junit.Assert;\r
 import org.junit.Test;\r
-import org.onap.ccsdk.config.model.ConfigModelConstant;\r
-import org.onap.ccsdk.config.model.ValidTypes;\r
-import org.onap.ccsdk.config.model.data.ResourceAssignment;\r
-import org.onap.ccsdk.config.model.utils.ResourceAssignmentUtils;\r
-import org.onap.ccsdk.config.model.utils.TransformationUtils;\r
+import org.onap.ccsdk.features.model.ConfigModelConstant;\r
+import org.onap.ccsdk.features.model.ValidTypes;\r
+import org.onap.ccsdk.features.model.data.ResourceAssignment;\r
+import org.onap.ccsdk.features.model.utils.ResourceAssignmentUtils;\r
+import org.onap.ccsdk.features.model.utils.TransformationUtils;\r
+\r
 import com.att.eelf.configuration.EELFLogger;\r
 import com.att.eelf.configuration.EELFManager;\r
 import com.fasterxml.jackson.databind.JsonNode;\r

diff --git a/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/service/ResourceAssignmentValidation.java b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/service/ResourceAssignmentValidation.java
similarity index 90%
rename from blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/service/ResourceAssignmentValidation.java
rename to blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/service/ResourceAssignmentValidation.java
index d708404..a3be029 100644 (file)
--- a/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/service/ResourceAssignmentValidation.java
+++ b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/service/ResourceAssignmentValidation.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.assignment.service;\r
+package org.onap.ccsdk.features.assignment.service;\r
 \r
 import java.io.IOException;\r
 import java.nio.charset.Charset;\r
@@ -25,10 +25,11 @@ import org.junit.Assert;
 import org.junit.Rule;\r
 import org.junit.Test;\r
 import org.junit.rules.ExpectedException;\r
-import org.onap.ccsdk.config.model.ConfigModelException;\r
-import org.onap.ccsdk.config.model.data.ResourceAssignment;\r
-import org.onap.ccsdk.config.model.utils.TransformationUtils;\r
-import org.onap.ccsdk.config.model.validator.ResourceAssignmentValidator;\r
+import org.onap.ccsdk.features.model.ConfigModelException;\r
+import org.onap.ccsdk.features.model.data.ResourceAssignment;\r
+import org.onap.ccsdk.features.model.utils.TransformationUtils;\r
+import org.onap.ccsdk.features.model.validator.ResourceAssignmentValidator;\r
+\r
 import com.att.eelf.configuration.EELFLogger;\r
 import com.att.eelf.configuration.EELFManager;\r
 \r

diff --git a/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/service/TopologicalSortingTest.java b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/service/TopologicalSortingTest.java
similarity index 88%
rename from blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/service/TopologicalSortingTest.java
rename to blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/service/TopologicalSortingTest.java
index e4b7f5d..f6e8871 100644 (file)
--- a/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/service/TopologicalSortingTest.java
+++ b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/service/TopologicalSortingTest.java
@@ -15,16 +15,16 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.assignment.service;\r
+package org.onap.ccsdk.features.assignment.service;\r
 \r
 import java.nio.charset.Charset;\r
 import java.util.List;\r
 import org.apache.commons.io.IOUtils;\r
 import org.junit.Assert;\r
 import org.junit.Test;\r
-import org.onap.ccsdk.config.assignment.processor.ResourceAssignmentProcessor;\r
-import org.onap.ccsdk.config.model.data.ResourceAssignment;\r
-import org.onap.ccsdk.config.model.utils.TransformationUtils;\r
+import org.onap.ccsdk.features.assignment.processor.ResourceAssignmentProcessor;\r
+import org.onap.ccsdk.features.model.data.ResourceAssignment;\r
+import org.onap.ccsdk.features.model.utils.TransformationUtils;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;\r
 import com.att.eelf.configuration.EELFLogger;\r
 import com.att.eelf.configuration.EELFManager;\r

diff --git a/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/resource_assignment.json b/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/resource_assignment.json
index 0e29fe1..cbea6a8 100644 (file)
--- a/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/resource_assignment.json
+++ b/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/resource_assignment.json
@@ -139,7 +139,7 @@
                        "resource-assignment": {\r
                                "type": "component-resource-assignment",\r
                                "interfaces": {\r
-                                       "org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode": {\r
+                                       "org-onap-ccsdk-features-assignment-service-ConfigAssignmentNode": {\r
                                                "operations": {\r
                                                        "process": {\r
                                                                "inputs": {\r
@@ -243,7 +243,7 @@
                                }\r
                        },\r
                        "interfaces": {\r
-                               "org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode": {\r
+                               "org-onap-ccsdk-features-assignment-service-ConfigAssignmentNode": {\r
                                        "operations": {\r
                                                "process": {\r
                                                        "inputs": {\r

diff --git a/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/resource_assignment/resource_assignment.json b/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/resource_assignment/resource_assignment.json
index 6347f42..4cbb8fa 100644 (file)
--- a/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/resource_assignment/resource_assignment.json
+++ b/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/resource_assignment/resource_assignment.json
@@ -139,7 +139,7 @@
                        "resource-assignment": {\r
                                "type": "component-resource-assignment",\r
                                "interfaces": {\r
-                                       "org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode": {\r
+                                       "org-onap-ccsdk-features-assignment-service-ConfigAssignmentNode": {\r
                                                "operations": {\r
                                                        "process": {\r
                                                                "inputs": {\r
@@ -245,7 +245,7 @@
                                }\r
                        },\r
                        "interfaces": {\r
-                               "org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode": {\r
+                               "org-onap-ccsdk-features-assignment-service-ConfigAssignmentNode": {\r
                                        "operations": {\r
                                                "process": {\r
                                                        "inputs": {\r

diff --git a/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/vpe-201802-baseconfig/vpe-201802-baseconfig.json b/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/vpe-201802-baseconfig/vpe-201802-baseconfig.json
index 20207a8..7113b70 100644 (file)
--- a/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/vpe-201802-baseconfig/vpe-201802-baseconfig.json
+++ b/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/vpe-201802-baseconfig/vpe-201802-baseconfig.json
@@ -224,7 +224,7 @@
                        "resource-assignment": {\r
                                "type": "component-resource-assignment",\r
                                "interfaces": {\r
-                                       "org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode": {\r
+                                       "org-onap-ccsdk-features-assignment-service-ConfigAssignmentNode": {\r
                                                "operations": {\r
                                                        "process": {\r
                                                                "inputs": {\r
@@ -328,7 +328,7 @@
                                }\r
                        },\r
                        "interfaces": {\r
-                               "org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode": {\r
+                               "org-onap-ccsdk-features-assignment-service-ConfigAssignmentNode": {\r
                                        "operations": {\r
                                                "process": {\r
                                                        "inputs": {\r

diff --git a/blueprints-processor/plugin/generator-provider/pom.xml b/blueprints-processor/plugin/generator-provider/pom.xml
index 006e378..e8a2ab0 100644 (file)
--- a/blueprints-processor/plugin/generator-provider/pom.xml
+++ b/blueprints-processor/plugin/generator-provider/pom.xml
@@ -108,10 +108,10 @@
                         <Bundle-Name>${project.artifactId}</Bundle-Name>\r
                         <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>\r
                         <Export-Package>\r
-                            org.onap.ccsdk.config.generator,\r
-                            org.onap.ccsdk.config.generator.data,\r
-                            org.onap.ccsdk.config.generator.service,\r
-                            org.onap.ccsdk.config.generator.tool\r
+                            org.onap.ccsdk.features.generator,\r
+                            org.onap.ccsdk.features.generator.data,\r
+                            org.onap.ccsdk.features.generator.service,\r
+                            org.onap.ccsdk.features.generator.tool\r
                         </Export-Package>\r
                     </instructions>\r
                 </configuration>\r

diff --git a/blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/config/generator/ConfigGeneratorConstant.java b/blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/features/generator/ConfigGeneratorConstant.java
similarity index 95%
rename from blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/config/generator/ConfigGeneratorConstant.java
rename to blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/features/generator/ConfigGeneratorConstant.java
index b859b69..06c423b 100644 (file)
--- a/blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/config/generator/ConfigGeneratorConstant.java
+++ b/blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/features/generator/ConfigGeneratorConstant.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.generator;\r
+package org.onap.ccsdk.features.generator;\r
 \r
 public class ConfigGeneratorConstant {\r
 \r

diff --git a/blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/config/generator/data/ConfigGeneratorInfo.java b/blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/features/generator/data/ConfigGeneratorInfo.java
similarity index 94%
rename from blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/config/generator/data/ConfigGeneratorInfo.java
rename to blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/features/generator/data/ConfigGeneratorInfo.java
index ec46154..0b7ea04 100644 (file)
--- a/blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/config/generator/data/ConfigGeneratorInfo.java
+++ b/blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/features/generator/data/ConfigGeneratorInfo.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.generator.data;\r
+package org.onap.ccsdk.features.generator.data;\r
 \r
 public class ConfigGeneratorInfo {\r
 \r

diff --git a/blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/config/generator/service/ConfigGeneratorNode.java b/blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/features/generator/service/ConfigGeneratorNode.java
similarity index 91%
rename from blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/config/generator/service/ConfigGeneratorNode.java
rename to blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/features/generator/service/ConfigGeneratorNode.java
index 136ba7f..421692b 100644 (file)
--- a/blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/config/generator/service/ConfigGeneratorNode.java
+++ b/blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/features/generator/service/ConfigGeneratorNode.java
@@ -15,16 +15,16 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.generator.service;\r
+package org.onap.ccsdk.features.generator.service;\r
 \r
 import java.util.Map;\r
 import org.apache.commons.lang3.StringUtils;\r
-import org.onap.ccsdk.config.data.adaptor.service.ConfigResourceService;\r
-import org.onap.ccsdk.config.generator.ConfigGeneratorConstant;\r
-import org.onap.ccsdk.config.generator.data.ConfigGeneratorInfo;\r
-import org.onap.ccsdk.config.model.ConfigModelConstant;\r
-import org.onap.ccsdk.config.model.service.ComponentNode;\r
-import org.onap.ccsdk.config.model.service.ConfigModelService;\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.data.ConfigGeneratorInfo;\r
+import org.onap.ccsdk.features.model.ConfigModelConstant;\r
+import org.onap.ccsdk.features.model.service.ComponentNode;\r
+import org.onap.ccsdk.features.model.service.ConfigModelService;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;\r
 import com.att.eelf.configuration.EELFLogger;\r

diff --git a/blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/config/generator/service/ConfigGeneratorService.java b/blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/features/generator/service/ConfigGeneratorService.java
similarity index 88%
rename from blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/config/generator/service/ConfigGeneratorService.java
rename to blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/features/generator/service/ConfigGeneratorService.java
index 710d47d..b8a9430 100644 (file)
--- a/blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/config/generator/service/ConfigGeneratorService.java
+++ b/blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/features/generator/service/ConfigGeneratorService.java
@@ -15,9 +15,9 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.generator.service;\r
+package org.onap.ccsdk.features.generator.service;\r
 \r
-import org.onap.ccsdk.config.generator.data.ConfigGeneratorInfo;\r
+import org.onap.ccsdk.features.generator.data.ConfigGeneratorInfo;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;\r
 \r
 public interface ConfigGeneratorService {\r

diff --git a/blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/config/generator/service/ConfigGeneratorServiceImpl.java b/blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/features/generator/service/ConfigGeneratorServiceImpl.java
similarity index 92%
rename from blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/config/generator/service/ConfigGeneratorServiceImpl.java
rename to blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/features/generator/service/ConfigGeneratorServiceImpl.java
index 472f5b2..6292b8d 100644 (file)
--- a/blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/config/generator/service/ConfigGeneratorServiceImpl.java
+++ b/blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/features/generator/service/ConfigGeneratorServiceImpl.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.generator.service;\r
+package org.onap.ccsdk.features.generator.service;\r
 \r
 import java.io.StringWriter;\r
 import java.util.Iterator;\r
@@ -24,11 +24,11 @@ import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;\r
 import org.apache.velocity.VelocityContext;\r
 import org.apache.velocity.app.Velocity;\r
-import org.onap.ccsdk.config.data.adaptor.domain.ConfigResource;\r
-import org.onap.ccsdk.config.data.adaptor.service.ConfigResourceService;\r
-import org.onap.ccsdk.config.generator.data.ConfigGeneratorInfo;\r
-import org.onap.ccsdk.config.generator.tool.CustomJsonNodeFactory;\r
-import org.onap.ccsdk.config.model.utils.TransformationUtils;\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.data.ConfigGeneratorInfo;\r
+import org.onap.ccsdk.features.generator.tool.CustomJsonNodeFactory;\r
+import org.onap.ccsdk.features.model.utils.TransformationUtils;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;\r
 import com.att.eelf.configuration.EELFLogger;\r
 import com.att.eelf.configuration.EELFManager;\r

diff --git a/blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/config/generator/tool/CustomJsonNodeFactory.java b/blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/features/generator/tool/CustomJsonNodeFactory.java
similarity index 92%
rename from blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/config/generator/tool/CustomJsonNodeFactory.java
rename to blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/features/generator/tool/CustomJsonNodeFactory.java
index 3e69ef3..f20cef2 100644 (file)
--- a/blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/config/generator/tool/CustomJsonNodeFactory.java
+++ b/blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/features/generator/tool/CustomJsonNodeFactory.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.generator.tool;\r
+package org.onap.ccsdk.features.generator.tool;\r
 \r
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;\r
 import com.fasterxml.jackson.databind.node.TextNode;\r

diff --git a/blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/config/generator/tool/CustomTextNode.java b/blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/features/generator/tool/CustomTextNode.java
similarity index 93%
rename from blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/config/generator/tool/CustomTextNode.java
rename to blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/features/generator/tool/CustomTextNode.java
index cf42c55..1a62dd6 100644 (file)
--- a/blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/config/generator/tool/CustomTextNode.java
+++ b/blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/features/generator/tool/CustomTextNode.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.generator.tool;\r
+package org.onap.ccsdk.features.generator.tool;\r
 \r
 import com.fasterxml.jackson.core.io.CharTypes;\r
 import com.fasterxml.jackson.databind.node.TextNode;\r

diff --git a/blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/config/generator/tool/EscapeUtils.java b/blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/features/generator/tool/EscapeUtils.java
similarity index 94%
rename from blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/config/generator/tool/EscapeUtils.java
rename to blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/features/generator/tool/EscapeUtils.java
index 3009f87..d3246e0 100644 (file)
--- a/blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/config/generator/tool/EscapeUtils.java
+++ b/blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/features/generator/tool/EscapeUtils.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.generator.tool;\r
+package org.onap.ccsdk.features.generator.tool;\r
 \r
 import org.apache.commons.lang3.StringUtils;\r
 \r

diff --git a/blueprints-processor/plugin/generator-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml b/blueprints-processor/plugin/generator-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
index 7bf65fa..78cb281 100644 (file)
--- a/blueprints-processor/plugin/generator-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
+++ b/blueprints-processor/plugin/generator-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
@@ -21,29 +21,29 @@
        odl:use-default-for-reference-types="true">\r
 \r
        <reference id="configModelService"\r
-               interface="org.onap.ccsdk.config.model.service.ConfigModelService" />\r
+               interface="org.onap.ccsdk.features.model.service.ConfigModelService" />\r
 \r
        <reference id="configResourceService"\r
-               interface="org.onap.ccsdk.config.data.adaptor.service.ConfigResourceService" />\r
+               interface="org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService" />\r
 \r
        <!-- Expose the Common Component Bean -->\r
 \r
        <bean id="configGeneratorService"\r
-               class="org.onap.ccsdk.config.generator.service.ConfigGeneratorServiceImpl">\r
+               class="org.onap.ccsdk.features.generator.service.ConfigGeneratorServiceImpl">\r
                <argument ref="configResourceService" />\r
        </bean>\r
 \r
        <service ref="configGeneratorService"\r
-               interface="org.onap.ccsdk.config.generator.service.ConfigGeneratorService" />\r
+               interface="org.onap.ccsdk.features.generator.service.ConfigGeneratorService" />\r
 \r
        <bean id="configGeneratorNode"\r
-               class="org.onap.ccsdk.config.generator.service.ConfigGeneratorNode">\r
+               class="org.onap.ccsdk.features.generator.service.ConfigGeneratorNode">\r
                <argument ref="configResourceService" />\r
                <argument ref="configModelService" />\r
        </bean>\r
 \r
        <service ref="configGeneratorNode"\r
-               interface="org.onap.ccsdk.config.generator.service.ConfigGeneratorNode" />\r
+               interface="org.onap.ccsdk.features.generator.service.ConfigGeneratorNode" />\r
 \r
 \r
 </blueprint>\r

diff --git a/blueprints-processor/plugin/generator-provider/src/test/java/org/onap/ccsdk/config/generator/service/ConfigGeneratorNodeTest.java b/blueprints-processor/plugin/generator-provider/src/test/java/org/onap/ccsdk/features/generator/service/ConfigGeneratorNodeTest.java
similarity index 91%
rename from blueprints-processor/plugin/generator-provider/src/test/java/org/onap/ccsdk/config/generator/service/ConfigGeneratorNodeTest.java
rename to blueprints-processor/plugin/generator-provider/src/test/java/org/onap/ccsdk/features/generator/service/ConfigGeneratorNodeTest.java
index 9413873..58a22ac 100644 (file)
--- a/blueprints-processor/plugin/generator-provider/src/test/java/org/onap/ccsdk/config/generator/service/ConfigGeneratorNodeTest.java
+++ b/blueprints-processor/plugin/generator-provider/src/test/java/org/onap/ccsdk/features/generator/service/ConfigGeneratorNodeTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.generator.service;\r
+package org.onap.ccsdk.features.generator.service;\r
 \r
 import static org.mockito.Matchers.any;\r
 import java.nio.charset.Charset;\r
@@ -35,15 +35,16 @@ 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.config.data.adaptor.domain.ConfigResource;\r
-import org.onap.ccsdk.config.data.adaptor.domain.TransactionLog;\r
-import org.onap.ccsdk.config.data.adaptor.service.ConfigResourceService;\r
-import org.onap.ccsdk.config.generator.ConfigGeneratorConstant;\r
-import org.onap.ccsdk.config.model.ConfigModelConstant;\r
-import org.onap.ccsdk.config.model.service.ConfigModelService;\r
-import org.onap.ccsdk.config.model.service.ConfigModelServiceImpl;\r
-import org.onap.ccsdk.config.model.utils.TransformationUtils;\r
-import org.onap.ccsdk.config.rest.adaptor.service.ConfigRestAdaptorService;\r
+import org.onap.ccsdk.features.data.adaptor.domain.ConfigResource;\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.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
+import org.onap.ccsdk.features.model.utils.TransformationUtils;\r
+import org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorService;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;\r
 import com.att.eelf.configuration.EELFLogger;\r

diff --git a/blueprints-processor/plugin/generator-provider/src/test/java/org/onap/ccsdk/config/generator/tool/EscapeUtilsTest.java b/blueprints-processor/plugin/generator-provider/src/test/java/org/onap/ccsdk/features/generator/tool/EscapeUtilsTest.java
similarity index 92%
rename from blueprints-processor/plugin/generator-provider/src/test/java/org/onap/ccsdk/config/generator/tool/EscapeUtilsTest.java
rename to blueprints-processor/plugin/generator-provider/src/test/java/org/onap/ccsdk/features/generator/tool/EscapeUtilsTest.java
index 0bd2384..5891868 100644 (file)
--- a/blueprints-processor/plugin/generator-provider/src/test/java/org/onap/ccsdk/config/generator/tool/EscapeUtilsTest.java
+++ b/blueprints-processor/plugin/generator-provider/src/test/java/org/onap/ccsdk/features/generator/tool/EscapeUtilsTest.java
@@ -15,10 +15,11 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.generator.tool;\r
+package org.onap.ccsdk.features.generator.tool;\r
 \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/generator-provider/src/test/resources/service_templates/generate_configuration.json b/blueprints-processor/plugin/generator-provider/src/test/resources/service_templates/generate_configuration.json
index 0d569ef..326d2e8 100644 (file)
--- a/blueprints-processor/plugin/generator-provider/src/test/resources/service_templates/generate_configuration.json
+++ b/blueprints-processor/plugin/generator-provider/src/test/resources/service_templates/generate_configuration.json
@@ -67,7 +67,7 @@
                        "generate-configuration": {\r
                                "type": "component-config-generator",\r
                                "interfaces": {\r
-                                       "org-onap-ccsdk-config-generator-service-ConfigGeneratorNode": {\r
+                                       "org-onap-ccsdk-features-generator-service-ConfigGeneratorNode": {\r
                                                "operations": {\r
                                                        "process": {\r
                                                                "inputs": {\r
@@ -164,7 +164,7 @@
                                }\r
                        },\r
                        "interfaces": {\r
-                               "org-onap-ccsdk-config-generator-service-ConfigGeneratorNode": {\r
+                               "org-onap-ccsdk-features-generator-service-ConfigGeneratorNode": {\r
                                        "operations": {\r
                                                "process": {\r
                                                        "inputs": {\r
@@ -211,7 +211,7 @@
                                                                        "type": "string"\r
                                                                },\r
                                                                "mask-info": {\r
-                                                                       "description": "If template contains mask encription keys, then this mask-info field will be generated, This JSON Content alligns to the bean org.onap.ccsdk.config.model.data.custom.MaskInfo ",\r
+                                                                       "description": "If template contains mask encription keys, then this mask-info field will be generated, This JSON Content alligns to the bean org.onap.ccsdk.features.model.data.custom.MaskInfo ",\r
                                                                        "required": false,\r
                                                                        "type": "string"\r
                                                                },\r

diff --git a/blueprints-processor/plugin/model-provider/pom.xml b/blueprints-processor/plugin/model-provider/pom.xml
index e548c2e..1092b48 100644 (file)
--- a/blueprints-processor/plugin/model-provider/pom.xml
+++ b/blueprints-processor/plugin/model-provider/pom.xml
@@ -120,14 +120,14 @@
                     <instructions>\r
                         <Bundle-Name>${project.artifactId}</Bundle-Name>\r
                         <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>\r
-                        <Export-Package>org.onap.ccsdk.config.model,\r
-                            org.onap.ccsdk.config.model.data,\r
-                            org.onap.ccsdk.config.model.data.api,\r
-                            org.onap.ccsdk.config.model.data.dict,\r
-                            org.onap.ccsdk.config.model.domain,\r
-                            org.onap.ccsdk.config.model.service,\r
-                            org.onap.ccsdk.config.model.utils,\r
-                            org.onap.ccsdk.config.model.validator\r
+                        <Export-Package>org.onap.ccsdk.features.model,\r
+                            org.onap.ccsdk.features.model.data,\r
+                            org.onap.ccsdk.features.model.data.api,\r
+                            org.onap.ccsdk.features.model.data.dict,\r
+                            org.onap.ccsdk.features.model.domain,\r
+                            org.onap.ccsdk.features.model.service,\r
+                            org.onap.ccsdk.features.model.utils,\r
+                            org.onap.ccsdk.features.model.validator\r
                         </Export-Package>\r
                     </instructions>\r
                 </configuration>\r

diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/ConfigModelConstant.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/ConfigModelConstant.java
similarity index 97%
rename from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/ConfigModelConstant.java
rename to blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/ConfigModelConstant.java
index a9a3b25..28572f6 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/ConfigModelConstant.java
+++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/ConfigModelConstant.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.model;\r
+package org.onap.ccsdk.features.model;\r
 \r
 public class ConfigModelConstant {\r
 \r

diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/ConfigModelException.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/ConfigModelException.java
similarity index 93%
rename from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/ConfigModelException.java
rename to blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/ConfigModelException.java
index 4936c3b..aa71c26 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/ConfigModelException.java
+++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/ConfigModelException.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.model;\r
+package org.onap.ccsdk.features.model;\r
 \r
 /**\r
  * ConfigGeneratorException.java Purpose: Provide Configuration Generator ConfigGeneratorException\r

diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/ValidTypes.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/ValidTypes.java
similarity index 96%
rename from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/ValidTypes.java
rename to blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/ValidTypes.java
index 6cadcc8..1be6089 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/ValidTypes.java
+++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/ValidTypes.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.model;\r
+package org.onap.ccsdk.features.model;\r
 \r
 import java.util.ArrayList;\r
 import java.util.List;\r

diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/ArtifactDefinition.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/ArtifactDefinition.java
similarity index 94%
rename from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/ArtifactDefinition.java
rename to blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/ArtifactDefinition.java
index 7fcd790..a262094 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/ArtifactDefinition.java
+++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/ArtifactDefinition.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.model.data;\r
+package org.onap.ccsdk.features.model.data;\r
 \r
 import com.fasterxml.jackson.annotation.JsonIgnore;\r
 import com.fasterxml.jackson.annotation.JsonProperty;\r

diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/ArtifactType.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/ArtifactType.java
similarity index 94%
rename from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/ArtifactType.java
rename to blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/ArtifactType.java
index b651b54..3add0a3 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/ArtifactType.java
+++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/ArtifactType.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.model.data;\r
+package org.onap.ccsdk.features.model.data;\r
 \r
 import java.util.List;\r
 import java.util.Map;\r

diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/CapabilityAssignment.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/CapabilityAssignment.java
similarity index 93%
rename from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/CapabilityAssignment.java
rename to blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/CapabilityAssignment.java
index 45c79fb..f40388c 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/CapabilityAssignment.java
+++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/CapabilityAssignment.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.model.data;\r
+package org.onap.ccsdk.features.model.data;\r
 \r
 import java.util.Map;\r
 import com.fasterxml.jackson.annotation.JsonIgnore;\r

diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/CapabilityDefinition.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/CapabilityDefinition.java
similarity index 94%
rename from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/CapabilityDefinition.java
rename to blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/CapabilityDefinition.java
index b64fa5e..467e9bb 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/CapabilityDefinition.java
+++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/CapabilityDefinition.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.model.data;\r
+package org.onap.ccsdk.features.model.data;\r
 \r
 import java.util.List;\r
 import java.util.Map;\r

diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/ConstraintClause.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/ConstraintClause.java
similarity index 94%
rename from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/ConstraintClause.java
rename to blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/ConstraintClause.java
index 12842b5..2066e8f 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/ConstraintClause.java
+++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/ConstraintClause.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.model.data;\r
+package org.onap.ccsdk.features.model.data;\r
 \r
 import java.util.List;\r
 import com.fasterxml.jackson.annotation.JsonProperty;\r

diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/DataType.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/DataType.java
similarity index 94%
rename from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/DataType.java
rename to blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/DataType.java
index 2a3bfa8..6df6ba2 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/DataType.java
+++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/DataType.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.model.data;\r
+package org.onap.ccsdk.features.model.data;\r
 \r
 import java.util.List;\r
 import java.util.Map;\r

diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/EntrySchema.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/EntrySchema.java
similarity index 92%
rename from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/EntrySchema.java
rename to blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/EntrySchema.java
index b98cfd3..6634421 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/EntrySchema.java
+++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/EntrySchema.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.model.data;\r
+package org.onap.ccsdk.features.model.data;\r
 \r
 /**\r
  * EntrySchema.java Purpose: Provide EntrySchema TOSCO Model POJO bean.\r

diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/Implementation.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/Implementation.java
similarity index 93%
rename from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/Implementation.java
rename to blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/Implementation.java
index 016a8cf..46facdb 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/Implementation.java
+++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/Implementation.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.model.data;\r
+package org.onap.ccsdk.features.model.data;\r
 \r
 import java.util.List;\r
 import com.fasterxml.jackson.annotation.JsonIgnore;\r

diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/InterfaceAssignment.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/InterfaceAssignment.java
similarity index 93%
rename from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/InterfaceAssignment.java
rename to blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/InterfaceAssignment.java
index fc7f56f..9007dd0 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/InterfaceAssignment.java
+++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/InterfaceAssignment.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.model.data;\r
+package org.onap.ccsdk.features.model.data;\r
 \r
 import java.util.Map;\r
 import com.fasterxml.jackson.annotation.JsonIgnore;\r

diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/InterfaceDefinition.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/InterfaceDefinition.java
similarity index 93%
rename from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/InterfaceDefinition.java
rename to blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/InterfaceDefinition.java
index d3cbbd5..bcd0ef3 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/InterfaceDefinition.java
+++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/InterfaceDefinition.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.model.data;\r
+package org.onap.ccsdk.features.model.data;\r
 \r
 import java.util.Map;\r
 import com.fasterxml.jackson.annotation.JsonIgnore;\r

diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/NodeTemplate.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/NodeTemplate.java
similarity index 95%
rename from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/NodeTemplate.java
rename to blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/NodeTemplate.java
index 489a89b..c62b719 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/NodeTemplate.java
+++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/NodeTemplate.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.model.data;\r
+package org.onap.ccsdk.features.model.data;\r
 \r
 import java.util.Map;\r
 import com.fasterxml.jackson.annotation.JsonIgnore;\r

diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/NodeType.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/NodeType.java
similarity index 95%
rename from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/NodeType.java
rename to blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/NodeType.java
index 5d55846..f979109 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/NodeType.java
+++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/NodeType.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.model.data;\r
+package org.onap.ccsdk.features.model.data;\r
 \r
 import java.util.Map;\r
 import com.fasterxml.jackson.annotation.JsonIgnore;\r

diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/OperationAssignment.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/OperationAssignment.java
similarity index 94%
rename from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/OperationAssignment.java
rename to blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/OperationAssignment.java
index 8df81f5..cbb1406 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/OperationAssignment.java
+++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/OperationAssignment.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.model.data;\r
+package org.onap.ccsdk.features.model.data;\r
 \r
 import java.util.Map;\r
 import com.fasterxml.jackson.annotation.JsonIgnore;\r

diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/OperationDefinition.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/OperationDefinition.java
similarity index 94%
rename from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/OperationDefinition.java
rename to blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/OperationDefinition.java
index 9a1d3dd..eeb3335 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/OperationDefinition.java
+++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/OperationDefinition.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.model.data;\r
+package org.onap.ccsdk.features.model.data;\r
 \r
 import java.util.Map;\r
 import com.fasterxml.jackson.annotation.JsonIgnore;\r

diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/PropertyDefinition.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/PropertyDefinition.java
similarity index 94%
rename from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/PropertyDefinition.java
rename to blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/PropertyDefinition.java
index b4a3a8f..a300d23 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/PropertyDefinition.java
+++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/PropertyDefinition.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.model.data;\r
+package org.onap.ccsdk.features.model.data;\r
 \r
 import java.util.HashMap;\r
 import java.util.List;\r

diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/RelationshipTemplate.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/RelationshipTemplate.java
similarity index 93%
rename from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/RelationshipTemplate.java
rename to blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/RelationshipTemplate.java
index b0de587..172d5a8 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/RelationshipTemplate.java
+++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/RelationshipTemplate.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.model.data;\r
+package org.onap.ccsdk.features.model.data;\r
 \r
 import java.util.Map;\r
 \r

diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/RequirementAssignment.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/RequirementAssignment.java
similarity index 93%
rename from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/RequirementAssignment.java
rename to blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/RequirementAssignment.java
index b6d35d6..c26de45 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/RequirementAssignment.java
+++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/RequirementAssignment.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.model.data;\r
+package org.onap.ccsdk.features.model.data;\r
 \r
 import com.fasterxml.jackson.annotation.JsonIgnore;\r
 \r

diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/RequirementDefinition.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/RequirementDefinition.java
similarity index 94%
rename from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/RequirementDefinition.java
rename to blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/RequirementDefinition.java
index 68b2c41..623a760 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/RequirementDefinition.java
+++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/RequirementDefinition.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.model.data;\r
+package org.onap.ccsdk.features.model.data;\r
 \r
 import java.util.List;\r
 import com.fasterxml.jackson.annotation.JsonIgnore;\r

diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/ResourceAssignment.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/ResourceAssignment.java
similarity index 94%
rename from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/ResourceAssignment.java
rename to blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/ResourceAssignment.java
index b84f6e3..b288041 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/ResourceAssignment.java
+++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/ResourceAssignment.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.model.data;\r
+package org.onap.ccsdk.features.model.data;\r
 \r
 import java.util.Date;\r
 import java.util.List;\r

diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/ServiceTemplate.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/ServiceTemplate.java
similarity index 95%
rename from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/ServiceTemplate.java
rename to blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/ServiceTemplate.java
index ea9efa1..f66d737 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/ServiceTemplate.java
+++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/ServiceTemplate.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.model.data;\r
+package org.onap.ccsdk.features.model.data;\r
 \r
 import java.util.Map;\r
 import com.fasterxml.jackson.annotation.JsonIgnore;\r

diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/TopologyTemplate.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/TopologyTemplate.java
similarity index 95%
rename from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/TopologyTemplate.java
rename to blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/TopologyTemplate.java
index 5e775f1..1f60938 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/TopologyTemplate.java
+++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/TopologyTemplate.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.model.data;\r
+package org.onap.ccsdk.features.model.data;\r
 \r
 import java.util.Map;\r
 import com.fasterxml.jackson.annotation.JsonIgnore;\r

diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/Workflow.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/Workflow.java
similarity index 92%
rename from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/Workflow.java
rename to blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/Workflow.java
index 733743c..09742a3 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/Workflow.java
+++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/Workflow.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.model.data;\r
+package org.onap.ccsdk.features.model.data;\r
 \r
 import com.fasterxml.jackson.annotation.JsonIgnore;\r
 \r

diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/api/ActionIdentifiers.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/api/ActionIdentifiers.java
similarity index 94%
rename from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/api/ActionIdentifiers.java
rename to blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/api/ActionIdentifiers.java
index cadfe1b..2b54a2c 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/api/ActionIdentifiers.java
+++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/api/ActionIdentifiers.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.model.data.api;\r
+package org.onap.ccsdk.features.model.data.api;\r
 \r
 import com.fasterxml.jackson.annotation.JsonProperty;\r
 \r

diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/api/CommonHeader.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/api/CommonHeader.java
similarity index 93%
rename from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/api/CommonHeader.java
rename to blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/api/CommonHeader.java
index d816307..4a4011e 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/api/CommonHeader.java
+++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/api/CommonHeader.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.model.data.api;\r
+package org.onap.ccsdk.features.model.data.api;\r
 \r
 import com.fasterxml.jackson.annotation.JsonProperty;\r
 \r

diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/api/Flags.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/api/Flags.java
similarity index 91%
rename from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/api/Flags.java
rename to blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/api/Flags.java
index 81adc74..b1f2a93 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/api/Flags.java
+++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/api/Flags.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.model.data.api;\r
+package org.onap.ccsdk.features.model.data.api;\r
 \r
 public class Flags {\r
     private boolean force;\r

diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/api/Status.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/api/Status.java
similarity index 93%
rename from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/api/Status.java
rename to blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/api/Status.java
index 7c678e9..2cdd839 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/api/Status.java
+++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/api/Status.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.model.data.api;\r
+package org.onap.ccsdk.features.model.data.api;\r
 \r
 import com.fasterxml.jackson.annotation.JsonProperty;\r
 \r

diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/api/TransactionRequest.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/api/TransactionRequest.java
similarity index 93%
rename from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/api/TransactionRequest.java
rename to blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/api/TransactionRequest.java
index ebfa97f..56148ee 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/api/TransactionRequest.java
+++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/api/TransactionRequest.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.model.data.api;\r
+package org.onap.ccsdk.features.model.data.api;\r
 \r
 import com.fasterxml.jackson.annotation.JsonProperty;\r
 \r

diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/api/TransactionResponse.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/api/TransactionResponse.java
similarity index 93%
rename from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/api/TransactionResponse.java
rename to blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/api/TransactionResponse.java
index 6a7b2e3..cc935e8 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/api/TransactionResponse.java
+++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/api/TransactionResponse.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.model.data.api;\r
+package org.onap.ccsdk.features.model.data.api;\r
 \r
 import java.util.List;\r
 import com.fasterxml.jackson.annotation.JsonProperty;\r

diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/dict/ResourceDefinition.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/dict/ResourceDefinition.java
similarity index 92%
rename from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/dict/ResourceDefinition.java
rename to blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/dict/ResourceDefinition.java
index e374aeb..3b115b7 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/dict/ResourceDefinition.java
+++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/dict/ResourceDefinition.java
@@ -15,10 +15,12 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.model.data.dict;\r
+package org.onap.ccsdk.features.model.data.dict;\r
 \r
 import java.util.Map;\r
-import org.onap.ccsdk.config.model.data.PropertyDefinition;\r
+\r
+import org.onap.ccsdk.features.model.data.PropertyDefinition;\r
+\r
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;\r
 import com.fasterxml.jackson.annotation.JsonProperty;\r
 \r

diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/dict/SourcesDefinition.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/dict/SourcesDefinition.java
similarity index 92%
rename from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/dict/SourcesDefinition.java
rename to blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/dict/SourcesDefinition.java
index 6b9fc0a..8ba4471 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/dict/SourcesDefinition.java
+++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/dict/SourcesDefinition.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.model.data.dict;\r
+package org.onap.ccsdk.features.model.data.dict;\r
 \r
 import com.fasterxml.jackson.annotation.JsonProperty;\r
 \r

diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/dict/SourcesProperties.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/dict/SourcesProperties.java
similarity index 94%
rename from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/dict/SourcesProperties.java
rename to blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/dict/SourcesProperties.java
index 5be1647..2a57617 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/dict/SourcesProperties.java
+++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/dict/SourcesProperties.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.model.data.dict;\r
+package org.onap.ccsdk.features.model.data.dict;\r
 \r
 import java.util.List;\r
 import java.util.Map;\r

diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/domain/ConfigModel.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/domain/ConfigModel.java
similarity index 95%
rename from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/domain/ConfigModel.java
rename to blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/domain/ConfigModel.java
index 9821fd0..97862b8 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/domain/ConfigModel.java
+++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/domain/ConfigModel.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.model.domain;\r
+package org.onap.ccsdk.features.model.domain;\r
 \r
 import java.io.Serializable;\r
 import java.util.Date;\r

diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/domain/ConfigModelContent.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/domain/ConfigModelContent.java
similarity index 94%
rename from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/domain/ConfigModelContent.java
rename to blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/domain/ConfigModelContent.java
index d1ef5fe..b820b12 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/domain/ConfigModelContent.java
+++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/domain/ConfigModelContent.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.model.domain;\r
+package org.onap.ccsdk.features.model.domain;\r
 \r
 import java.util.Date;\r
 import com.fasterxml.jackson.annotation.JsonFormat;\r

diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/domain/ResourceDictionary.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/domain/ResourceDictionary.java
similarity index 95%
rename from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/domain/ResourceDictionary.java
rename to blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/domain/ResourceDictionary.java
index 163566c..c62bf69 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/domain/ResourceDictionary.java
+++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/domain/ResourceDictionary.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.model.domain;\r
+package org.onap.ccsdk.features.model.domain;\r
 \r
 import java.io.Serializable;\r
 import java.util.Date;\r

diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/service/ComponentNode.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/service/ComponentNode.java
similarity index 94%
rename from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/service/ComponentNode.java
rename to blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/service/ComponentNode.java
index fd8e79c..92ccee2 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/service/ComponentNode.java
+++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/service/ComponentNode.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.model.service;\r
+package org.onap.ccsdk.features.model.service;\r
 \r
 import java.util.Map;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;\r

diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/service/ComponentNodeDelegate.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/service/ComponentNodeDelegate.java
similarity index 94%
rename from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/service/ComponentNodeDelegate.java
rename to blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/service/ComponentNodeDelegate.java
index e2d332c..4b9743f 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/service/ComponentNodeDelegate.java
+++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/service/ComponentNodeDelegate.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.model.service;\r
+package org.onap.ccsdk.features.model.service;\r
 \r
 import java.util.Map;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;\r

diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/service/ComponentNodeService.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/service/ComponentNodeService.java
similarity index 93%
rename from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/service/ComponentNodeService.java
rename to blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/service/ComponentNodeService.java
index 6c95451..12efc65 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/service/ComponentNodeService.java
+++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/service/ComponentNodeService.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.model.service;\r
+package org.onap.ccsdk.features.model.service;\r
 \r
 import java.util.Map;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;\r

diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/service/ComponentNodeServiceImpl.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/service/ComponentNodeServiceImpl.java
similarity index 91%
rename from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/service/ComponentNodeServiceImpl.java
rename to blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/service/ComponentNodeServiceImpl.java
index a2f1e7a..df0dae1 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/service/ComponentNodeServiceImpl.java
+++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/service/ComponentNodeServiceImpl.java
@@ -15,19 +15,19 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.model.service;\r
+package org.onap.ccsdk.features.model.service;\r
 \r
 import java.util.HashMap;\r
 import java.util.Map;\r
 import org.apache.commons.lang3.StringUtils;\r
-import org.onap.ccsdk.config.data.adaptor.DataAdaptorConstants;\r
-import org.onap.ccsdk.config.data.adaptor.domain.TransactionLog;\r
-import org.onap.ccsdk.config.data.adaptor.service.ConfigResourceService;\r
-import org.onap.ccsdk.config.model.ConfigModelConstant;\r
-import org.onap.ccsdk.config.model.data.InterfaceAssignment;\r
-import org.onap.ccsdk.config.model.data.NodeTemplate;\r
-import org.onap.ccsdk.config.model.utils.TransformationUtils;\r
-import org.onap.ccsdk.config.rest.adaptor.service.ConfigRestAdaptorService;\r
+import org.onap.ccsdk.features.data.adaptor.DataAdaptorConstants;\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.model.ConfigModelConstant;\r
+import org.onap.ccsdk.features.model.data.InterfaceAssignment;\r
+import org.onap.ccsdk.features.model.data.NodeTemplate;\r
+import org.onap.ccsdk.features.model.utils.TransformationUtils;\r
+import org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorService;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;\r
 import org.osgi.framework.BundleContext;\r

diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/service/ConfigBlueprintService.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/service/ConfigBlueprintService.java
similarity index 87%
rename from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/service/ConfigBlueprintService.java
rename to blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/service/ConfigBlueprintService.java
index 49c64ab..3b30d3b 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/service/ConfigBlueprintService.java
+++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/service/ConfigBlueprintService.java
@@ -15,18 +15,18 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.model.service;\r
+package org.onap.ccsdk.features.model.service;\r
 \r
 import java.util.List;\r
 import java.util.Map;\r
 import org.apache.commons.lang3.StringUtils;\r
-import org.onap.ccsdk.config.model.ConfigModelConstant;\r
-import org.onap.ccsdk.config.model.domain.ConfigModel;\r
-import org.onap.ccsdk.config.model.domain.ConfigModelContent;\r
-import org.onap.ccsdk.config.model.utils.PrepareContextUtils;\r
-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorConstants;\r
-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorException;\r
-import org.onap.ccsdk.config.rest.adaptor.service.ConfigRestAdaptorService;\r
+import org.onap.ccsdk.features.model.ConfigModelConstant;\r
+import org.onap.ccsdk.features.model.domain.ConfigModel;\r
+import org.onap.ccsdk.features.model.domain.ConfigModelContent;\r
+import org.onap.ccsdk.features.model.utils.PrepareContextUtils;\r
+import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorConstants;\r
+import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorException;\r
+import org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorService;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;\r
 import com.att.eelf.configuration.EELFLogger;\r
 import com.att.eelf.configuration.EELFManager;\r

diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/service/ConfigModelNode.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/service/ConfigModelNode.java
similarity index 91%
rename from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/service/ConfigModelNode.java
rename to blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/service/ConfigModelNode.java
index 3347424..cb652bd 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/service/ConfigModelNode.java
+++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/service/ConfigModelNode.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.model.service;\r
+package org.onap.ccsdk.features.model.service;\r
 \r
 import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin;\r
 \r

diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/service/ConfigModelService.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/service/ConfigModelService.java
similarity index 93%
rename from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/service/ConfigModelService.java
rename to blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/service/ConfigModelService.java
index 0c112ba..b0df3e6 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/service/ConfigModelService.java
+++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/service/ConfigModelService.java
@@ -15,11 +15,12 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.model.service;\r
+package org.onap.ccsdk.features.model.service;\r
 \r
 import java.util.List;\r
 import java.util.Map;\r
-import org.onap.ccsdk.config.model.data.ServiceTemplate;\r
+\r
+import org.onap.ccsdk.features.model.data.ServiceTemplate;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;\r
 \r

diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/service/ConfigModelServiceImpl.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/service/ConfigModelServiceImpl.java
similarity index 91%
rename from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/service/ConfigModelServiceImpl.java
rename to blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/service/ConfigModelServiceImpl.java
index a3014b6..231f76a 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/service/ConfigModelServiceImpl.java
+++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/service/ConfigModelServiceImpl.java
@@ -15,23 +15,23 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.model.service;\r
+package org.onap.ccsdk.features.model.service;\r
 \r
 import java.util.List;\r
 import java.util.Map;\r
 import org.apache.commons.lang3.StringUtils;\r
-import org.onap.ccsdk.config.model.ConfigModelConstant;\r
-import org.onap.ccsdk.config.model.ConfigModelException;\r
-import org.onap.ccsdk.config.model.data.CapabilityAssignment;\r
-import org.onap.ccsdk.config.model.data.NodeTemplate;\r
-import org.onap.ccsdk.config.model.data.NodeType;\r
-import org.onap.ccsdk.config.model.data.ServiceTemplate;\r
-import org.onap.ccsdk.config.model.utils.NodePropertyUtils;\r
-import org.onap.ccsdk.config.model.utils.PrepareContextUtils;\r
-import org.onap.ccsdk.config.model.utils.ServiceTemplateUtils;\r
-import org.onap.ccsdk.config.model.utils.TransformationUtils;\r
-import org.onap.ccsdk.config.model.validator.ServiceTemplateValidator;\r
-import org.onap.ccsdk.config.rest.adaptor.service.ConfigRestAdaptorService;\r
+import org.onap.ccsdk.features.model.ConfigModelConstant;\r
+import org.onap.ccsdk.features.model.ConfigModelException;\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.data.NodeType;\r
+import org.onap.ccsdk.features.model.data.ServiceTemplate;\r
+import org.onap.ccsdk.features.model.utils.NodePropertyUtils;\r
+import org.onap.ccsdk.features.model.utils.PrepareContextUtils;\r
+import org.onap.ccsdk.features.model.utils.ServiceTemplateUtils;\r
+import org.onap.ccsdk.features.model.utils.TransformationUtils;\r
+import org.onap.ccsdk.features.model.validator.ServiceTemplateValidator;\r
+import org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorService;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;\r
 import com.att.eelf.configuration.EELFLogger;\r

diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/utils/ExpressionUtils.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/ExpressionUtils.java
similarity index 95%
rename from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/utils/ExpressionUtils.java
rename to blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/ExpressionUtils.java
index 06b4c30..cdc8fc3 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/utils/ExpressionUtils.java
+++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/ExpressionUtils.java
@@ -15,15 +15,15 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.model.utils;\r
+package org.onap.ccsdk.features.model.utils;\r
 \r
 import java.io.IOException;\r
 import java.util.HashMap;\r
 import java.util.Iterator;\r
 import java.util.Map;\r
 import org.apache.commons.lang3.StringUtils;\r
-import org.onap.ccsdk.config.model.ConfigModelConstant;\r
-import org.onap.ccsdk.config.model.data.PropertyDefinition;\r
+import org.onap.ccsdk.features.model.ConfigModelConstant;\r
+import org.onap.ccsdk.features.model.data.PropertyDefinition;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;\r
 import com.att.eelf.configuration.EELFLogger;\r
 import com.att.eelf.configuration.EELFManager;\r

diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/utils/JsonParserUtils.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/JsonParserUtils.java
similarity index 95%
rename from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/utils/JsonParserUtils.java
rename to blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/JsonParserUtils.java
index 3555ee7..d9cc350 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/utils/JsonParserUtils.java
+++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/JsonParserUtils.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.model.utils;\r
+package org.onap.ccsdk.features.model.utils;\r
 \r
 import static com.jayway.jsonpath.JsonPath.using;\r
 import java.util.List;\r

diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/utils/JsonUtils.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/JsonUtils.java
similarity index 95%
rename from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/utils/JsonUtils.java
rename to blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/JsonUtils.java
index 5bc6632..11f4de3 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/utils/JsonUtils.java
+++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/JsonUtils.java
@@ -15,9 +15,10 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.model.utils;\r
+package org.onap.ccsdk.features.model.utils;\r
+\r
+import org.onap.ccsdk.features.model.ValidTypes;\r
 \r
-import org.onap.ccsdk.config.model.ValidTypes;\r
 import com.fasterxml.jackson.databind.JsonNode;\r
 import com.fasterxml.jackson.databind.node.ArrayNode;\r
 import com.fasterxml.jackson.databind.node.NullNode;\r

diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/utils/NodePropertyUtils.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/NodePropertyUtils.java
similarity index 91%
rename from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/utils/NodePropertyUtils.java
rename to blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/NodePropertyUtils.java
index 59da39b..0feb8b5 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/utils/NodePropertyUtils.java
+++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/NodePropertyUtils.java
@@ -15,22 +15,22 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.model.utils;\r
+package org.onap.ccsdk.features.model.utils;\r
 \r
 import java.io.IOException;\r
 import java.util.HashMap;\r
 import java.util.Map;\r
 import org.apache.commons.lang3.StringUtils;\r
-import org.onap.ccsdk.config.model.ConfigModelConstant;\r
-import org.onap.ccsdk.config.model.data.CapabilityAssignment;\r
-import org.onap.ccsdk.config.model.data.CapabilityDefinition;\r
-import org.onap.ccsdk.config.model.data.InterfaceAssignment;\r
-import org.onap.ccsdk.config.model.data.InterfaceDefinition;\r
-import org.onap.ccsdk.config.model.data.NodeTemplate;\r
-import org.onap.ccsdk.config.model.data.NodeType;\r
-import org.onap.ccsdk.config.model.data.OperationAssignment;\r
-import org.onap.ccsdk.config.model.data.OperationDefinition;\r
-import org.onap.ccsdk.config.model.data.PropertyDefinition;\r
+import org.onap.ccsdk.features.model.ConfigModelConstant;\r
+import org.onap.ccsdk.features.model.data.CapabilityAssignment;\r
+import org.onap.ccsdk.features.model.data.CapabilityDefinition;\r
+import org.onap.ccsdk.features.model.data.InterfaceAssignment;\r
+import org.onap.ccsdk.features.model.data.InterfaceDefinition;\r
+import org.onap.ccsdk.features.model.data.NodeTemplate;\r
+import org.onap.ccsdk.features.model.data.NodeType;\r
+import org.onap.ccsdk.features.model.data.OperationAssignment;\r
+import org.onap.ccsdk.features.model.data.OperationDefinition;\r
+import org.onap.ccsdk.features.model.data.PropertyDefinition;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;\r
 import com.att.eelf.configuration.EELFLogger;\r
 import com.att.eelf.configuration.EELFManager;\r

diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/utils/PrepareContextUtils.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/PrepareContextUtils.java
similarity index 93%
rename from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/utils/PrepareContextUtils.java
rename to blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/PrepareContextUtils.java
index ed215d2..6678a12 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/utils/PrepareContextUtils.java
+++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/PrepareContextUtils.java
@@ -15,12 +15,13 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.model.utils;\r
+package org.onap.ccsdk.features.model.utils;\r
 \r
 import java.util.HashMap;\r
 import java.util.Map;\r
 import org.apache.commons.lang3.StringUtils;\r
-import org.onap.ccsdk.config.model.ConfigModelConstant;\r
+import org.onap.ccsdk.features.model.ConfigModelConstant;\r
+\r
 import com.att.eelf.configuration.EELFLogger;\r
 import com.att.eelf.configuration.EELFManager;\r
 \r

diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/utils/ResourceAssignmentUtils.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/ResourceAssignmentUtils.java
similarity index 95%
rename from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/utils/ResourceAssignmentUtils.java
rename to blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/ResourceAssignmentUtils.java
index 3cdf95c..371acdd 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/utils/ResourceAssignmentUtils.java
+++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/ResourceAssignmentUtils.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.model.utils;\r
+package org.onap.ccsdk.features.model.utils;\r
 \r
 import java.util.Date;\r
 import java.util.HashSet;\r
@@ -24,11 +24,12 @@ import java.util.Map;
 import java.util.Set;\r
 import org.apache.commons.lang3.BooleanUtils;\r
 import org.apache.commons.lang3.StringUtils;\r
-import org.onap.ccsdk.config.model.ConfigModelConstant;\r
-import org.onap.ccsdk.config.model.ConfigModelException;\r
-import org.onap.ccsdk.config.model.ValidTypes;\r
-import org.onap.ccsdk.config.model.data.ResourceAssignment;\r
-import org.onap.ccsdk.config.model.data.dict.ResourceDefinition;\r
+import org.onap.ccsdk.features.model.ConfigModelConstant;\r
+import org.onap.ccsdk.features.model.ConfigModelException;\r
+import org.onap.ccsdk.features.model.ValidTypes;\r
+import org.onap.ccsdk.features.model.data.ResourceAssignment;\r
+import org.onap.ccsdk.features.model.data.dict.ResourceDefinition;\r
+\r
 import com.att.eelf.configuration.EELFLogger;\r
 import com.att.eelf.configuration.EELFManager;\r
 import com.fasterxml.jackson.databind.JsonNode;\r

diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/utils/ResourceDictionaryUtils.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/ResourceDictionaryUtils.java
similarity index 91%
rename from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/utils/ResourceDictionaryUtils.java
rename to blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/ResourceDictionaryUtils.java
index fccf865..c73f67c 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/utils/ResourceDictionaryUtils.java
+++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/ResourceDictionaryUtils.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.model.utils;\r
+package org.onap.ccsdk.features.model.utils;\r
 \r
 import java.util.Map;\r
 import java.util.Optional;\r
@@ -23,11 +23,12 @@ import java.util.function.Supplier;
 import org.apache.commons.collections.CollectionUtils;\r
 import org.apache.commons.collections.MapUtils;\r
 import org.apache.commons.lang3.StringUtils;\r
-import org.onap.ccsdk.config.model.ConfigModelConstant;\r
-import org.onap.ccsdk.config.model.data.PropertyDefinition;\r
-import org.onap.ccsdk.config.model.data.ResourceAssignment;\r
-import org.onap.ccsdk.config.model.data.dict.ResourceDefinition;\r
-import org.onap.ccsdk.config.model.data.dict.SourcesDefinition;\r
+import org.onap.ccsdk.features.model.ConfigModelConstant;\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
+import org.onap.ccsdk.features.model.data.dict.SourcesDefinition;\r
+\r
 import com.att.eelf.configuration.EELFLogger;\r
 import com.att.eelf.configuration.EELFManager;\r
 \r

diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/utils/ServiceTemplateUtils.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/ServiceTemplateUtils.java
similarity index 94%
rename from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/utils/ServiceTemplateUtils.java
rename to blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/ServiceTemplateUtils.java
index c60d624..c637198 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/utils/ServiceTemplateUtils.java
+++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/ServiceTemplateUtils.java
@@ -15,20 +15,20 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.model.utils;\r
+package org.onap.ccsdk.features.model.utils;\r
 \r
 import java.util.Map;\r
 import org.apache.commons.collections.MapUtils;\r
 import org.apache.commons.lang3.StringUtils;\r
-import org.onap.ccsdk.config.model.ConfigModelConstant;\r
-import org.onap.ccsdk.config.model.data.InterfaceAssignment;\r
-import org.onap.ccsdk.config.model.data.InterfaceDefinition;\r
-import org.onap.ccsdk.config.model.data.NodeTemplate;\r
-import org.onap.ccsdk.config.model.data.NodeType;\r
-import org.onap.ccsdk.config.model.data.OperationAssignment;\r
-import org.onap.ccsdk.config.model.data.OperationDefinition;\r
-import org.onap.ccsdk.config.model.data.ServiceTemplate;\r
-import org.onap.ccsdk.config.model.data.TopologyTemplate;\r
+import org.onap.ccsdk.features.model.ConfigModelConstant;\r
+import org.onap.ccsdk.features.model.data.InterfaceAssignment;\r
+import org.onap.ccsdk.features.model.data.InterfaceDefinition;\r
+import org.onap.ccsdk.features.model.data.NodeTemplate;\r
+import org.onap.ccsdk.features.model.data.NodeType;\r
+import org.onap.ccsdk.features.model.data.OperationAssignment;\r
+import org.onap.ccsdk.features.model.data.OperationDefinition;\r
+import org.onap.ccsdk.features.model.data.ServiceTemplate;\r
+import org.onap.ccsdk.features.model.data.TopologyTemplate;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;\r
 import com.att.eelf.configuration.EELFLogger;\r
 import com.att.eelf.configuration.EELFManager;\r

diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/utils/TopologicalSortingUtils.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/TopologicalSortingUtils.java
similarity index 96%
rename from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/utils/TopologicalSortingUtils.java
rename to blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/TopologicalSortingUtils.java
index 8aa4a45..4f16a0c 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/utils/TopologicalSortingUtils.java
+++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/TopologicalSortingUtils.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.model.utils;\r
+package org.onap.ccsdk.features.model.utils;\r
 \r
 import java.util.ArrayList;\r
 import java.util.HashMap;\r

diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/utils/TransformationUtils.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/TransformationUtils.java
similarity index 96%
rename from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/utils/TransformationUtils.java
rename to blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/TransformationUtils.java
index 311be9d..138745c 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/utils/TransformationUtils.java
+++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/TransformationUtils.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.model.utils;\r
+package org.onap.ccsdk.features.model.utils;\r
 \r
 import java.io.IOException;\r
 import java.util.ArrayList;\r

diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/validator/DataTypeValidator.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/validator/DataTypeValidator.java
similarity index 89%
rename from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/validator/DataTypeValidator.java
rename to blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/validator/DataTypeValidator.java
index c603040..32d546e 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/validator/DataTypeValidator.java
+++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/validator/DataTypeValidator.java
@@ -15,16 +15,16 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.model.validator;\r
+package org.onap.ccsdk.features.model.validator;\r
 \r
 import java.util.HashMap;\r
 import java.util.Map;\r
 import org.apache.commons.lang3.StringUtils;\r
-import org.onap.ccsdk.config.model.ConfigModelException;\r
-import org.onap.ccsdk.config.model.ValidTypes;\r
-import org.onap.ccsdk.config.model.data.DataType;\r
-import org.onap.ccsdk.config.model.data.PropertyDefinition;\r
-import org.onap.ccsdk.config.model.data.ServiceTemplate;\r
+import org.onap.ccsdk.features.model.ConfigModelException;\r
+import org.onap.ccsdk.features.model.ValidTypes;\r
+import org.onap.ccsdk.features.model.data.DataType;\r
+import org.onap.ccsdk.features.model.data.PropertyDefinition;\r
+import org.onap.ccsdk.features.model.data.ServiceTemplate;\r
 \r
 /**\r
  * DataTypeValidator.java Purpose: Provide Configuration Generator DataTypeValidator\r

diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/validator/NodeTypeValidator.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/validator/NodeTypeValidator.java
similarity index 90%
rename from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/validator/NodeTypeValidator.java
rename to blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/validator/NodeTypeValidator.java
index f46d648..4c71976 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/validator/NodeTypeValidator.java
+++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/validator/NodeTypeValidator.java
@@ -15,22 +15,23 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.model.validator;\r
+package org.onap.ccsdk.features.model.validator;\r
 \r
 import java.util.HashMap;\r
 import java.util.Map;\r
 import org.apache.commons.lang3.StringUtils;\r
-import org.onap.ccsdk.config.model.ConfigModelConstant;\r
-import org.onap.ccsdk.config.model.ConfigModelException;\r
-import org.onap.ccsdk.config.model.ValidTypes;\r
-import org.onap.ccsdk.config.model.data.CapabilityDefinition;\r
-import org.onap.ccsdk.config.model.data.DataType;\r
-import org.onap.ccsdk.config.model.data.InterfaceDefinition;\r
-import org.onap.ccsdk.config.model.data.NodeType;\r
-import org.onap.ccsdk.config.model.data.OperationDefinition;\r
-import org.onap.ccsdk.config.model.data.PropertyDefinition;\r
-import org.onap.ccsdk.config.model.data.RequirementDefinition;\r
-import org.onap.ccsdk.config.model.data.ServiceTemplate;\r
+import org.onap.ccsdk.features.model.ConfigModelConstant;\r
+import org.onap.ccsdk.features.model.ConfigModelException;\r
+import org.onap.ccsdk.features.model.ValidTypes;\r
+import org.onap.ccsdk.features.model.data.CapabilityDefinition;\r
+import org.onap.ccsdk.features.model.data.DataType;\r
+import org.onap.ccsdk.features.model.data.InterfaceDefinition;\r
+import org.onap.ccsdk.features.model.data.NodeType;\r
+import org.onap.ccsdk.features.model.data.OperationDefinition;\r
+import org.onap.ccsdk.features.model.data.PropertyDefinition;\r
+import org.onap.ccsdk.features.model.data.RequirementDefinition;\r
+import org.onap.ccsdk.features.model.data.ServiceTemplate;\r
+\r
 import com.att.eelf.configuration.EELFLogger;\r
 import com.att.eelf.configuration.EELFManager;\r
 \r

diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/validator/PropertyDefinitionValidator.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/validator/PropertyDefinitionValidator.java
similarity index 90%
rename from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/validator/PropertyDefinitionValidator.java
rename to blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/validator/PropertyDefinitionValidator.java
index dc86383..080fee2 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/validator/PropertyDefinitionValidator.java
+++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/validator/PropertyDefinitionValidator.java
@@ -15,14 +15,14 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.model.validator;\r
+package org.onap.ccsdk.features.model.validator;\r
 \r
 import java.util.Map;\r
 import org.apache.commons.lang3.StringUtils;\r
-import org.onap.ccsdk.config.model.ConfigModelException;\r
-import org.onap.ccsdk.config.model.ValidTypes;\r
-import org.onap.ccsdk.config.model.data.DataType;\r
-import org.onap.ccsdk.config.model.data.PropertyDefinition;\r
+import org.onap.ccsdk.features.model.ConfigModelException;\r
+import org.onap.ccsdk.features.model.ValidTypes;\r
+import org.onap.ccsdk.features.model.data.DataType;\r
+import org.onap.ccsdk.features.model.data.PropertyDefinition;\r
 \r
 /**\r
  * PropertyDefinitionValidator.java Purpose: Provide Configuration Generator\r

diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/validator/ResourceAssignmentValidator.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/validator/ResourceAssignmentValidator.java
similarity index 91%
rename from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/validator/ResourceAssignmentValidator.java
rename to blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/validator/ResourceAssignmentValidator.java
index cd486cf..83e9f6e 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/validator/ResourceAssignmentValidator.java
+++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/validator/ResourceAssignmentValidator.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.model.validator;\r
+package org.onap.ccsdk.features.model.validator;\r
 \r
 import java.util.HashMap;\r
 import java.util.HashSet;\r
@@ -23,13 +23,14 @@ import java.util.List;
 import java.util.Map;\r
 import java.util.Set;\r
 import org.apache.commons.lang3.StringUtils;\r
-import org.onap.ccsdk.config.model.ConfigModelConstant;\r
-import org.onap.ccsdk.config.model.ConfigModelException;\r
-import org.onap.ccsdk.config.model.data.CapabilityAssignment;\r
-import org.onap.ccsdk.config.model.data.NodeTemplate;\r
-import org.onap.ccsdk.config.model.data.ResourceAssignment;\r
-import org.onap.ccsdk.config.model.utils.TopologicalSortingUtils;\r
-import org.onap.ccsdk.config.model.utils.TransformationUtils;\r
+import org.onap.ccsdk.features.model.ConfigModelConstant;\r
+import org.onap.ccsdk.features.model.ConfigModelException;\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.data.ResourceAssignment;\r
+import org.onap.ccsdk.features.model.utils.TopologicalSortingUtils;\r
+import org.onap.ccsdk.features.model.utils.TransformationUtils;\r
+\r
 import com.att.eelf.configuration.EELFLogger;\r
 import com.att.eelf.configuration.EELFManager;\r
 \r

diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/validator/ServiceTemplateValidator.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/validator/ServiceTemplateValidator.java
similarity index 91%
rename from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/validator/ServiceTemplateValidator.java
rename to blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/validator/ServiceTemplateValidator.java
index c329c7f..8392791 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/validator/ServiceTemplateValidator.java
+++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/validator/ServiceTemplateValidator.java
@@ -15,15 +15,16 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.model.validator;\r
+package org.onap.ccsdk.features.model.validator;\r
 \r
 import java.util.HashMap;\r
 import java.util.Map;\r
 import org.apache.commons.lang3.StringUtils;\r
-import org.onap.ccsdk.config.model.ConfigModelConstant;\r
-import org.onap.ccsdk.config.model.ConfigModelException;\r
-import org.onap.ccsdk.config.model.data.ServiceTemplate;\r
-import org.onap.ccsdk.config.model.utils.TransformationUtils;\r
+import org.onap.ccsdk.features.model.ConfigModelConstant;\r
+import org.onap.ccsdk.features.model.ConfigModelException;\r
+import org.onap.ccsdk.features.model.data.ServiceTemplate;\r
+import org.onap.ccsdk.features.model.utils.TransformationUtils;\r
+\r
 import com.att.eelf.configuration.EELFLogger;\r
 import com.att.eelf.configuration.EELFManager;\r
 \r

diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/validator/TopologyTemplateValidator.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/validator/TopologyTemplateValidator.java
similarity index 91%
rename from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/validator/TopologyTemplateValidator.java
rename to blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/validator/TopologyTemplateValidator.java
index dc1e314..0f1258a 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/validator/TopologyTemplateValidator.java
+++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/validator/TopologyTemplateValidator.java
@@ -15,20 +15,21 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.model.validator;\r
+package org.onap.ccsdk.features.model.validator;\r
 \r
 import java.util.HashMap;\r
 import java.util.Map;\r
 import org.apache.commons.lang3.StringUtils;\r
-import org.onap.ccsdk.config.model.ConfigModelConstant;\r
-import org.onap.ccsdk.config.model.ConfigModelException;\r
-import org.onap.ccsdk.config.model.data.DataType;\r
-import org.onap.ccsdk.config.model.data.NodeTemplate;\r
-import org.onap.ccsdk.config.model.data.NodeType;\r
-import org.onap.ccsdk.config.model.data.PropertyDefinition;\r
-import org.onap.ccsdk.config.model.data.RequirementAssignment;\r
-import org.onap.ccsdk.config.model.data.ServiceTemplate;\r
-import org.onap.ccsdk.config.model.data.TopologyTemplate;\r
+import org.onap.ccsdk.features.model.ConfigModelConstant;\r
+import org.onap.ccsdk.features.model.ConfigModelException;\r
+import org.onap.ccsdk.features.model.data.DataType;\r
+import org.onap.ccsdk.features.model.data.NodeTemplate;\r
+import org.onap.ccsdk.features.model.data.NodeType;\r
+import org.onap.ccsdk.features.model.data.PropertyDefinition;\r
+import org.onap.ccsdk.features.model.data.RequirementAssignment;\r
+import org.onap.ccsdk.features.model.data.ServiceTemplate;\r
+import org.onap.ccsdk.features.model.data.TopologyTemplate;\r
+\r
 import com.att.eelf.configuration.EELFLogger;\r
 import com.att.eelf.configuration.EELFManager;\r
 \r

diff --git a/blueprints-processor/plugin/model-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml b/blueprints-processor/plugin/model-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
index 2bfab86..5a07f94 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
+++ b/blueprints-processor/plugin/model-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
@@ -23,46 +23,46 @@
        <!-- Dependency -->\r
 \r
        <reference id="configResourceService"\r
-               interface="org.onap.ccsdk.config.data.adaptor.service.ConfigResourceService" />\r
+               interface="org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService" />\r
 \r
        <reference id="configRestAdaptorService"\r
-               interface="org.onap.ccsdk.config.rest.adaptor.service.ConfigRestAdaptorService" />\r
+               interface="org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorService" />\r
 \r
        <!-- Expose the Common Component Bean -->\r
        <bean id="configModelNode"\r
-               class="org.onap.ccsdk.config.model.service.ConfigModelNode">\r
+               class="org.onap.ccsdk.features.model.service.ConfigModelNode">\r
        </bean>\r
 \r
        <service ref="configModelNode"\r
-               interface="org.onap.ccsdk.config.model.service.ConfigModelNode" />\r
+               interface="org.onap.ccsdk.features.model.service.ConfigModelNode" />\r
 \r
        <bean id="configModelService"\r
-               class="org.onap.ccsdk.config.model.service.ConfigModelServiceImpl">\r
+               class="org.onap.ccsdk.features.model.service.ConfigModelServiceImpl">\r
                <argument ref="configRestAdaptorService" />\r
        </bean>\r
 \r
        <service ref="configModelService"\r
-               interface="org.onap.ccsdk.config.model.service.ConfigModelService" />\r
+               interface="org.onap.ccsdk.features.model.service.ConfigModelService" />\r
 \r
 \r
        <!-- ComponentNode -->\r
 \r
        <bean id="componentNodeService"\r
-               class="org.onap.ccsdk.config.model.service.ComponentNodeServiceImpl">\r
+               class="org.onap.ccsdk.features.model.service.ComponentNodeServiceImpl">\r
                <argument ref="blueprintBundleContext" />\r
                <argument ref="configResourceService" />\r
                <argument ref="configRestAdaptorService" />\r
        </bean>\r
 \r
        <service ref="componentNodeService"\r
-               interface="org.onap.ccsdk.config.model.service.ComponentNodeService" />\r
+               interface="org.onap.ccsdk.features.model.service.ComponentNodeService" />\r
 \r
        <bean id="componentNodeDelegate"\r
-               class="org.onap.ccsdk.config.model.service.ComponentNodeDelegate">\r
+               class="org.onap.ccsdk.features.model.service.ComponentNodeDelegate">\r
                <argument ref="componentNodeService" />\r
        </bean>\r
 \r
        <service ref="componentNodeDelegate"\r
-               interface="org.onap.ccsdk.config.model.service.ComponentNodeDelegate" />\r
+               interface="org.onap.ccsdk.features.model.service.ComponentNodeDelegate" />\r
 \r
 </blueprint>\r

diff --git a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/model/ResourceDictionaryUtilsTest.java b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/ResourceDictionaryUtilsTest.java
similarity index 93%
rename from blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/model/ResourceDictionaryUtilsTest.java
rename to blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/ResourceDictionaryUtilsTest.java
index 1b3dc9c..a84f52f 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/model/ResourceDictionaryUtilsTest.java
+++ b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/ResourceDictionaryUtilsTest.java
@@ -15,18 +15,20 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.model;\r
+package org.onap.ccsdk.features.model;\r
 \r
 import java.util.Arrays;\r
 import java.util.HashMap;\r
 import org.junit.Assert;\r
 import org.junit.Test;\r
-import org.onap.ccsdk.config.model.data.PropertyDefinition;\r
-import org.onap.ccsdk.config.model.data.ResourceAssignment;\r
-import org.onap.ccsdk.config.model.data.dict.ResourceDefinition;\r
-import org.onap.ccsdk.config.model.data.dict.SourcesDefinition;\r
-import org.onap.ccsdk.config.model.data.dict.SourcesProperties;\r
-import org.onap.ccsdk.config.model.utils.ResourceDictionaryUtils;\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
+import org.onap.ccsdk.features.model.data.dict.SourcesDefinition;\r
+import org.onap.ccsdk.features.model.data.dict.SourcesProperties;\r
+import org.onap.ccsdk.features.model.utils.ResourceDictionaryUtils;\r
+\r
 import com.att.eelf.configuration.EELFLogger;\r
 import com.att.eelf.configuration.EELFManager;\r
 \r

diff --git a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/model/utils/JsonParserUtilsTest.java b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/JsonParserUtilsTest.java
similarity index 91%
rename from blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/model/utils/JsonParserUtilsTest.java
rename to blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/JsonParserUtilsTest.java
index 693c505..98943db 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/model/utils/JsonParserUtilsTest.java
+++ b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/JsonParserUtilsTest.java
@@ -15,10 +15,12 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.model.utils;\r
+package org.onap.ccsdk.features.model.utils;\r
 \r
 import org.junit.Assert;\r
 import org.junit.Test;\r
+import org.onap.ccsdk.features.model.utils.JsonParserUtils;\r
+\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/config/model/utils/JsonUtilsTest.java b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/JsonUtilsTest.java
similarity index 95%
rename from blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/model/utils/JsonUtilsTest.java
rename to blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/JsonUtilsTest.java
index 5dd0fae..d5db170 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/model/utils/JsonUtilsTest.java
+++ b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/JsonUtilsTest.java
@@ -15,11 +15,13 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.model.utils;\r
+package org.onap.ccsdk.features.model.utils;\r
 \r
 import static org.junit.Assert.assertTrue;\r
 import org.junit.Test;\r
-import org.onap.ccsdk.config.model.ValidTypes;\r
+import org.onap.ccsdk.features.model.ValidTypes;\r
+import org.onap.ccsdk.features.model.utils.JsonUtils;\r
+\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/config/model/utils/ResourceAssignmentUtilsTest.java b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/ResourceAssignmentUtilsTest.java
similarity index 93%
rename from blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/model/utils/ResourceAssignmentUtilsTest.java
rename to blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/ResourceAssignmentUtilsTest.java
index 034d70d..53eb624 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/model/utils/ResourceAssignmentUtilsTest.java
+++ b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/ResourceAssignmentUtilsTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.model.utils;\r
+package org.onap.ccsdk.features.model.utils;\r
 \r
 import static org.junit.Assert.assertTrue;\r
 import java.io.File;\r
@@ -24,12 +24,14 @@ import java.util.HashMap;
 import java.util.List;\r
 import java.util.Map;\r
 import org.junit.Test;\r
-import org.onap.ccsdk.config.model.ConfigModelConstant;\r
-import org.onap.ccsdk.config.model.ConfigModelException;\r
-import org.onap.ccsdk.config.model.ValidTypes;\r
-import org.onap.ccsdk.config.model.data.PropertyDefinition;\r
-import org.onap.ccsdk.config.model.data.ResourceAssignment;\r
-import org.onap.ccsdk.config.model.data.dict.ResourceDefinition;\r
+import org.onap.ccsdk.features.model.ConfigModelConstant;\r
+import org.onap.ccsdk.features.model.ConfigModelException;\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
+import org.onap.ccsdk.features.model.utils.ResourceAssignmentUtils;\r
+\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/config/model/utils/ServiceTemplateUtilsTest.java b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/ServiceTemplateUtilsTest.java
similarity index 88%
rename from blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/model/utils/ServiceTemplateUtilsTest.java
rename to blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/ServiceTemplateUtilsTest.java
index 5364ae9..df330b6 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/model/utils/ServiceTemplateUtilsTest.java
+++ b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/ServiceTemplateUtilsTest.java
@@ -15,15 +15,16 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.model.utils;\r
+package org.onap.ccsdk.features.model.utils;\r
 \r
 import java.util.HashMap;\r
 import java.util.Map;\r
 import org.junit.Assert;\r
 import org.junit.Test;\r
-import org.onap.ccsdk.config.model.data.ArtifactDefinition;\r
-import org.onap.ccsdk.config.model.data.CapabilityAssignment;\r
-import org.onap.ccsdk.config.model.data.NodeTemplate;\r
+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/config/model/utils/TransformationUtilsTest.java b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/TransformationUtilsTest.java
similarity index 94%
rename from blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/model/utils/TransformationUtilsTest.java
rename to blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/TransformationUtilsTest.java
index ca57e5f..cfcf246 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/model/utils/TransformationUtilsTest.java
+++ b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/TransformationUtilsTest.java
@@ -15,13 +15,15 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.model.utils;\r
+package org.onap.ccsdk.features.model.utils;\r
 \r
 import static org.junit.Assert.assertNotNull;\r
 import static org.junit.Assert.assertTrue;\r
 import java.util.HashMap;\r
 import java.util.Map;\r
 import org.junit.Test;\r
+import org.onap.ccsdk.features.model.utils.TransformationUtils;\r
+\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/config/model/validator/ServiceTemplateValidationTest.java b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/validator/ServiceTemplateValidationTest.java
similarity index 92%
rename from blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/model/validator/ServiceTemplateValidationTest.java
rename to blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/validator/ServiceTemplateValidationTest.java
index 4c5e6a9..83ac180 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/model/validator/ServiceTemplateValidationTest.java
+++ b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/validator/ServiceTemplateValidationTest.java
@@ -15,11 +15,13 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.model.validator;\r
+package org.onap.ccsdk.features.model.validator;\r
 \r
 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
+\r
 import com.att.eelf.configuration.EELFLogger;\r
 import com.att.eelf.configuration.EELFManager;\r
 \r

diff --git a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/params/service/ComponentNodeTest.java b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/params/service/ComponentNodeTest.java
similarity index 86%
rename from blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/params/service/ComponentNodeTest.java
rename to blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/params/service/ComponentNodeTest.java
index d73a622..9c048f4 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/params/service/ComponentNodeTest.java
+++ b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/params/service/ComponentNodeTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.params.service;\r
+package org.onap.ccsdk.features.params.service;\r
 \r
 import static org.mockito.Matchers.any;\r
 import java.io.File;\r
@@ -36,15 +36,15 @@ 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.config.data.adaptor.domain.TransactionLog;\r
-import org.onap.ccsdk.config.data.adaptor.service.ConfigResourceService;\r
-import org.onap.ccsdk.config.model.ConfigModelConstant;\r
-import org.onap.ccsdk.config.model.service.ComponentNodeDelegate;\r
-import org.onap.ccsdk.config.model.service.ComponentNodeServiceImpl;\r
-import org.onap.ccsdk.config.model.service.ConfigModelService;\r
-import org.onap.ccsdk.config.model.service.ConfigModelServiceImpl;\r
-import org.onap.ccsdk.config.model.utils.TransformationUtils;\r
-import org.onap.ccsdk.config.rest.adaptor.service.ConfigRestAdaptorService;\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.model.ConfigModelConstant;\r
+import org.onap.ccsdk.features.model.service.ComponentNodeDelegate;\r
+import org.onap.ccsdk.features.model.service.ComponentNodeServiceImpl;\r
+import org.onap.ccsdk.features.model.service.ConfigModelService;\r
+import org.onap.ccsdk.features.model.service.ConfigModelServiceImpl;\r
+import org.onap.ccsdk.features.model.utils.TransformationUtils;\r
+import org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorService;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;\r
 import org.osgi.framework.BundleContext;\r

diff --git a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/params/service/ConfigModelServiceTest.java b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/params/service/ConfigModelServiceTest.java
similarity index 92%
rename from blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/params/service/ConfigModelServiceTest.java
rename to blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/params/service/ConfigModelServiceTest.java
index 77972a6..3e62faf 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/params/service/ConfigModelServiceTest.java
+++ b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/params/service/ConfigModelServiceTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.params.service;\r
+package org.onap.ccsdk.features.params.service;\r
 \r
 import static org.junit.Assert.fail;\r
 import java.io.File;\r
@@ -32,13 +32,13 @@ import org.mockito.Matchers;
 import org.mockito.Mock;\r
 import org.mockito.Mockito;\r
 import org.mockito.runners.MockitoJUnitRunner;\r
-import org.onap.ccsdk.config.model.ConfigModelConstant;\r
-import org.onap.ccsdk.config.model.data.ServiceTemplate;\r
-import org.onap.ccsdk.config.model.domain.ConfigModel;\r
-import org.onap.ccsdk.config.model.domain.ConfigModelContent;\r
-import org.onap.ccsdk.config.model.service.ConfigModelService;\r
-import org.onap.ccsdk.config.model.service.ConfigModelServiceImpl;\r
-import org.onap.ccsdk.config.rest.adaptor.service.ConfigRestAdaptorService;\r
+import org.onap.ccsdk.features.model.ConfigModelConstant;\r
+import org.onap.ccsdk.features.model.data.ServiceTemplate;\r
+import org.onap.ccsdk.features.model.domain.ConfigModel;\r
+import org.onap.ccsdk.features.model.domain.ConfigModelContent;\r
+import org.onap.ccsdk.features.model.service.ConfigModelService;\r
+import org.onap.ccsdk.features.model.service.ConfigModelServiceImpl;\r
+import org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorService;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;\r
 import com.att.eelf.configuration.EELFLogger;\r

diff --git a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/params/service/ExpressionUtilsTest.java b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/params/service/ExpressionUtilsTest.java
similarity index 92%
rename from blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/params/service/ExpressionUtilsTest.java
rename to blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/params/service/ExpressionUtilsTest.java
index e72b053..a1e273a 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/params/service/ExpressionUtilsTest.java
+++ b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/params/service/ExpressionUtilsTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.params.service;\r
+package org.onap.ccsdk.features.params.service;\r
 \r
 import java.io.File;\r
 import java.nio.charset.Charset;\r
@@ -25,8 +25,8 @@ import java.util.List;
 import java.util.Map;\r
 import org.apache.commons.io.FileUtils;\r
 import org.junit.Test;\r
-import org.onap.ccsdk.config.model.utils.ExpressionUtils;\r
-import org.onap.ccsdk.config.model.utils.TransformationUtils;\r
+import org.onap.ccsdk.features.model.utils.ExpressionUtils;\r
+import org.onap.ccsdk.features.model.utils.TransformationUtils;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;\r
 import com.att.eelf.configuration.EELFLogger;\r
 import com.att.eelf.configuration.EELFManager;\r

diff --git a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/params/service/MockComponentNode.java b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/params/service/MockComponentNode.java
similarity index 92%
rename from blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/params/service/MockComponentNode.java
rename to blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/params/service/MockComponentNode.java
index 00260c9..35f23bc 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/params/service/MockComponentNode.java
+++ b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/params/service/MockComponentNode.java
@@ -15,10 +15,11 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.params.service;\r
+package org.onap.ccsdk.features.params.service;\r
 \r
 import java.util.Map;\r
-import org.onap.ccsdk.config.model.service.ComponentNode;\r
+\r
+import org.onap.ccsdk.features.model.service.ComponentNode;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;\r
 import com.att.eelf.configuration.EELFLogger;\r

diff --git a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/params/service/ServiceTemplateCreateUtils.java b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/params/service/ServiceTemplateCreateUtils.java
similarity index 92%
rename from blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/params/service/ServiceTemplateCreateUtils.java
rename to blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/params/service/ServiceTemplateCreateUtils.java
index 52f5405..5c89d45 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/params/service/ServiceTemplateCreateUtils.java
+++ b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/params/service/ServiceTemplateCreateUtils.java
@@ -15,7 +15,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.ccsdk.config.params.service;\r
+package org.onap.ccsdk.features.params.service;\r
 \r
 import java.io.File;\r
 import java.io.IOException;\r
@@ -24,14 +24,14 @@ import java.util.HashMap;
 import java.util.Map;\r
 import org.apache.commons.io.FileUtils;\r
 import org.apache.commons.lang3.StringUtils;\r
-import org.onap.ccsdk.config.model.ConfigModelConstant;\r
-import org.onap.ccsdk.config.model.data.DataType;\r
-import org.onap.ccsdk.config.model.data.NodeTemplate;\r
-import org.onap.ccsdk.config.model.data.NodeType;\r
-import org.onap.ccsdk.config.model.data.ServiceTemplate;\r
-import org.onap.ccsdk.config.model.data.TopologyTemplate;\r
-import org.onap.ccsdk.config.model.data.dict.ResourceDefinition;\r
-import org.onap.ccsdk.config.model.utils.TransformationUtils;\r
+import org.onap.ccsdk.features.model.ConfigModelConstant;\r
+import org.onap.ccsdk.features.model.data.DataType;\r
+import org.onap.ccsdk.features.model.data.NodeTemplate;\r
+import org.onap.ccsdk.features.model.data.NodeType;\r
+import org.onap.ccsdk.features.model.data.ServiceTemplate;\r
+import org.onap.ccsdk.features.model.data.TopologyTemplate;\r
+import org.onap.ccsdk.features.model.data.dict.ResourceDefinition;\r
+import org.onap.ccsdk.features.model.utils.TransformationUtils;\r
 \r
 public class ServiceTemplateCreateUtils {\r
 \r

diff --git a/blueprints-processor/plugin/model-provider/src/test/resources/componentnode/default.json b/blueprints-processor/plugin/model-provider/src/test/resources/componentnode/default.json
index 0129195..e538b0c 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/test/resources/componentnode/default.json
+++ b/blueprints-processor/plugin/model-provider/src/test/resources/componentnode/default.json
@@ -41,7 +41,7 @@
                        "generate-configuration": {\r
                                "type": "mock-component-generateConfig",\r
                                "interfaces": {\r
-                                       "org-onap-ccsdk-config-params-service-MockComponentNode": {\r
+                                       "org-onap-ccsdk-features-params-service-MockComponentNode": {\r
                                                "operations": {\r
                                                        "process": {\r
                                                                "inputs": {\r
@@ -63,7 +63,7 @@
        "node_types": {\r
                "mock-component-generateConfig": {\r
                        "interfaces": {\r
-                               "org-onap-ccsdk-config-params-service-MockComponentNode": {\r
+                               "org-onap-ccsdk-features-params-service-MockComponentNode": {\r
                                        "operations": {\r
                                                "process": {\r
                                                        "inputs": {\r

diff --git a/blueprints-processor/plugin/model-provider/src/test/resources/service_templates/default.json b/blueprints-processor/plugin/model-provider/src/test/resources/service_templates/default.json
index d3dd993..e53f0f6 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/test/resources/service_templates/default.json
+++ b/blueprints-processor/plugin/model-provider/src/test/resources/service_templates/default.json
@@ -146,7 +146,7 @@
       "resource-assignment" : {\r
         "type" : "component-resource-assignment",\r
         "interfaces" : {\r
-          "org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode" : {\r
+          "org-onap-ccsdk-features-assignment-service-ConfigAssignmentNode" : {\r
             "operations" : {\r
               "process" : {\r
                 "inputs" : {\r
@@ -171,7 +171,7 @@
       "generate-configuration" : {\r
         "type" : "component-config-generator",\r
         "interfaces" : {\r
-          "org-onap-ccsdk-config-generator-service-ConfigGeneratorNode" : {\r
+          "org-onap-ccsdk-features-generator-service-ConfigGeneratorNode" : {\r
             "operations" : {\r
               "process" : {\r
                 "inputs" : {\r
@@ -403,7 +403,7 @@
         }\r
       },\r
       "interfaces" : {\r
-        "org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode" : {\r
+        "org-onap-ccsdk-features-assignment-service-ConfigAssignmentNode" : {\r
           "operations" : {\r
             "process" : {\r
               "inputs" : {\r
@@ -465,7 +465,7 @@
         }\r
       },\r
       "interfaces" : {\r
-        "org-onap-ccsdk-config-generator-service-ConfigGeneratorNode" : {\r
+        "org-onap-ccsdk-features-generator-service-ConfigGeneratorNode" : {\r
           "operations" : {\r
             "process" : {\r
               "inputs" : {\r
@@ -512,7 +512,7 @@
                   "type" : "string"\r
                 },\r
                 "mask-info" : {\r
-                  "description" : "If template contains mask encription keys, then this mask-info field will be generated, This JSON Content alligns to the bean org.onap.ccsdk.config.model.data.custom.MaskInfo ",\r
+                  "description" : "If template contains mask encription keys, then this mask-info field will be generated, This JSON Content alligns to the bean org.onap.ccsdk.features.model.data.custom.MaskInfo ",\r
                   "required" : false,\r
                   "type" : "string"\r
                 },\r

diff --git a/blueprints-processor/plugin/model-provider/src/test/resources/service_templates/resource_assignment.json b/blueprints-processor/plugin/model-provider/src/test/resources/service_templates/resource_assignment.json
index 0e29fe1..cbea6a8 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/test/resources/service_templates/resource_assignment.json
+++ b/blueprints-processor/plugin/model-provider/src/test/resources/service_templates/resource_assignment.json
@@ -139,7 +139,7 @@
                        "resource-assignment": {\r
                                "type": "component-resource-assignment",\r
                                "interfaces": {\r
-                                       "org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode": {\r
+                                       "org-onap-ccsdk-features-assignment-service-ConfigAssignmentNode": {\r
                                                "operations": {\r
                                                        "process": {\r
                                                                "inputs": {\r
@@ -243,7 +243,7 @@
                                }\r
                        },\r
                        "interfaces": {\r
-                               "org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode": {\r
+                               "org-onap-ccsdk-features-assignment-service-ConfigAssignmentNode": {\r
                                        "operations": {\r
                                                "process": {\r
                                                        "inputs": {\r

diff --git a/blueprints-processor/plugin/model-provider/src/test/resources/service_templates/vrr_config.json b/blueprints-processor/plugin/model-provider/src/test/resources/service_templates/vrr_config.json
index fdfb127..8c87f2d 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/test/resources/service_templates/vrr_config.json
+++ b/blueprints-processor/plugin/model-provider/src/test/resources/service_templates/vrr_config.json
@@ -139,7 +139,7 @@
                        "resource-assignment": {\r
                                "type": "component-resource-assignment",\r
                                "interfaces": {\r
-                                       "org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode": {\r
+                                       "org-onap-ccsdk-features-assignment-service-ConfigAssignmentNode": {\r
                                                "operations": {\r
                                                        "process": {\r
                                                                "inputs": {\r