diff options
Diffstat (limited to 'blueprints-processor/adaptors')
| -rw-r--r-- | blueprints-processor/adaptors/data-adaptor-provider/pom.xml | 10 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/ConfigDataAdaptorException.java (renamed from blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/ConfigDataAdaptorException.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/DataAdaptorConstants.java (renamed from blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/DataAdaptorConstants.java) | 4 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/dao/ConfigPropertyMapDao.java (renamed from blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/ConfigPropertyMapDao.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/dao/ConfigPropertyMapDaoImpl.java (renamed from blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/ConfigPropertyMapDaoImpl.java) | 4 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/dao/ConfigResourceDao.java (renamed from blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/ConfigResourceDao.java) | 5 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/dao/ConfigResourceDaoImpl.java (renamed from blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/ConfigResourceDaoImpl.java) | 6 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/dao/NamedQueryExecutorDao.java (renamed from blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/NamedQueryExecutorDao.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/dao/NamedQueryExecutorDaoImpl.java (renamed from blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/NamedQueryExecutorDaoImpl.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/dao/QueryExecutorDao.java (renamed from blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/QueryExecutorDao.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/dao/QueryExecutorDaoImpl.java (renamed from blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/QueryExecutorDaoImpl.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/dao/TransactionLogDao.java (renamed from blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/TransactionLogDao.java) | 5 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/dao/TransactionLogDaoImpl.java (renamed from blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/TransactionLogDaoImpl.java) | 4 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/db/DataSourceWrap.java (renamed from blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/db/DataSourceWrap.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/domain/ConfigPropertyMapData.java (renamed from blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/domain/ConfigPropertyMapData.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/domain/ConfigResource.java (renamed from blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/domain/ConfigResource.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/domain/ResourceAssignmentData.java (renamed from blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/domain/ResourceAssignmentData.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/domain/TransactionLog.java (renamed from blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/domain/TransactionLog.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/service/ConfigResourceNode.java (renamed from blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/service/ConfigResourceNode.java) | 6 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/service/ConfigResourceService.java (renamed from blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/service/ConfigResourceService.java) | 7 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/service/ConfigResourceServiceImpl.java (renamed from blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/service/ConfigResourceServiceImpl.java) | 17 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/data-adaptor-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml | 16 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/dao/ConfigPropertyMapDaoTest.java (renamed from blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/config/data/adaptor/dao/ConfigPropertyMapDaoTest.java) | 6 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/dao/ConfigResourceDaoTest.java (renamed from blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/config/data/adaptor/dao/ConfigResourceDaoTest.java) | 7 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/dao/ConfigTransactionLogDaoTest.java (renamed from blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/config/data/adaptor/dao/ConfigTransactionLogDaoTest.java) | 8 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/dao/QueryExecutorDaoTest.java (renamed from blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/config/data/adaptor/dao/QueryExecutorDaoTest.java) | 3 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/service/ConfigResourceNodeTest.java (renamed from blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/config/data/adaptor/service/ConfigResourceNodeTest.java) | 17 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/service/ConfigResourceServiceTest.java (renamed from blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/config/data/adaptor/service/ConfigResourceServiceTest.java) | 22 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/data-adaptor-provider/src/test/resources/test-context-h2db.xml | 12 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/data-adaptor-provider/src/test/resources/test-context.xml | 14 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/rest-adaptor-provider/pom.xml | 8 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/ConfigRestAdaptorConstants.java (renamed from blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/ConfigRestAdaptorConstants.java) | 4 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/ConfigRestAdaptorException.java (renamed from blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/ConfigRestAdaptorException.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/data/RestResponse.java (renamed from blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/data/RestResponse.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/service/AbstractConfigRestClientAdapter.java (renamed from blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/AbstractConfigRestClientAdapter.java) | 10 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/service/ConfigRestAdaptorService.java (renamed from blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/ConfigRestAdaptorService.java) | 6 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/service/ConfigRestAdaptorServiceImpl.java (renamed from blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/ConfigRestAdaptorServiceImpl.java) | 9 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/service/ConfigRestClientServiceAdapter.java (renamed from blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/ConfigRestClientServiceAdapter.java) | 6 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/service/GenericRestClientAdapterImpl.java (renamed from blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/GenericRestClientAdapterImpl.java) | 8 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/service/SSLRestClientAdapterImpl.java (renamed from blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/SSLRestClientAdapterImpl.java) | 9 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/utils/BasicAuthorizationInterceptor.java (renamed from blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/utils/BasicAuthorizationInterceptor.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/utils/LoggingRequestInterceptor.java (renamed from blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/utils/LoggingRequestInterceptor.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/rest-adaptor-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml | 4 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/features/rest/adaptor/service/AbstractConfigRestClientAdapterTest.java (renamed from blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/config/rest/adaptor/service/AbstractConfigRestClientAdapterTest.java) | 5 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/features/rest/adaptor/service/GenericRestClientServiceTest.java (renamed from blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/config/rest/adaptor/service/GenericRestClientServiceTest.java) | 7 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/features/rest/adaptor/service/SSLClientServiceTest.java (renamed from blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/config/rest/adaptor/service/SSLClientServiceTest.java) | 7 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/features/rest/adaptor/utils/RestTemplateFactoryTest.java (renamed from blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/config/rest/adaptor/utils/RestTemplateFactoryTest.java) | 8 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/rest-adaptor-provider/src/test/resources/config-rest-adaptor.properties | 38 |
48 files changed, 179 insertions, 153 deletions
diff --git a/blueprints-processor/adaptors/data-adaptor-provider/pom.xml b/blueprints-processor/adaptors/data-adaptor-provider/pom.xml index f328ea954..0de0bab0a 100644 --- a/blueprints-processor/adaptors/data-adaptor-provider/pom.xml +++ b/blueprints-processor/adaptors/data-adaptor-provider/pom.xml @@ -111,11 +111,11 @@ <instructions>
<Bundle-Name>${project.artifactId}</Bundle-Name> <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> - <Export-Package>org.onap.ccsdk.config.data.adaptor,
- org.onap.ccsdk.config.data.adaptor.dao,
- org.onap.ccsdk.config.data.adaptor.db,
- org.onap.ccsdk.config.data.adaptor.domain,
- org.onap.ccsdk.config.data.adaptor.service
+ <Export-Package>org.onap.ccsdk.features.data.adaptor,
+ org.onap.ccsdk.features.data.adaptor.dao,
+ org.onap.ccsdk.features.data.adaptor.db,
+ org.onap.ccsdk.features.data.adaptor.domain,
+ org.onap.ccsdk.features.data.adaptor.service
</Export-Package>
</instructions>
</configuration>
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 index cd4ac277a..d76ee4ef9 100644 --- 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.
*/
-package org.onap.ccsdk.config.data.adaptor;
+package org.onap.ccsdk.features.data.adaptor;
/**
* ConfigDataAdaptorException.java Purpose: Provide Configuration Data Adaptor Exception
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 index 6a61370ea..df4912cf0 100644 --- 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.
*/
-package org.onap.ccsdk.config.data.adaptor;
+package org.onap.ccsdk.features.data.adaptor;
@SuppressWarnings("squid:S1118")
public class DataAdaptorConstants {
@@ -23,7 +23,7 @@ public class DataAdaptorConstants { public static final String OUTPUT_STATUS_SUCCESS = "success";
public static final String OUTPUT_STATUS_FAILURE = "failure";
- public static final String PROPERTY_ENV_TYPE = "org.onap.ccsdk.config.rest.adaptors.envtype";
+ public static final String PROPERTY_ENV_TYPE = "org.onap.ccsdk.features.rest.adaptors.envtype";
public static final String PROPERTY_ENV_PROD = "field";
public static final String PROPERTY_ENV_SOLO = "solo";
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 index 2bf9682de..4a77f7f05 100644 --- 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.
*/
-package org.onap.ccsdk.config.data.adaptor.dao;
+package org.onap.ccsdk.features.data.adaptor.dao;
import org.onap.ccsdk.sli.core.sli.SvcLogicException;
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 index 65e241e7d..a5248d2a6 100644 --- 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.
*/
-package org.onap.ccsdk.config.data.adaptor.dao;
+package org.onap.ccsdk.features.data.adaptor.dao;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -23,7 +23,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import org.apache.commons.lang3.StringUtils;
-import org.onap.ccsdk.config.data.adaptor.DataAdaptorConstants;
+import org.onap.ccsdk.features.data.adaptor.DataAdaptorConstants;
import org.onap.ccsdk.sli.core.sli.SvcLogicException;
import org.springframework.jdbc.CannotGetJdbcConnectionException;
import org.springframework.jdbc.core.JdbcTemplate;
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 index 63628864c..5e50d6f5f 100644 --- 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.
*/
-package org.onap.ccsdk.config.data.adaptor.dao;
+package org.onap.ccsdk.features.data.adaptor.dao;
import java.util.List;
-import org.onap.ccsdk.config.data.adaptor.domain.ConfigResource;
+
+import org.onap.ccsdk.features.data.adaptor.domain.ConfigResource;
import org.onap.ccsdk.sli.core.sli.SvcLogicException;
public interface ConfigResourceDao {
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 index 42cbbd1b0..7661e96ee 100644 --- 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.
*/
-package org.onap.ccsdk.config.data.adaptor.dao;
+package org.onap.ccsdk.features.data.adaptor.dao;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
-import org.onap.ccsdk.config.data.adaptor.domain.ConfigResource;
-import org.onap.ccsdk.config.data.adaptor.domain.ResourceAssignmentData;
+import org.onap.ccsdk.features.data.adaptor.domain.ConfigResource;
+import org.onap.ccsdk.features.data.adaptor.domain.ResourceAssignmentData;
import org.onap.ccsdk.sli.core.sli.SvcLogicException;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.core.RowMapper;
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 index 4cebb3081..7a06e234a 100644 --- 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.
*/
-package org.onap.ccsdk.config.data.adaptor.dao;
+package org.onap.ccsdk.features.data.adaptor.dao;
import java.util.List;
import java.util.Map;
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 index bcfe6b649..ac59c5149 100644 --- 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.
*/
-package org.onap.ccsdk.config.data.adaptor.dao;
+package org.onap.ccsdk.features.data.adaptor.dao;
import java.util.List;
import java.util.Map;
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 index 0c39524cf..9077d09f7 100644 --- 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.
*/
-package org.onap.ccsdk.config.data.adaptor.dao;
+package org.onap.ccsdk.features.data.adaptor.dao;
import java.util.List;
import java.util.Map;
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 index 076ec1d0f..f52c4c50f 100644 --- 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.
*/
-package org.onap.ccsdk.config.data.adaptor.dao;
+package org.onap.ccsdk.features.data.adaptor.dao;
import java.util.List;
import java.util.Map;
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 index c4747e236..c9c5f8a73 100644 --- 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.
*/
-package org.onap.ccsdk.config.data.adaptor.dao;
+package org.onap.ccsdk.features.data.adaptor.dao;
import java.util.List;
-import org.onap.ccsdk.config.data.adaptor.domain.TransactionLog;
+
+import org.onap.ccsdk.features.data.adaptor.domain.TransactionLog;
import org.onap.ccsdk.sli.core.sli.SvcLogicException;
public interface TransactionLogDao {
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 index fd3d810e7..ea6567e1e 100644 --- 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.
*/
-package org.onap.ccsdk.config.data.adaptor.dao;
+package org.onap.ccsdk.features.data.adaptor.dao;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
-import org.onap.ccsdk.config.data.adaptor.domain.TransactionLog;
+import org.onap.ccsdk.features.data.adaptor.domain.TransactionLog;
import org.onap.ccsdk.sli.core.sli.SvcLogicException;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.core.RowMapper;
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 index 18ca9453c..5ec3eddca 100644 --- 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.
*/
-package org.onap.ccsdk.config.data.adaptor.db;
+package org.onap.ccsdk.features.data.adaptor.db;
import java.io.PrintWriter;
import java.sql.Connection;
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 index 7d6bff98b..d9503b3be 100644 --- 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.
*/
-package org.onap.ccsdk.config.data.adaptor.domain;
+package org.onap.ccsdk.features.data.adaptor.domain;
import java.io.Serializable;
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 index c8394a74d..501027021 100644 --- 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.
*/
-package org.onap.ccsdk.config.data.adaptor.domain;
+package org.onap.ccsdk.features.data.adaptor.domain;
import java.io.Serializable;
import java.util.Date;
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 index 75c1a4957..45e83c27e 100644 --- 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.
*/
-package org.onap.ccsdk.config.data.adaptor.domain;
+package org.onap.ccsdk.features.data.adaptor.domain;
import java.io.Serializable;
import java.util.Date;
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 index 77235d137..f45fdc64c 100644 --- 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.
*/
-package org.onap.ccsdk.config.data.adaptor.domain;
+package org.onap.ccsdk.features.data.adaptor.domain;
import java.io.Serializable;
import java.util.Date;
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 index f85da143b..2eca20731 100644 --- 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.
*/
-package org.onap.ccsdk.config.data.adaptor.service;
+package org.onap.ccsdk.features.data.adaptor.service;
import java.util.Map;
import org.apache.commons.lang3.StringUtils;
-import org.onap.ccsdk.config.data.adaptor.DataAdaptorConstants;
-import org.onap.ccsdk.config.data.adaptor.domain.TransactionLog;
+import org.onap.ccsdk.features.data.adaptor.DataAdaptorConstants;
+import org.onap.ccsdk.features.data.adaptor.domain.TransactionLog;
import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
import org.onap.ccsdk.sli.core.sli.SvcLogicException;
import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin;
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 index b99b74f87..2f01749a3 100644 --- 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.
*/
-package org.onap.ccsdk.config.data.adaptor.service;
+package org.onap.ccsdk.features.data.adaptor.service;
import java.util.List;
import java.util.Map;
-import org.onap.ccsdk.config.data.adaptor.domain.ConfigResource;
-import org.onap.ccsdk.config.data.adaptor.domain.TransactionLog;
+
+import org.onap.ccsdk.features.data.adaptor.domain.ConfigResource;
+import org.onap.ccsdk.features.data.adaptor.domain.TransactionLog;
import org.onap.ccsdk.sli.core.sli.SvcLogicException;
import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
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 index c8803092a..bf1990377 100644 --- 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.
*/
-package org.onap.ccsdk.config.data.adaptor.service;
+package org.onap.ccsdk.features.data.adaptor.service;
import java.util.List;
import java.util.Map;
-import org.onap.ccsdk.config.data.adaptor.dao.ConfigPropertyMapDao;
-import org.onap.ccsdk.config.data.adaptor.dao.ConfigResourceDao;
-import org.onap.ccsdk.config.data.adaptor.dao.NamedQueryExecutorDao;
-import org.onap.ccsdk.config.data.adaptor.dao.QueryExecutorDao;
-import org.onap.ccsdk.config.data.adaptor.dao.TransactionLogDao;
-import org.onap.ccsdk.config.data.adaptor.domain.ConfigResource;
-import org.onap.ccsdk.config.data.adaptor.domain.TransactionLog;
+
+import org.onap.ccsdk.features.data.adaptor.dao.ConfigPropertyMapDao;
+import org.onap.ccsdk.features.data.adaptor.dao.ConfigResourceDao;
+import org.onap.ccsdk.features.data.adaptor.dao.NamedQueryExecutorDao;
+import org.onap.ccsdk.features.data.adaptor.dao.QueryExecutorDao;
+import org.onap.ccsdk.features.data.adaptor.dao.TransactionLogDao;
+import org.onap.ccsdk.features.data.adaptor.domain.ConfigResource;
+import org.onap.ccsdk.features.data.adaptor.domain.TransactionLog;
import org.onap.ccsdk.sli.core.sli.SvcLogicException;
import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
import com.att.eelf.configuration.EELFLogger;
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 644fd77f4..e38bcd3ce 100644 --- 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 -->
<bean id="config.dataSource"
- class="org.onap.ccsdk.config.data.adaptor.db.DataSourceWrap">
+ class="org.onap.ccsdk.features.data.adaptor.db.DataSourceWrap">
<argument ref="dataSource" />
</bean>
@@ -43,34 +43,34 @@ <!-- DAO Initialisation -->
<bean id="transactionLogDao"
- class="org.onap.ccsdk.config.data.adaptor.dao.TransactionLogDaoImpl">
+ class="org.onap.ccsdk.features.data.adaptor.dao.TransactionLogDaoImpl">
<argument ref="jdbcTemplate" />
</bean>
<bean id="configResourceDao"
- class="org.onap.ccsdk.config.data.adaptor.dao.ConfigResourceDaoImpl">
+ class="org.onap.ccsdk.features.data.adaptor.dao.ConfigResourceDaoImpl">
<argument ref="jdbcTemplate" />
</bean>
<bean id="queryExecutorDao"
- class="org.onap.ccsdk.config.data.adaptor.dao.QueryExecutorDaoImpl">
+ class="org.onap.ccsdk.features.data.adaptor.dao.QueryExecutorDaoImpl">
<argument ref="jdbcTemplate" />
</bean>
<bean id="namedQueryExecutorDao"
- class="org.onap.ccsdk.config.data.adaptor.dao.NamedQueryExecutorDaoImpl">
+ class="org.onap.ccsdk.features.data.adaptor.dao.NamedQueryExecutorDaoImpl">
<argument ref="namedParameterJdbcTemplate" />
</bean>
<bean id="configPropertyMapDao"
- class="org.onap.ccsdk.config.data.adaptor.dao.ConfigPropertyMapDaoImpl">
+ class="org.onap.ccsdk.features.data.adaptor.dao.ConfigPropertyMapDaoImpl">
<argument ref="jdbcTemplate" />
</bean>
<!-- Expose the Common Component Bean -->
<bean id="configResourceService"
- class="org.onap.ccsdk.config.data.adaptor.service.ConfigResourceServiceImpl">
+ class="org.onap.ccsdk.features.data.adaptor.service.ConfigResourceServiceImpl">
<argument ref="transactionLogDao" />
<argument ref="configResourceDao" />
<argument ref="queryExecutorDao" />
@@ -79,6 +79,6 @@ </bean>
<service ref="configResourceService"
- interface="org.onap.ccsdk.config.data.adaptor.service.ConfigResourceService" />
+ interface="org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService" />
</blueprint>
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 index 28736386c..1915017a6 100644 --- 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.
*/
-package org.onap.ccsdk.config.data.adaptor.dao;
+package org.onap.ccsdk.features.data.adaptor.dao;
import org.junit.Assert;
import org.junit.FixMethodOrder;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.MethodSorters;
+import org.onap.ccsdk.features.data.adaptor.dao.ConfigPropertyMapDao;
+import org.onap.ccsdk.features.data.adaptor.dao.QueryExecutorDao;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -44,7 +46,7 @@ public class ConfigPropertyMapDaoTest { int result = queryExecutorDao.update(sql, data);
Assert.assertNotNull("Failed to get Query Result", result);
- String propKeyValye = configPropertyMapDao.getConfigPropertyByKey("org.onap.ccsdk.config.rest.adaptors.test");
+ String propKeyValye = configPropertyMapDao.getConfigPropertyByKey("org.onap.ccsdk.features.rest.adaptors.test");
Assert.assertNull("propKeyValue is null", propKeyValye);
}
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 index 0e57d3b5f..7bc9189c9 100644 --- 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.
*/
-package org.onap.ccsdk.config.data.adaptor.dao;
+package org.onap.ccsdk.features.data.adaptor.dao;
import java.nio.charset.Charset;
import java.util.ArrayList;
@@ -28,8 +28,9 @@ import org.junit.FixMethodOrder; import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.MethodSorters;
-import org.onap.ccsdk.config.data.adaptor.domain.ConfigResource;
-import org.onap.ccsdk.config.data.adaptor.domain.ResourceAssignmentData;
+import org.onap.ccsdk.features.data.adaptor.dao.ConfigResourceDao;
+import org.onap.ccsdk.features.data.adaptor.domain.ConfigResource;
+import org.onap.ccsdk.features.data.adaptor.domain.ResourceAssignmentData;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
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 index ba150d510..22e9be9b7 100644 --- 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.
*/
-package org.onap.ccsdk.config.data.adaptor.dao;
+package org.onap.ccsdk.features.data.adaptor.dao;
import java.util.HashMap;
import java.util.List;
@@ -26,8 +26,10 @@ import org.junit.FixMethodOrder; import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.MethodSorters;
-import org.onap.ccsdk.config.data.adaptor.DataAdaptorConstants;
-import org.onap.ccsdk.config.data.adaptor.domain.TransactionLog;
+import org.onap.ccsdk.features.data.adaptor.DataAdaptorConstants;
+import org.onap.ccsdk.features.data.adaptor.dao.NamedQueryExecutorDao;
+import org.onap.ccsdk.features.data.adaptor.dao.TransactionLogDao;
+import org.onap.ccsdk.features.data.adaptor.domain.TransactionLog;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
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 index 257bc3183..ee7029f0d 100644 --- 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.
*/
-package org.onap.ccsdk.config.data.adaptor.dao;
+package org.onap.ccsdk.features.data.adaptor.dao;
import java.util.Date;
import org.junit.Assert;
@@ -24,6 +24,7 @@ import org.junit.FixMethodOrder; import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.MethodSorters;
+import org.onap.ccsdk.features.data.adaptor.dao.QueryExecutorDao;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
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 index b2f24bf60..53724c5c9 100644 --- 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.
*/
-package org.onap.ccsdk.config.data.adaptor.service;
+package org.onap.ccsdk.features.data.adaptor.service;
import java.util.HashMap;
import java.util.Map;
@@ -23,12 +23,15 @@ import org.junit.Assert; import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.onap.ccsdk.config.data.adaptor.DataAdaptorConstants;
-import org.onap.ccsdk.config.data.adaptor.dao.ConfigPropertyMapDao;
-import org.onap.ccsdk.config.data.adaptor.dao.ConfigResourceDao;
-import org.onap.ccsdk.config.data.adaptor.dao.NamedQueryExecutorDao;
-import org.onap.ccsdk.config.data.adaptor.dao.QueryExecutorDao;
-import org.onap.ccsdk.config.data.adaptor.dao.TransactionLogDao;
+import org.onap.ccsdk.features.data.adaptor.DataAdaptorConstants;
+import org.onap.ccsdk.features.data.adaptor.dao.ConfigPropertyMapDao;
+import org.onap.ccsdk.features.data.adaptor.dao.ConfigResourceDao;
+import org.onap.ccsdk.features.data.adaptor.dao.NamedQueryExecutorDao;
+import org.onap.ccsdk.features.data.adaptor.dao.QueryExecutorDao;
+import org.onap.ccsdk.features.data.adaptor.dao.TransactionLogDao;
+import org.onap.ccsdk.features.data.adaptor.service.ConfigResourceNode;
+import org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService;
+import org.onap.ccsdk.features.data.adaptor.service.ConfigResourceServiceImpl;
import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
import org.onap.ccsdk.sli.core.sli.SvcLogicException;
import org.springframework.beans.factory.annotation.Autowired;
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 index 6f861a3be..2d599e2f1 100644 --- 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.
*/
-package org.onap.ccsdk.config.data.adaptor.service;
+package org.onap.ccsdk.features.data.adaptor.service;
import java.nio.charset.Charset;
import java.util.ArrayList;
@@ -29,15 +29,17 @@ import org.junit.Assert; import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.onap.ccsdk.config.data.adaptor.dao.ConfigPropertyMapDao;
-import org.onap.ccsdk.config.data.adaptor.dao.ConfigResourceDao;
-import org.onap.ccsdk.config.data.adaptor.dao.ConfigResourceDaoTest;
-import org.onap.ccsdk.config.data.adaptor.dao.NamedQueryExecutorDao;
-import org.onap.ccsdk.config.data.adaptor.dao.QueryExecutorDao;
-import org.onap.ccsdk.config.data.adaptor.dao.TransactionLogDao;
-import org.onap.ccsdk.config.data.adaptor.domain.ConfigResource;
-import org.onap.ccsdk.config.data.adaptor.domain.ResourceAssignmentData;
-import org.onap.ccsdk.config.data.adaptor.domain.TransactionLog;
+import org.onap.ccsdk.features.data.adaptor.dao.ConfigPropertyMapDao;
+import org.onap.ccsdk.features.data.adaptor.dao.ConfigResourceDao;
+import org.onap.ccsdk.features.data.adaptor.dao.ConfigResourceDaoTest;
+import org.onap.ccsdk.features.data.adaptor.dao.NamedQueryExecutorDao;
+import org.onap.ccsdk.features.data.adaptor.dao.QueryExecutorDao;
+import org.onap.ccsdk.features.data.adaptor.dao.TransactionLogDao;
+import org.onap.ccsdk.features.data.adaptor.domain.ConfigResource;
+import org.onap.ccsdk.features.data.adaptor.domain.ResourceAssignmentData;
+import org.onap.ccsdk.features.data.adaptor.domain.TransactionLog;
+import org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService;
+import org.onap.ccsdk.features.data.adaptor.service.ConfigResourceServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
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 f0a50f440..baffb54e6 100644 --- 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>
<bean id="configResourceDao"
- class="org.onap.ccsdk.config.data.adaptor.dao.ConfigResourceDaoImpl">
+ class="org.onap.ccsdk.features.data.adaptor.dao.ConfigResourceDaoImpl">
<constructor-arg ref="jdbcTemplate" />
</bean>
<bean id="configPropertyMapDao"
- class="org.onap.ccsdk.config.data.adaptor.dao.ConfigPropertyMapDaoImpl">
+ class="org.onap.ccsdk.features.data.adaptor.dao.ConfigPropertyMapDaoImpl">
<constructor-arg ref="jdbcTemplate" />
</bean>
<bean id="queryExecutorDao"
- class="org.onap.ccsdk.config.data.adaptor.dao.QueryExecutorDaoImpl">
+ class="org.onap.ccsdk.features.data.adaptor.dao.QueryExecutorDaoImpl">
<constructor-arg ref="jdbcTemplate" />
</bean>
<bean id="namedQueryExecutorDao"
- class="org.onap.ccsdk.config.data.adaptor.dao.NamedQueryExecutorDaoImpl">
+ class="org.onap.ccsdk.features.data.adaptor.dao.NamedQueryExecutorDaoImpl">
<constructor-arg ref="namedParameterJdbcTemplate" />
</bean>
<bean id="transactionLogDao"
- class="org.onap.ccsdk.config.data.adaptor.dao.TransactionLogDaoImpl">
+ class="org.onap.ccsdk.features.data.adaptor.dao.TransactionLogDaoImpl">
<constructor-arg ref="jdbcTemplate" />
</bean>
<context:component-scan
- base-package="org.onap.ccsdk.config.data.adaptor" />
+ base-package="org.onap.ccsdk.features.data.adaptor" />
</beans>
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 17189f2f2..ee3d33120 100644 --- 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" /> -->
<!-- </jdbc:initialize-database> -->
<!-- <bean id="dataSetup" -->
- <!-- class="org.onap.ccsdk.config.data.adaptor.db.utils.DataSetup"> -->
+ <!-- class="org.onap.ccsdk.features.data.adaptor.db.utils.DataSetup"> -->
<!-- <property name="testDb" ref="testDb" /> -->
<!-- </bean> -->
- <!-- <bean id="testDb" class="org.onap.ccsdk.config.data.adaptor.db.utils.TestDb"> -->
+ <!-- <bean id="testDb" class="org.onap.ccsdk.features.data.adaptor.db.utils.TestDb"> -->
<!-- <property name="jdbcTemplate" ref="jdbcTemplate" /> -->
<!-- </bean> -->
@@ -71,26 +71,26 @@ </bean>
<bean id="configResourcelDao"
- class="org.onap.ccsdk.config.data.adaptor.dao.ConfigResourceDaoImpl">
+ class="org.onap.ccsdk.features.data.adaptor.dao.ConfigResourceDaoImpl">
<constructor-arg ref="jdbcTemplate" />
</bean>
<bean id="ConfigPropertyMapDao"
- class="org.onap.ccsdk.config.data.adaptor.dao.ConfigPropertyMapDaoImpl">
+ class="org.onap.ccsdk.features.data.adaptor.dao.ConfigPropertyMapDaoImpl">
<constructor-arg ref="jdbcTemplate" />
</bean>
<bean id="queryExecutorDao"
- class="org.onap.ccsdk.config.data.adaptor.dao.QueryExecutorDaoImpl">
+ class="org.onap.ccsdk.features.data.adaptor.dao.QueryExecutorDaoImpl">
<constructor-arg ref="jdbcTemplate" />
</bean>
<bean id="namedQueryExecutorDao"
- class="org.onap.ccsdk.config.data.adaptor.dao.NamedQueryExecutorDaoImpl">
+ class="org.onap.ccsdk.features.data.adaptor.dao.NamedQueryExecutorDaoImpl">
<constructor-arg ref="namedParameterJdbcTemplate" />
</bean>
<context:component-scan
- base-package="org.onap.ccsdk.config.data.adaptor" />
+ base-package="org.onap.ccsdk.features.data.adaptor" />
</beans>
diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml b/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml index ee5f9f675..0bf0d73d7 100644 --- a/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml +++ b/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml @@ -97,10 +97,10 @@ <instructions>
<Bundle-Name>${project.artifactId}</Bundle-Name> <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> - <Export-Package>org.onap.ccsdk.config.rest.adaptor,
- org.onap.ccsdk.config.rest.adaptor.data,
- org.onap.ccsdk.config.rest.adaptor.service,
- org.onap.ccsdk.config.rest.adaptor.utils
+ <Export-Package>org.onap.ccsdk.features.rest.adaptor,
+ org.onap.ccsdk.features.rest.adaptor.data,
+ org.onap.ccsdk.features.rest.adaptor.service,
+ org.onap.ccsdk.features.rest.adaptor.utils
</Export-Package>
</instructions>
</configuration>
diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/ConfigRestAdaptorConstants.java b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/ConfigRestAdaptorConstants.java index af6b9f2b8..2f1ad0af2 100644 --- a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/ConfigRestAdaptorConstants.java +++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/ConfigRestAdaptorConstants.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.rest.adaptor;
+package org.onap.ccsdk.features.rest.adaptor;
public class ConfigRestAdaptorConstants {
private ConfigRestAdaptorConstants() {
@@ -33,7 +33,7 @@ public class ConfigRestAdaptorConstants { public static final String PROPERTY_ENV_PROD = "field";
public static final String PROPERTY_ENV_SOLO = "solo";
- public static final String REST_ADAPTOR_BASE_PROPERTY = "org.onap.ccsdk.config.rest.adaptors.";
+ public static final String REST_ADAPTOR_BASE_PROPERTY = "org.onap.ccsdk.features.rest.adaptors.";
public static final String REST_ADAPTOR_ENV_TYPE = "envtype";
public static final String REST_ADAPTOR_TYPE_GENERIC = "generic";
public static final String REST_ADAPTOR_TYPE_SSL = "ssl";
diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/ConfigRestAdaptorException.java b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/ConfigRestAdaptorException.java index c6593f128..163c30423 100644 --- a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/ConfigRestAdaptorException.java +++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/ConfigRestAdaptorException.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.rest.adaptor;
+package org.onap.ccsdk.features.rest.adaptor;
/**
* ConfigRestAdaptorException.java Purpose: Provide Configuration Rest Adaptor Exception
diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/data/RestResponse.java b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/data/RestResponse.java index d31aa7e8a..f1a3c7290 100644 --- a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/data/RestResponse.java +++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/data/RestResponse.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.rest.adaptor.data;
+package org.onap.ccsdk.features.rest.adaptor.data;
import java.util.Map;
diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/AbstractConfigRestClientAdapter.java b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/service/AbstractConfigRestClientAdapter.java index 7829ee6a8..207e87fc3 100644 --- a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/AbstractConfigRestClientAdapter.java +++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/service/AbstractConfigRestClientAdapter.java @@ -12,7 +12,7 @@ * the License.
*/
-package org.onap.ccsdk.config.rest.adaptor.service;
+package org.onap.ccsdk.features.rest.adaptor.service;
import java.io.FileInputStream;
import java.io.InputStream;
@@ -30,10 +30,10 @@ import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClients;
import org.apache.http.ssl.SSLContextBuilder;
import org.apache.http.ssl.TrustStrategy;
-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorConstants;
-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorException;
-import org.onap.ccsdk.config.rest.adaptor.data.RestResponse;
-import org.onap.ccsdk.config.rest.adaptor.utils.BasicAuthorizationInterceptor;
+import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorConstants;
+import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorException;
+import org.onap.ccsdk.features.rest.adaptor.data.RestResponse;
+import org.onap.ccsdk.features.rest.adaptor.utils.BasicAuthorizationInterceptor;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/ConfigRestAdaptorService.java b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/service/ConfigRestAdaptorService.java index 98c598acb..12e734ad3 100644 --- a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/ConfigRestAdaptorService.java +++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/service/ConfigRestAdaptorService.java @@ -15,10 +15,10 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.rest.adaptor.service;
+package org.onap.ccsdk.features.rest.adaptor.service;
-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorException;
-import org.onap.ccsdk.config.rest.adaptor.data.RestResponse;
+import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorException;
+import org.onap.ccsdk.features.rest.adaptor.data.RestResponse;
public interface ConfigRestAdaptorService {
diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/ConfigRestAdaptorServiceImpl.java b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/service/ConfigRestAdaptorServiceImpl.java index 65b9defd3..c05d6979a 100644 --- a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/ConfigRestAdaptorServiceImpl.java +++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/service/ConfigRestAdaptorServiceImpl.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.rest.adaptor.service;
+package org.onap.ccsdk.features.rest.adaptor.service;
import java.io.File;
import java.io.FileInputStream;
@@ -27,9 +27,10 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import org.apache.commons.lang3.StringUtils;
-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorConstants;
-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorException;
-import org.onap.ccsdk.config.rest.adaptor.data.RestResponse;
+import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorConstants;
+import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorException;
+import org.onap.ccsdk.features.rest.adaptor.data.RestResponse;
+
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/ConfigRestClientServiceAdapter.java b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/service/ConfigRestClientServiceAdapter.java index 46e954fb6..7ebc0ef48 100644 --- a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/ConfigRestClientServiceAdapter.java +++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/service/ConfigRestClientServiceAdapter.java @@ -15,10 +15,10 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.rest.adaptor.service;
+package org.onap.ccsdk.features.rest.adaptor.service;
-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorException;
-import org.onap.ccsdk.config.rest.adaptor.data.RestResponse;
+import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorException;
+import org.onap.ccsdk.features.rest.adaptor.data.RestResponse;
interface ConfigRestClientServiceAdapter {
diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/GenericRestClientAdapterImpl.java b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/service/GenericRestClientAdapterImpl.java index 8cb5e9bea..6f9840a0b 100644 --- a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/GenericRestClientAdapterImpl.java +++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/service/GenericRestClientAdapterImpl.java @@ -15,14 +15,14 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.rest.adaptor.service;
+package org.onap.ccsdk.features.rest.adaptor.service;
import java.util.Map;
import java.util.UUID;
import org.apache.commons.lang3.StringUtils;
-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorConstants;
-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorException;
-import org.onap.ccsdk.config.rest.adaptor.data.RestResponse;
+import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorConstants;
+import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorException;
+import org.onap.ccsdk.features.rest.adaptor.data.RestResponse;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
import com.att.eelf.configuration.EELFLogger;
diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/SSLRestClientAdapterImpl.java b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/service/SSLRestClientAdapterImpl.java index e444d9f17..44736deb1 100644 --- a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/SSLRestClientAdapterImpl.java +++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/service/SSLRestClientAdapterImpl.java @@ -15,13 +15,14 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.rest.adaptor.service;
+package org.onap.ccsdk.features.rest.adaptor.service;
import java.util.Map;
import java.util.UUID;
-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorConstants;
-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorException;
-import org.onap.ccsdk.config.rest.adaptor.data.RestResponse;
+
+import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorConstants;
+import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorException;
+import org.onap.ccsdk.features.rest.adaptor.data.RestResponse;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
import com.att.eelf.configuration.EELFLogger;
diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/utils/BasicAuthorizationInterceptor.java b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/utils/BasicAuthorizationInterceptor.java index b28c2c1a1..53b4ddf96 100644 --- a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/utils/BasicAuthorizationInterceptor.java +++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/utils/BasicAuthorizationInterceptor.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.rest.adaptor.utils;
+package org.onap.ccsdk.features.rest.adaptor.utils;
import java.io.IOException;
import java.nio.charset.Charset;
diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/utils/LoggingRequestInterceptor.java b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/utils/LoggingRequestInterceptor.java index 4095d62fe..cb618d05a 100644 --- a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/utils/LoggingRequestInterceptor.java +++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/utils/LoggingRequestInterceptor.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.rest.adaptor.utils;
+package org.onap.ccsdk.features.rest.adaptor.utils;
import java.io.BufferedReader;
import java.io.IOException;
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 0b6a6ae11..dbc8b5231 100644 --- 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 -->
<bean id="configRestAdaptorService"
- class="org.onap.ccsdk.config.rest.adaptor.service.ConfigRestAdaptorServiceImpl">
+ class="org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorServiceImpl">
<argument value="/opt/sdnc/data/properties" />
</bean>
<service ref="configRestAdaptorService"
- interface="org.onap.ccsdk.config.rest.adaptor.service.ConfigRestAdaptorService" />
+ interface="org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorService" />
</blueprint>
diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/config/rest/adaptor/service/AbstractConfigRestClientAdapterTest.java b/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/features/rest/adaptor/service/AbstractConfigRestClientAdapterTest.java index 6c7f114eb..2e091591b 100644 --- a/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/config/rest/adaptor/service/AbstractConfigRestClientAdapterTest.java +++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/features/rest/adaptor/service/AbstractConfigRestClientAdapterTest.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.rest.adaptor.service;
+package org.onap.ccsdk.features.rest.adaptor.service;
import java.io.FileInputStream;
import java.util.HashMap;
@@ -25,6 +25,9 @@ import java.util.stream.Collectors; import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.onap.ccsdk.features.rest.adaptor.service.ConfigRestClientServiceAdapter;
+import org.onap.ccsdk.features.rest.adaptor.service.GenericRestClientAdapterImpl;
+import org.onap.ccsdk.features.rest.adaptor.service.SSLRestClientAdapterImpl;
public class AbstractConfigRestClientAdapterTest {
diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/config/rest/adaptor/service/GenericRestClientServiceTest.java b/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/features/rest/adaptor/service/GenericRestClientServiceTest.java index 7e7f52261..f660cca10 100644 --- a/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/config/rest/adaptor/service/GenericRestClientServiceTest.java +++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/features/rest/adaptor/service/GenericRestClientServiceTest.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.rest.adaptor.service;
+package org.onap.ccsdk.features.rest.adaptor.service;
import static org.powermock.api.mockito.PowerMockito.mock;
import static org.powermock.api.mockito.PowerMockito.when;
@@ -25,7 +25,10 @@ import org.junit.Before; import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Matchers;
-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorException;
+import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorException;
+import org.onap.ccsdk.features.rest.adaptor.service.AbstractConfigRestClientAdapter;
+import org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorService;
+import org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorServiceImpl;
import org.powermock.core.classloader.annotations.PowerMockIgnore;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/config/rest/adaptor/service/SSLClientServiceTest.java b/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/features/rest/adaptor/service/SSLClientServiceTest.java index a5e757213..e8b3a02ed 100644 --- a/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/config/rest/adaptor/service/SSLClientServiceTest.java +++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/features/rest/adaptor/service/SSLClientServiceTest.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.rest.adaptor.service;
+package org.onap.ccsdk.features.rest.adaptor.service;
import static org.powermock.api.mockito.PowerMockito.mock;
import static org.powermock.api.mockito.PowerMockito.when;
@@ -25,7 +25,10 @@ import org.junit.Before; import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Matchers;
-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorException;
+import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorException;
+import org.onap.ccsdk.features.rest.adaptor.service.AbstractConfigRestClientAdapter;
+import org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorService;
+import org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorServiceImpl;
import org.powermock.core.classloader.annotations.PowerMockIgnore;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/config/rest/adaptor/utils/RestTemplateFactoryTest.java b/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/features/rest/adaptor/utils/RestTemplateFactoryTest.java index e1d0268e1..cee91d297 100644 --- a/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/config/rest/adaptor/utils/RestTemplateFactoryTest.java +++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/features/rest/adaptor/utils/RestTemplateFactoryTest.java @@ -15,11 +15,11 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.rest.adaptor.utils;
+package org.onap.ccsdk.features.rest.adaptor.utils;
-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorConstants;
-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorException;
-import org.onap.ccsdk.config.rest.adaptor.service.ConfigRestAdaptorServiceImpl;
+import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorConstants;
+import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorException;
+import org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorServiceImpl;
@SuppressWarnings("squid:S2187")
public class RestTemplateFactoryTest {
diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/test/resources/config-rest-adaptor.properties b/blueprints-processor/adaptors/rest-adaptor-provider/src/test/resources/config-rest-adaptor.properties index 4527e8977..22748259b 100644 --- a/blueprints-processor/adaptors/rest-adaptor-provider/src/test/resources/config-rest-adaptor.properties +++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/test/resources/config-rest-adaptor.properties @@ -18,28 +18,28 @@ # Configuration file for SDNC Controller Module
#
-org.onap.ccsdk.config.rest.adaptors.envtype=solo
+org.onap.ccsdk.features.rest.adaptors.envtype=solo
# Config Generator Microservices
-org.onap.ccsdk.config.rest.adaptors.modelservice.type=generic
-org.onap.ccsdk.config.rest.adaptors.modelservice.enable=true
-org.onap.ccsdk.config.rest.adaptors.modelservice.url=http://localhost:8080/configgenerator/service/
-org.onap.ccsdk.config.rest.adaptors.modelservice.user=admin
-org.onap.ccsdk.config.rest.adaptors.modelservice.passwd=admin
+org.onap.ccsdk.features.rest.adaptors.modelservice.type=generic
+org.onap.ccsdk.features.rest.adaptors.modelservice.enable=true
+org.onap.ccsdk.features.rest.adaptors.modelservice.url=http://localhost:8080/configgenerator/service/
+org.onap.ccsdk.features.rest.adaptors.modelservice.user=admin
+org.onap.ccsdk.features.rest.adaptors.modelservice.passwd=admin
# Generic RESTCONF Adaptor
-org.onap.ccsdk.config.rest.adaptors.restconf.type=generic
-org.onap.ccsdk.config.rest.adaptors.restconf.enable=true
-org.onap.ccsdk.config.rest.adaptors.restconf.user=admin
-org.onap.ccsdk.config.rest.adaptors.restconf.passwd=admin
-org.onap.ccsdk.config.rest.adaptors.restconf.url=http://localhost:8181/restconf/
+org.onap.ccsdk.features.rest.adaptors.restconf.type=generic
+org.onap.ccsdk.features.rest.adaptors.restconf.enable=true
+org.onap.ccsdk.features.rest.adaptors.restconf.user=admin
+org.onap.ccsdk.features.rest.adaptors.restconf.passwd=admin
+org.onap.ccsdk.features.rest.adaptors.restconf.url=http://localhost:8181/restconf/
# SSL AAI Adaptor
-org.onap.ccsdk.config.rest.adaptors.aai.propertyfile=aai.properties
-org.onap.ccsdk.config.rest.adaptors.aai.type=ssl
-org.onap.ccsdk.config.rest.adaptors.aai.enable=true
-org.onap.ccsdk.config.rest.adaptors.aai.url=https://localhost:8443/onap-aai/
-org.onap.ccsdk.config.rest.adaptors.aai.ssl.trust=src/test/resources/truststore.client.jks
-org.onap.ccsdk.config.rest.adaptors.aai.ssl.trust.psswd=changeme
-org.onap.ccsdk.config.rest.adaptors.aai.ssl.key=src/test/resources/keystore.client.p12
-org.onap.ccsdk.config.rest.adaptors.aai.ssl.key.psswd=changeme
+org.onap.ccsdk.features.rest.adaptors.aai.propertyfile=aai.properties
+org.onap.ccsdk.features.rest.adaptors.aai.type=ssl
+org.onap.ccsdk.features.rest.adaptors.aai.enable=true
+org.onap.ccsdk.features.rest.adaptors.aai.url=https://localhost:8443/onap-aai/
+org.onap.ccsdk.features.rest.adaptors.aai.ssl.trust=src/test/resources/truststore.client.jks
+org.onap.ccsdk.features.rest.adaptors.aai.ssl.trust.psswd=changeme
+org.onap.ccsdk.features.rest.adaptors.aai.ssl.key=src/test/resources/keystore.client.p12
+org.onap.ccsdk.features.rest.adaptors.aai.ssl.key.psswd=changeme
|