From e2f68206f7c4b86ac79fa0873cd4816bd2486253 Mon Sep 17 00:00:00 2001 From: Taka Cho Date: Fri, 27 Sep 2019 11:07:49 -0400 Subject: [PATCH] remove org.openecomp.sdc artifact replace to org.onap.sdc Issue-ID: APPC-736 Change-Id: I6b9b451ad0196e03e7db90e6157e11139f0d0428 Signed-off-by: Taka Cho --- .../features/onap-appc-config-params/pom.xml | 4 ++-- .../features/src/main/resources/features.xml | 2 +- appc-config/appc-config-params/provider/pom.xml | 4 ++-- .../transformer/tosca/ArtifactProcessorImpl.java | 20 ++++++++++---------- appc-config/pom.xml | 2 -- appc-directed-graph/pom.xml | 1 - .../features/onap-appc-artifact-handler/pom.xml | 4 ++-- appc-inbound/pom.xml | 1 - appc-sdc-listener/appc-yang-generator/pom.xml | 4 ++-- .../org/onap/appc/yang/impl/YANGGeneratorImpl.java | 8 ++++---- 10 files changed, 23 insertions(+), 27 deletions(-) diff --git a/appc-config/appc-config-params/features/onap-appc-config-params/pom.xml b/appc-config/appc-config-params/features/onap-appc-config-params/pom.xml index 6a441f02b..114eae8b3 100644 --- a/appc-config/appc-config-params/features/onap-appc-config-params/pom.xml +++ b/appc-config/appc-config-params/features/onap-appc-config-params/pom.xml @@ -60,8 +60,8 @@ limitations under the License. ${commons.collections.version} - org.openecomp.sdc.common - openecomp-tosca-datatype + org.onap.sdc.common + onap-tosca-datatype ${tosca.datatype.version} diff --git a/appc-config/appc-config-params/features/src/main/resources/features.xml b/appc-config/appc-config-params/features/src/main/resources/features.xml index 757a1fc99..083fb5cf4 100644 --- a/appc-config/appc-config-params/features/src/main/resources/features.xml +++ b/appc-config/appc-config-params/features/src/main/resources/features.xml @@ -39,7 +39,7 @@ mvn:commons-collections/commons-collections/3.2.2 - wrap:mvn:org.openecomp.sdc.common/openecomp-tosca-datatype/${tosca.datatype.version} + wrap:mvn:org.onap.sdc.common/onap-tosca-datatype/${tosca.datatype.version} mvn:org.yaml/snakeyaml/${snakeyaml.version} mvn:org.onap.appc/appc-config-params-provider/${project.version} diff --git a/appc-config/appc-config-params/provider/pom.xml b/appc-config/appc-config-params/provider/pom.xml index 5812a4bf0..50cb878a5 100644 --- a/appc-config/appc-config-params/provider/pom.xml +++ b/appc-config/appc-config-params/provider/pom.xml @@ -45,8 +45,8 @@ - org.openecomp.sdc.common - openecomp-tosca-datatype + org.onap.sdc.common + onap-tosca-datatype ${tosca.datatype.version} diff --git a/appc-config/appc-config-params/provider/src/main/java/org/onap/sdnc/config/params/transformer/tosca/ArtifactProcessorImpl.java b/appc-config/appc-config-params/provider/src/main/java/org/onap/sdnc/config/params/transformer/tosca/ArtifactProcessorImpl.java index ad9daf5eb..d990bbdc3 100644 --- a/appc-config/appc-config-params/provider/src/main/java/org/onap/sdnc/config/params/transformer/tosca/ArtifactProcessorImpl.java +++ b/appc-config/appc-config-params/provider/src/main/java/org/onap/sdnc/config/params/transformer/tosca/ArtifactProcessorImpl.java @@ -41,11 +41,11 @@ import org.onap.sdnc.config.params.data.PropertyDefinition; import org.onap.sdnc.config.params.data.RequestKey; import org.onap.sdnc.config.params.data.ResponseKey; import org.onap.sdnc.config.params.transformer.tosca.exceptions.ArtifactProcessorException; -import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate; -import org.openecomp.sdc.tosca.datatypes.model.NodeType; -import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; -import org.openecomp.sdc.tosca.datatypes.model.TopologyTemplate; -import org.openecomp.sdc.tosca.services.YamlUtil; +import org.onap.sdc.tosca.datatypes.model.NodeTemplate; +import org.onap.sdc.tosca.datatypes.model.NodeType; +import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; +import org.onap.sdc.tosca.datatypes.model.TopologyTemplate; +import org.onap.sdc.tosca.services.YamlUtil; import org.slf4j.MDC; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; @@ -141,11 +141,11 @@ public class ArtifactProcessorImpl implements ArtifactProcessor { List parameterList = new LinkedList<>(); - Map propertyDefinitionFromTOSCA = + Map propertyDefinitionFromTOSCA = nodeType.getProperties(); if (null != propertyDefinitionFromTOSCA) { for (String propertyName : propertyDefinitionFromTOSCA.keySet()) { - org.openecomp.sdc.tosca.datatypes.model.PropertyDefinition propertyDefinition = + org.onap.sdc.tosca.datatypes.model.PropertyDefinition propertyDefinition = propertyDefinitionFromTOSCA.get(propertyName); Parameter parameter = new Parameter(); @@ -284,7 +284,7 @@ public class ArtifactProcessorImpl implements ArtifactProcessor { toscaNodeType.setVersion(artifact.getVersion()); toscaNodeType.setDescription(""); if (artifact.getParameters() != null) { - Map toscaPropertyMap = + Map toscaPropertyMap = new HashMap<>(); toscaNodeType.setProperties(toscaPropertyMap); @@ -305,8 +305,8 @@ public class ArtifactProcessorImpl implements ArtifactProcessor { if (!StringUtils.isBlank(pdParameter.getName()) && !pdParameter.getName().matches(".*\\s+.*")) { Log.info("Adding parameter " + pdParameter.getName() + " in node type"); - org.openecomp.sdc.tosca.datatypes.model.PropertyDefinition toscaProperty = - new org.openecomp.sdc.tosca.datatypes.model.PropertyDefinition(); + org.onap.sdc.tosca.datatypes.model.PropertyDefinition toscaProperty = + new org.onap.sdc.tosca.datatypes.model.PropertyDefinition(); toscaProperty.setType( StringUtils.isBlank(pdParameter.getType()) ? "string" : pdParameter.getType()); diff --git a/appc-config/pom.xml b/appc-config/pom.xml index a57b7719f..193dacd09 100644 --- a/appc-config/pom.xml +++ b/appc-config/pom.xml @@ -40,8 +40,6 @@ 1.3.7 3.2.2 2.5 - - 1.1.0 diff --git a/appc-directed-graph/pom.xml b/appc-directed-graph/pom.xml index cc623e3c7..17d499437 100644 --- a/appc-directed-graph/pom.xml +++ b/appc-directed-graph/pom.xml @@ -43,7 +43,6 @@ 1.3.7 3.2.2 2.5 - 1.1.0 ${project.parent.basedir} diff --git a/appc-inbound/appc-artifact-handler/features/onap-appc-artifact-handler/pom.xml b/appc-inbound/appc-artifact-handler/features/onap-appc-artifact-handler/pom.xml index f0da8fa19..acb1a8f2d 100644 --- a/appc-inbound/appc-artifact-handler/features/onap-appc-artifact-handler/pom.xml +++ b/appc-inbound/appc-artifact-handler/features/onap-appc-artifact-handler/pom.xml @@ -50,8 +50,8 @@ limitations under the License. features - org.openecomp.sdc.common - openecomp-tosca-datatype + org.onap.sdc.common + onap-tosca-datatype ${tosca.datatype.version} diff --git a/appc-inbound/pom.xml b/appc-inbound/pom.xml index 486c2ea3b..fa222f01c 100755 --- a/appc-inbound/pom.xml +++ b/appc-inbound/pom.xml @@ -38,7 +38,6 @@ 1.3.7 3.2.2 2.5 - 1.1.0 appc-artifact-handler diff --git a/appc-sdc-listener/appc-yang-generator/pom.xml b/appc-sdc-listener/appc-yang-generator/pom.xml index de3fbb2b7..f316eaec6 100644 --- a/appc-sdc-listener/appc-yang-generator/pom.xml +++ b/appc-sdc-listener/appc-yang-generator/pom.xml @@ -75,8 +75,8 @@ limitations under the License. test - org.openecomp.sdc.common - openecomp-tosca-datatype + org.onap.sdc.common + onap-tosca-datatype ${tosca.datatype.version} diff --git a/appc-sdc-listener/appc-yang-generator/src/main/java/org/onap/appc/yang/impl/YANGGeneratorImpl.java b/appc-sdc-listener/appc-yang-generator/src/main/java/org/onap/appc/yang/impl/YANGGeneratorImpl.java index 94e9df2b6..f53b4c51b 100644 --- a/appc-sdc-listener/appc-yang-generator/src/main/java/org/onap/appc/yang/impl/YANGGeneratorImpl.java +++ b/appc-sdc-listener/appc-yang-generator/src/main/java/org/onap/appc/yang/impl/YANGGeneratorImpl.java @@ -38,10 +38,10 @@ import org.onap.appc.yang.YANGGenerator; import org.onap.appc.yang.exception.YANGGenerationException; import org.onap.appc.yang.objects.Leaf; import org.onap.appc.yang.type.YangTypes; -import org.openecomp.sdc.tosca.datatypes.model.NodeType; -import org.openecomp.sdc.tosca.datatypes.model.PropertyDefinition; -import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; -import org.openecomp.sdc.tosca.services.YamlUtil; +import org.onap.sdc.tosca.datatypes.model.NodeType; +import org.onap.sdc.tosca.datatypes.model.PropertyDefinition; +import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; +import org.onap.sdc.tosca.services.YamlUtil; import java.io.*; import java.util.HashMap; -- 2.16.6