aboutsummaryrefslogtreecommitdiffstats
path: root/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-core
diff options
context:
space:
mode:
authoramitjai <amitjai@amdocs.com>2018-04-27 13:28:57 +0530
committerOren Kleks <orenkle@amdocs.com>2018-04-30 06:05:27 +0000
commit42c920baf4dbb9fe8775843a6d4c9f70fa29f064 (patch)
treeac2aff977e2b129e61d2166c4832842676e4f5c3 /openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-core
parentf487427a32f410ab5c97a4092865d32beb88ee27 (diff)
Rename packages from openecomp to onap.
This task is all about package name space change also make changes to pom for common module Change-Id: Ie9bda0f958a9a05826c0374830cc9cb7d6d196b6 Issue-ID: SDC-1272 Signed-off-by: amitjai <amitjai@amdocs.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-core')
-rw-r--r--openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-core/pom.xml4
-rw-r--r--openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-core/src/main/java/org/openecomp/sdc/model/impl/AbstractServiceModelDao.java20
2 files changed, 12 insertions, 12 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-core/pom.xml b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-core/pom.xml
index 906f3d8761..c65bcb0398 100644
--- a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-core/pom.xml
+++ b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-core/pom.xml
@@ -21,8 +21,8 @@
<version>${logback.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>${openecomp.sdc.common.version}</version>
</dependency>
diff --git a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-core/src/main/java/org/openecomp/sdc/model/impl/AbstractServiceModelDao.java b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-core/src/main/java/org/openecomp/sdc/model/impl/AbstractServiceModelDao.java
index 965bc89ca8..3d1c4553b3 100644
--- a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-core/src/main/java/org/openecomp/sdc/model/impl/AbstractServiceModelDao.java
+++ b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-core/src/main/java/org/openecomp/sdc/model/impl/AbstractServiceModelDao.java
@@ -30,9 +30,9 @@ import org.openecomp.core.utilities.file.FileUtils;
import org.openecomp.sdc.logging.api.Logger;
import org.openecomp.sdc.logging.api.LoggerFactory;
import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel;
-import org.openecomp.sdc.tosca.datatypes.model.Import;
+import org.onap.sdc.tosca.datatypes.model.Import;
import org.openecomp.sdc.tosca.datatypes.model.Old1610ServiceTemplate;
-import org.openecomp.sdc.tosca.services.ToscaExtensionYamlUtil;
+import org.onap.sdc.tosca.services.ToscaExtensionYamlUtil;
import org.openecomp.sdc.versioning.dao.VersionableDao;
import org.openecomp.sdc.versioning.dao.types.Version;
@@ -71,7 +71,7 @@ public class AbstractServiceModelDao implements VersionableDao {
FileContentHandler artifactFiles = getArtifacts(vspId, version);
- Map<String, org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate> serviceTemplates =
+ Map<String, org.onap.sdc.tosca.datatypes.model.ServiceTemplate> serviceTemplates =
getTemplates(vspId,
version);
String entryDefinitionServiceTemplate = getServiceBase(vspId, version);
@@ -107,7 +107,7 @@ public class AbstractServiceModelDao implements VersionableDao {
ServiceTemplate entityTmp;
String yaml;
- for (Map.Entry<String, org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate>
+ for (Map.Entry<String, org.onap.sdc.tosca.datatypes.model.ServiceTemplate>
entryTemplate : toscaServiceModel.getServiceTemplates().entrySet()) {
entityTmp = new ServiceTemplate();
@@ -153,7 +153,7 @@ public class AbstractServiceModelDao implements VersionableDao {
return templateDao.getBase(vspId, version);
}
- private Map<String, org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate> getTemplates(
+ private Map<String, org.onap.sdc.tosca.datatypes.model.ServiceTemplate> getTemplates(
String vspId,
Version version) {
@@ -165,13 +165,13 @@ public class AbstractServiceModelDao implements VersionableDao {
template -> getServiceTemplate(template.getContent())));
}
- private org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate getServiceTemplate(
+ private org.onap.sdc.tosca.datatypes.model.ServiceTemplate getServiceTemplate(
InputStream content) {
String serviceTemplateContent = new String(FileUtils.toByteArray(content));
try{
return new ToscaExtensionYamlUtil().yamlToObject(serviceTemplateContent,
- org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate.class);
+ org.onap.sdc.tosca.datatypes.model.ServiceTemplate.class);
}catch (Exception e){
log.debug("",e);
System.out.println("Found vsp with old-versioned tosca service template");
@@ -183,9 +183,9 @@ public class AbstractServiceModelDao implements VersionableDao {
}
}
- private static org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate mapOldSTToCurrentST(Old1610ServiceTemplate oldServiceTemplate){
- org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate
- serviceTemplate = new org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate();
+ private static org.onap.sdc.tosca.datatypes.model.ServiceTemplate mapOldSTToCurrentST(Old1610ServiceTemplate oldServiceTemplate){
+ org.onap.sdc.tosca.datatypes.model.ServiceTemplate
+ serviceTemplate = new org.onap.sdc.tosca.datatypes.model.ServiceTemplate();
serviceTemplate.setArtifact_types(oldServiceTemplate.getArtifact_types());
serviceTemplate.setCapability_types(oldServiceTemplate.getCapability_types());