diff options
author | 2018-09-12 16:26:03 -0400 | |
---|---|---|
committer | 2018-09-12 16:26:03 -0400 | |
commit | 280a0f6c73ab1c1aed9ee87fbd053d01d3838d70 (patch) | |
tree | 4c72a3ede9e9cecdff1ca4835e2df886b7e703e2 /blueprints-processor/plugin/generator-provider/src | |
parent | 37a244dfa9b485c2832f1882930e0e67238f31fb (diff) |
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>
Diffstat (limited to 'blueprints-processor/plugin/generator-provider/src')
-rw-r--r-- | blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/features/generator/ConfigGeneratorConstant.java (renamed from blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/config/generator/ConfigGeneratorConstant.java) | 2 | ||||
-rw-r--r-- | blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/features/generator/data/ConfigGeneratorInfo.java (renamed from blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/config/generator/data/ConfigGeneratorInfo.java) | 2 | ||||
-rw-r--r-- | blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/features/generator/service/ConfigGeneratorNode.java (renamed from blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/config/generator/service/ConfigGeneratorNode.java) | 14 | ||||
-rw-r--r-- | blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/features/generator/service/ConfigGeneratorService.java (renamed from blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/config/generator/service/ConfigGeneratorService.java) | 4 | ||||
-rw-r--r-- | blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/features/generator/service/ConfigGeneratorServiceImpl.java (renamed from blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/config/generator/service/ConfigGeneratorServiceImpl.java) | 12 | ||||
-rw-r--r-- | blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/features/generator/tool/CustomJsonNodeFactory.java (renamed from blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/config/generator/tool/CustomJsonNodeFactory.java) | 2 | ||||
-rw-r--r-- | blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/features/generator/tool/CustomTextNode.java (renamed from blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/config/generator/tool/CustomTextNode.java) | 2 | ||||
-rw-r--r-- | blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/features/generator/tool/EscapeUtils.java (renamed from blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/config/generator/tool/EscapeUtils.java) | 2 | ||||
-rw-r--r-- | blueprints-processor/plugin/generator-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml | 12 | ||||
-rw-r--r-- | blueprints-processor/plugin/generator-provider/src/test/java/org/onap/ccsdk/features/generator/service/ConfigGeneratorNodeTest.java (renamed from blueprints-processor/plugin/generator-provider/src/test/java/org/onap/ccsdk/config/generator/service/ConfigGeneratorNodeTest.java) | 21 | ||||
-rw-r--r-- | blueprints-processor/plugin/generator-provider/src/test/java/org/onap/ccsdk/features/generator/tool/EscapeUtilsTest.java (renamed from blueprints-processor/plugin/generator-provider/src/test/java/org/onap/ccsdk/config/generator/tool/EscapeUtilsTest.java) | 3 | ||||
-rw-r--r-- | blueprints-processor/plugin/generator-provider/src/test/resources/service_templates/generate_configuration.json | 6 |
12 files changed, 42 insertions, 40 deletions
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 index b859b69cd..06c423b5e 100644 --- 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.
*/
-package org.onap.ccsdk.config.generator;
+package org.onap.ccsdk.features.generator;
public class ConfigGeneratorConstant {
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 index ec461549a..0b7ea0435 100644 --- 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.
*/
-package org.onap.ccsdk.config.generator.data;
+package org.onap.ccsdk.features.generator.data;
public class ConfigGeneratorInfo {
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 index 136ba7f25..421692b89 100644 --- 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.
*/
-package org.onap.ccsdk.config.generator.service;
+package org.onap.ccsdk.features.generator.service;
import java.util.Map;
import org.apache.commons.lang3.StringUtils;
-import org.onap.ccsdk.config.data.adaptor.service.ConfigResourceService;
-import org.onap.ccsdk.config.generator.ConfigGeneratorConstant;
-import org.onap.ccsdk.config.generator.data.ConfigGeneratorInfo;
-import org.onap.ccsdk.config.model.ConfigModelConstant;
-import org.onap.ccsdk.config.model.service.ComponentNode;
-import org.onap.ccsdk.config.model.service.ConfigModelService;
+import org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService;
+import org.onap.ccsdk.features.generator.ConfigGeneratorConstant;
+import org.onap.ccsdk.features.generator.data.ConfigGeneratorInfo;
+import org.onap.ccsdk.features.model.ConfigModelConstant;
+import org.onap.ccsdk.features.model.service.ComponentNode;
+import org.onap.ccsdk.features.model.service.ConfigModelService;
import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
import org.onap.ccsdk.sli.core.sli.SvcLogicException;
import com.att.eelf.configuration.EELFLogger;
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 index 710d47d25..b8a943083 100644 --- 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.
*/
-package org.onap.ccsdk.config.generator.service;
+package org.onap.ccsdk.features.generator.service;
-import org.onap.ccsdk.config.generator.data.ConfigGeneratorInfo;
+import org.onap.ccsdk.features.generator.data.ConfigGeneratorInfo;
import org.onap.ccsdk.sli.core.sli.SvcLogicException;
public interface ConfigGeneratorService {
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 index 472f5b291..6292b8def 100644 --- 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.
*/
-package org.onap.ccsdk.config.generator.service;
+package org.onap.ccsdk.features.generator.service;
import java.io.StringWriter;
import java.util.Iterator;
@@ -24,11 +24,11 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.Velocity;
-import org.onap.ccsdk.config.data.adaptor.domain.ConfigResource;
-import org.onap.ccsdk.config.data.adaptor.service.ConfigResourceService;
-import org.onap.ccsdk.config.generator.data.ConfigGeneratorInfo;
-import org.onap.ccsdk.config.generator.tool.CustomJsonNodeFactory;
-import org.onap.ccsdk.config.model.utils.TransformationUtils;
+import org.onap.ccsdk.features.data.adaptor.domain.ConfigResource;
+import org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService;
+import org.onap.ccsdk.features.generator.data.ConfigGeneratorInfo;
+import org.onap.ccsdk.features.generator.tool.CustomJsonNodeFactory;
+import org.onap.ccsdk.features.model.utils.TransformationUtils;
import org.onap.ccsdk.sli.core.sli.SvcLogicException;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
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 index 3e69ef355..f20cef2a6 100644 --- 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.
*/
-package org.onap.ccsdk.config.generator.tool;
+package org.onap.ccsdk.features.generator.tool;
import com.fasterxml.jackson.databind.node.JsonNodeFactory;
import com.fasterxml.jackson.databind.node.TextNode;
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 index cf42c552b..1a62dd6a9 100644 --- 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.
*/
-package org.onap.ccsdk.config.generator.tool;
+package org.onap.ccsdk.features.generator.tool;
import com.fasterxml.jackson.core.io.CharTypes;
import com.fasterxml.jackson.databind.node.TextNode;
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 index 3009f87f9..d3246e045 100644 --- 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.
*/
-package org.onap.ccsdk.config.generator.tool;
+package org.onap.ccsdk.features.generator.tool;
import org.apache.commons.lang3.StringUtils;
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 7bf65fa4e..78cb28189 100644 --- 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">
<reference id="configModelService"
- interface="org.onap.ccsdk.config.model.service.ConfigModelService" />
+ interface="org.onap.ccsdk.features.model.service.ConfigModelService" />
<reference id="configResourceService"
- interface="org.onap.ccsdk.config.data.adaptor.service.ConfigResourceService" />
+ interface="org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService" />
<!-- Expose the Common Component Bean -->
<bean id="configGeneratorService"
- class="org.onap.ccsdk.config.generator.service.ConfigGeneratorServiceImpl">
+ class="org.onap.ccsdk.features.generator.service.ConfigGeneratorServiceImpl">
<argument ref="configResourceService" />
</bean>
<service ref="configGeneratorService"
- interface="org.onap.ccsdk.config.generator.service.ConfigGeneratorService" />
+ interface="org.onap.ccsdk.features.generator.service.ConfigGeneratorService" />
<bean id="configGeneratorNode"
- class="org.onap.ccsdk.config.generator.service.ConfigGeneratorNode">
+ class="org.onap.ccsdk.features.generator.service.ConfigGeneratorNode">
<argument ref="configResourceService" />
<argument ref="configModelService" />
</bean>
<service ref="configGeneratorNode"
- interface="org.onap.ccsdk.config.generator.service.ConfigGeneratorNode" />
+ interface="org.onap.ccsdk.features.generator.service.ConfigGeneratorNode" />
</blueprint>
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 index 941387347..58a22ac14 100644 --- 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.
*/
-package org.onap.ccsdk.config.generator.service;
+package org.onap.ccsdk.features.generator.service;
import static org.mockito.Matchers.any;
import java.nio.charset.Charset;
@@ -35,15 +35,16 @@ import org.mockito.MockitoAnnotations; import org.mockito.invocation.InvocationOnMock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.stubbing.Answer;
-import org.onap.ccsdk.config.data.adaptor.domain.ConfigResource;
-import org.onap.ccsdk.config.data.adaptor.domain.TransactionLog;
-import org.onap.ccsdk.config.data.adaptor.service.ConfigResourceService;
-import org.onap.ccsdk.config.generator.ConfigGeneratorConstant;
-import org.onap.ccsdk.config.model.ConfigModelConstant;
-import org.onap.ccsdk.config.model.service.ConfigModelService;
-import org.onap.ccsdk.config.model.service.ConfigModelServiceImpl;
-import org.onap.ccsdk.config.model.utils.TransformationUtils;
-import org.onap.ccsdk.config.rest.adaptor.service.ConfigRestAdaptorService;
+import org.onap.ccsdk.features.data.adaptor.domain.ConfigResource;
+import org.onap.ccsdk.features.data.adaptor.domain.TransactionLog;
+import org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService;
+import org.onap.ccsdk.features.generator.ConfigGeneratorConstant;
+import org.onap.ccsdk.features.generator.service.ConfigGeneratorNode;
+import org.onap.ccsdk.features.model.ConfigModelConstant;
+import org.onap.ccsdk.features.model.service.ConfigModelService;
+import org.onap.ccsdk.features.model.service.ConfigModelServiceImpl;
+import org.onap.ccsdk.features.model.utils.TransformationUtils;
+import org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorService;
import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
import org.onap.ccsdk.sli.core.sli.SvcLogicException;
import com.att.eelf.configuration.EELFLogger;
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 index 0bd2384bf..58918685d 100644 --- 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.
*/
-package org.onap.ccsdk.config.generator.tool;
+package org.onap.ccsdk.features.generator.tool;
import org.junit.Assert;
import org.junit.Test;
+import org.onap.ccsdk.features.generator.tool.EscapeUtils;
public class EscapeUtilsTest {
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 0d569ef85..326d2e8ec 100644 --- 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": {
"type": "component-config-generator",
"interfaces": {
- "org-onap-ccsdk-config-generator-service-ConfigGeneratorNode": {
+ "org-onap-ccsdk-features-generator-service-ConfigGeneratorNode": {
"operations": {
"process": {
"inputs": {
@@ -164,7 +164,7 @@ }
},
"interfaces": {
- "org-onap-ccsdk-config-generator-service-ConfigGeneratorNode": {
+ "org-onap-ccsdk-features-generator-service-ConfigGeneratorNode": {
"operations": {
"process": {
"inputs": {
@@ -211,7 +211,7 @@ "type": "string"
},
"mask-info": {
- "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 ",
+ "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 ",
"required": false,
"type": "string"
},
|