diff options
Diffstat (limited to 'appc-config/appc-config-params')
4 files changed, 15 insertions, 15 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. <version>${commons.collections.version}</version> </dependency> <dependency> - <groupId>org.openecomp.sdc.common</groupId> - <artifactId>openecomp-tosca-datatype</artifactId> + <groupId>org.onap.sdc.common</groupId> + <artifactId>onap-tosca-datatype</artifactId> <version>${tosca.datatype.version}</version> </dependency> <dependency> 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 @@ <bundle>mvn:commons-collections/commons-collections/3.2.2</bundle> <!-- <bundle>wrap:mvn:org.onap.appc/appc-yang-generator/${project.version}</bundle> --> - <bundle>wrap:mvn:org.openecomp.sdc.common/openecomp-tosca-datatype/${tosca.datatype.version}</bundle> + <bundle>wrap:mvn:org.onap.sdc.common/onap-tosca-datatype/${tosca.datatype.version}</bundle> <bundle>mvn:org.yaml/snakeyaml/${snakeyaml.version}</bundle> <bundle>mvn:org.onap.appc/appc-config-params-provider/${project.version}</bundle> </feature> 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 @@ </dependency> <dependency> - <groupId>org.openecomp.sdc.common</groupId> - <artifactId>openecomp-tosca-datatype</artifactId> + <groupId>org.onap.sdc.common</groupId> + <artifactId>onap-tosca-datatype</artifactId> <version>${tosca.datatype.version}</version> <exclusions> <exclusion> 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<Parameter> parameterList = new LinkedList<>(); - Map<String, org.openecomp.sdc.tosca.datatypes.model.PropertyDefinition> propertyDefinitionFromTOSCA = + Map<String, org.onap.sdc.tosca.datatypes.model.PropertyDefinition> 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<String, org.openecomp.sdc.tosca.datatypes.model.PropertyDefinition> toscaPropertyMap = + Map<String, org.onap.sdc.tosca.datatypes.model.PropertyDefinition> 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()); |