diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-model-lib')
20 files changed, 0 insertions, 1351 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/dao/EnrichedServiceArtifactDao.java b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/dao/EnrichedServiceArtifactDao.java deleted file mode 100644 index e25845d319..0000000000 --- a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/dao/EnrichedServiceArtifactDao.java +++ /dev/null @@ -1,28 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * SDC - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.openecomp.core.model.dao; - -import org.openecomp.core.model.types.ServiceArtifact; -import org.openecomp.sdc.versioning.dao.types.Version; - -public interface EnrichedServiceArtifactDao extends ServiceArtifactDaoInter { - ServiceArtifact getArtifactInfo(String vspId, Version version, String name); -} diff --git a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/dao/EnrichedServiceArtifactDaoFactory.java b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/dao/EnrichedServiceArtifactDaoFactory.java deleted file mode 100644 index 3852e983e5..0000000000 --- a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/dao/EnrichedServiceArtifactDaoFactory.java +++ /dev/null @@ -1,32 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * SDC - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.openecomp.core.model.dao; - -import org.openecomp.core.factory.api.AbstractComponentFactory; -import org.openecomp.core.factory.api.AbstractFactory; - -public abstract class EnrichedServiceArtifactDaoFactory - extends AbstractComponentFactory<EnrichedServiceArtifactDao> { - - public static EnrichedServiceArtifactDaoFactory getInstance() { - return AbstractFactory.getInstance(EnrichedServiceArtifactDaoFactory.class); - } -} diff --git a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/dao/EnrichedServiceTemplateDao.java b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/dao/EnrichedServiceTemplateDao.java deleted file mode 100644 index 631d10a9ee..0000000000 --- a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/dao/EnrichedServiceTemplateDao.java +++ /dev/null @@ -1,25 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * SDC - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.openecomp.core.model.dao; - -public interface EnrichedServiceTemplateDao extends ServiceTemplateDaoInter { - -} diff --git a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/dao/EnrichedServiceTemplateDaoFactory.java b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/dao/EnrichedServiceTemplateDaoFactory.java deleted file mode 100644 index cab3ca6247..0000000000 --- a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/dao/EnrichedServiceTemplateDaoFactory.java +++ /dev/null @@ -1,32 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * SDC - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.openecomp.core.model.dao; - -import org.openecomp.core.factory.api.AbstractComponentFactory; -import org.openecomp.core.factory.api.AbstractFactory; - -public abstract class EnrichedServiceTemplateDaoFactory - extends AbstractComponentFactory<EnrichedServiceTemplateDao> { - - public static EnrichedServiceTemplateDaoFactory getInstance() { - return AbstractFactory.getInstance(EnrichedServiceTemplateDaoFactory.class); - } -} diff --git a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/dao/ServiceArtifactDao.java b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/dao/ServiceArtifactDao.java deleted file mode 100644 index 48f59d06ae..0000000000 --- a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/dao/ServiceArtifactDao.java +++ /dev/null @@ -1,44 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * SDC - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.openecomp.core.model.dao; - -import org.openecomp.core.model.types.ServiceArtifact; -import org.openecomp.sdc.versioning.dao.types.Version; - -import java.util.Collection; - -public interface ServiceArtifactDao extends ServiceArtifactDaoInter { - - Collection<ServiceArtifact> list(String vspId, Version version); - - void create(ServiceArtifact entity); - - void update(ServiceArtifact entity); - - ServiceArtifact get(String vspId, Version version); - - void delete(String vspId, Version version); - - Object[] getKeys(String vspId, Version version); - - ServiceArtifact getArtifactInfo(String vspId, Version version, String name); - -} diff --git a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/dao/ServiceArtifactDaoFactory.java b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/dao/ServiceArtifactDaoFactory.java deleted file mode 100644 index 07c2191a7c..0000000000 --- a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/dao/ServiceArtifactDaoFactory.java +++ /dev/null @@ -1,32 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * SDC - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.openecomp.core.model.dao; - -import org.openecomp.core.factory.api.AbstractComponentFactory; -import org.openecomp.core.factory.api.AbstractFactory; - -public abstract class ServiceArtifactDaoFactory - extends AbstractComponentFactory<ServiceArtifactDao> { - - public static ServiceArtifactDaoFactory getInstance() { - return AbstractFactory.getInstance(ServiceArtifactDaoFactory.class); - } -} diff --git a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/dao/ServiceTemplateDao.java b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/dao/ServiceTemplateDao.java deleted file mode 100644 index c0c919b8a0..0000000000 --- a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/dao/ServiceTemplateDao.java +++ /dev/null @@ -1,44 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * SDC - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.openecomp.core.model.dao; - -import org.openecomp.core.model.types.ServiceTemplate; -import org.openecomp.sdc.versioning.dao.types.Version; - -import java.util.Collection; - -public interface ServiceTemplateDao extends ServiceTemplateDaoInter { - void create(ServiceTemplate entity); - - void update(ServiceTemplate entity); - - ServiceTemplate get(String vspId, Version version); - - void delete(String vspId, Version version); - - Object[] getKeys(String vspId, Version version); - - ServiceTemplate getTemplateInfo(String vspId, Version version, String name); - - Collection<ServiceTemplate> list(String vspId, Version version); - - String getBase(String vspId, Version version); -} diff --git a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/dao/ServiceTemplateDaoFactory.java b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/dao/ServiceTemplateDaoFactory.java deleted file mode 100644 index 65aad1bb97..0000000000 --- a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/dao/ServiceTemplateDaoFactory.java +++ /dev/null @@ -1,32 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * SDC - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.openecomp.core.model.dao; - -import org.openecomp.core.factory.api.AbstractComponentFactory; -import org.openecomp.core.factory.api.AbstractFactory; - -public abstract class ServiceTemplateDaoFactory - extends AbstractComponentFactory<ServiceTemplateDao> { - - public static ServiceTemplateDaoFactory getInstance() { - return AbstractFactory.getInstance(ServiceTemplateDaoFactory.class); - } -} diff --git a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/dao/ServiceTemplateDaoInter.java b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/dao/ServiceTemplateDaoInter.java deleted file mode 100644 index d132a5158b..0000000000 --- a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/dao/ServiceTemplateDaoInter.java +++ /dev/null @@ -1,48 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * SDC - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.openecomp.core.model.dao; - -import org.openecomp.core.model.types.ServiceTemplate; -import org.openecomp.sdc.versioning.dao.VersionableDao; -import org.openecomp.sdc.versioning.dao.types.Version; - -import java.util.Collection; - -public interface ServiceTemplateDaoInter extends VersionableDao { - void create(ServiceTemplate entity); - - void update(ServiceTemplate entity); - - ServiceTemplate get(String vspId, Version version); - - void delete(String vspId, Version version); - - Object[] getKeys(String vspId, Version version); - - ServiceTemplate getTemplateInfo(String vspId, Version version, String name); - - Collection<ServiceTemplate> list(String vspId, Version version); - - String getBase(String vspId, Version version); - - void deleteAll(String vspId, Version version); - -} 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 deleted file mode 100644 index 938b33b173..0000000000 --- a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-core/src/main/java/org/openecomp/sdc/model/impl/AbstractServiceModelDao.java +++ /dev/null @@ -1,218 +0,0 @@ -/* - * Copyright © 2018 European Support Limited - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. -*/ - -package org.openecomp.sdc.model.impl; - -import java.io.InputStream; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; -import org.onap.sdc.tosca.datatypes.model.Import; - -import org.onap.sdc.tosca.services.ToscaExtensionYamlUtil; -import org.openecomp.core.model.dao.ServiceArtifactDaoInter; -import org.openecomp.core.model.dao.ServiceTemplateDaoInter; -import org.openecomp.core.model.types.ServiceArtifact; -import org.openecomp.core.model.types.ServiceElement; -import org.openecomp.core.model.types.ServiceTemplate; -import org.openecomp.core.utilities.file.FileContentHandler; -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.Old1610ServiceTemplate; -import org.openecomp.sdc.versioning.dao.VersionableDao; -import org.openecomp.sdc.versioning.dao.types.Version; - -public class AbstractServiceModelDao implements VersionableDao { - - protected ServiceTemplateDaoInter templateDao; - protected ServiceArtifactDaoInter artifactDao; - - private final Logger log = LoggerFactory.getLogger(this.getClass()); - - @Override - public void registerVersioning(String versionableEntityType) { - templateDao.registerVersioning(versionableEntityType); - artifactDao.registerVersioning(versionableEntityType); - } - - /** - * Gets service model. - * - * @param vspId the vsp id - * @param version the version - * @return the service model - */ - public ToscaServiceModel getServiceModel(String vspId, Version version) { - if (vspId == null || version == null) { - throw new RuntimeException("missing service model key"); - } - - FileContentHandler artifactFiles = getArtifacts(vspId, version); - - Map<String, org.onap.sdc.tosca.datatypes.model.ServiceTemplate> serviceTemplates = - getTemplates(vspId, - version); - String entryDefinitionServiceTemplate = getServiceBase(vspId, version); - return new ToscaServiceModel(artifactFiles, serviceTemplates, entryDefinitionServiceTemplate); - } - - public void storeExternalArtifact(ServiceArtifact serviceArtifact) { - artifactDao.create(serviceArtifact); - } - - - /** - * Store service model. - * - * @param vspId the vsp id - * @param version the version - * @param toscaServiceModel the tosca service model - */ - public void storeServiceModel(String vspId, Version version, - ToscaServiceModel toscaServiceModel) { - ServiceArtifact entityArt; - - for (String fileName : toscaServiceModel.getArtifactFiles().getFileList()) { - entityArt = new ServiceArtifact(); - entityArt.setContentData( - FileUtils.toByteArray(toscaServiceModel.getArtifactFiles().getFileContent(fileName))); - entityArt.setVspId(vspId); - entityArt.setVersion(version); - entityArt.setName(fileName); - - artifactDao.create(entityArt); - } - - ServiceTemplate entityTmp; - String yaml; - for (Map.Entry<String, org.onap.sdc.tosca.datatypes.model.ServiceTemplate> - entryTemplate : toscaServiceModel.getServiceTemplates().entrySet()) { - entityTmp = new ServiceTemplate(); - - yaml = new ToscaExtensionYamlUtil().objectToYaml(entryTemplate.getValue()); - entityTmp.setContentData(yaml.getBytes()); - entityTmp.setVspId(vspId); - entityTmp.setVersion(version); - entityTmp.setName(entryTemplate.getKey()); - entityTmp.setBaseName(toscaServiceModel.getEntryDefinitionServiceTemplate()); - - templateDao.create(entityTmp); - } - } - - - /** - * Gets service model info. - * - * @param vspId the vsp id - * @param version the version - * @param name the name - * @return the service model info - */ - public ServiceElement getServiceModelInfo(String vspId, Version version, String name) { - ServiceElement element = templateDao.getTemplateInfo(vspId, version, name); - if (element != null) { - return element; - } - - element = artifactDao.getArtifactInfo(vspId, version, name); - if (element != null) { - return element; - } - return null; - } - - private String getServiceBase(String vspId, Version version) { - return templateDao.getBase(vspId, version); - } - - private Map<String, org.onap.sdc.tosca.datatypes.model.ServiceTemplate> getTemplates( - String vspId, - Version version) { - - Collection<ServiceTemplate> templates = templateDao.list(vspId, version); - if (templates == null) { - return null; - } - return templates.stream().collect(Collectors.toMap(template -> template.getName(), - template -> getServiceTemplate(template.getContent()))); - } - - 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.onap.sdc.tosca.datatypes.model.ServiceTemplate.class); - }catch (Exception e){ - log.warn("Found vsp with old-versioned tosca service template", e); - Old1610ServiceTemplate old1610ServiceTemplate = - new ToscaExtensionYamlUtil().yamlToObject(serviceTemplateContent, - Old1610ServiceTemplate.class); - - return mapOldSTToCurrentST(old1610ServiceTemplate); - } - } - - 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()); - serviceTemplate.setData_types(oldServiceTemplate.getData_types()); - serviceTemplate.setDescription(oldServiceTemplate.getDescription()); - serviceTemplate.setGroup_types(oldServiceTemplate.getGroup_types()); - serviceTemplate.setInterface_types(oldServiceTemplate.getInterface_types()); - serviceTemplate.setMetadata(oldServiceTemplate.getMetadata()); - serviceTemplate.setNode_types(oldServiceTemplate.getNode_types()); - serviceTemplate.setPolicy_types(oldServiceTemplate.getPolicy_types()); - serviceTemplate.setRelationship_types(oldServiceTemplate.getRelationship_types()); - serviceTemplate.setTopology_template(oldServiceTemplate.getTopology_template()); - - List<Map<String, Import>> imports = new ArrayList<>(); - for(Map.Entry<String, Import> importEntry : oldServiceTemplate.getImports().entrySet()){ - Map<String, Import> importMap = new HashMap<>(); - importMap.put(importEntry.getKey(), importEntry.getValue()); - imports.add(importMap); - } - serviceTemplate.setImports(imports); - - return serviceTemplate; - - } - - private FileContentHandler getArtifacts(String vspId, Version version) { - Collection<ServiceArtifact> templates = artifactDao.list(vspId, version); - if (templates == null) { - return null; - } - - FileContentHandler fileContentHandler = new FileContentHandler(); - templates.stream().forEach( - serviceArtifact -> fileContentHandler - .addFile(serviceArtifact.getName(), serviceArtifact.getContent())); - - return fileContentHandler; - } -} diff --git a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/src/main/java/org/openecomp/sdc/model/impl/EnrichedServiceArtifactDaoCassandraFactoryImpl.java b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/src/main/java/org/openecomp/sdc/model/impl/EnrichedServiceArtifactDaoCassandraFactoryImpl.java deleted file mode 100644 index 479668ec0c..0000000000 --- a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/src/main/java/org/openecomp/sdc/model/impl/EnrichedServiceArtifactDaoCassandraFactoryImpl.java +++ /dev/null @@ -1,35 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * SDC - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.openecomp.sdc.model.impl; - -import org.openecomp.core.model.dao.EnrichedServiceArtifactDao; -import org.openecomp.core.model.dao.EnrichedServiceArtifactDaoFactory; - -public class EnrichedServiceArtifactDaoCassandraFactoryImpl - extends EnrichedServiceArtifactDaoFactory { - private static final EnrichedServiceArtifactDao INSTANCE = - new EnrichedServiceArtifactDaoCassandraImpl(); - - @Override - public EnrichedServiceArtifactDao createInterface() { - return INSTANCE; - } -} diff --git a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/src/main/java/org/openecomp/sdc/model/impl/EnrichedServiceArtifactDaoCassandraImpl.java b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/src/main/java/org/openecomp/sdc/model/impl/EnrichedServiceArtifactDaoCassandraImpl.java deleted file mode 100644 index 4962ae37a2..0000000000 --- a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/src/main/java/org/openecomp/sdc/model/impl/EnrichedServiceArtifactDaoCassandraImpl.java +++ /dev/null @@ -1,140 +0,0 @@ -/* - * Copyright © 2016-2018 European Support Limited - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.openecomp.sdc.model.impl; - -import com.datastax.driver.core.ResultSet; -import com.datastax.driver.core.UDTValue; -import com.datastax.driver.mapping.Mapper; -import com.datastax.driver.mapping.Result; -import com.datastax.driver.mapping.UDTMapper; -import com.datastax.driver.mapping.annotations.Accessor; -import com.datastax.driver.mapping.annotations.Query; -import java.util.Collection; -import java.util.List; -import java.util.stream.Collectors; -import org.openecomp.core.model.dao.EnrichedServiceArtifactDao; -import org.openecomp.core.model.types.EnrichedServiceArtifactEntity; -import org.openecomp.core.model.types.ServiceArtifact; -import org.openecomp.core.nosqldb.api.NoSqlDb; -import org.openecomp.core.nosqldb.factory.NoSqlDbFactory; -import org.openecomp.sdc.versioning.ActionVersioningManagerFactory; -import org.openecomp.sdc.versioning.dao.types.Version; -import org.openecomp.sdc.versioning.types.VersionableEntityMetadata; - -public class EnrichedServiceArtifactDaoCassandraImpl implements EnrichedServiceArtifactDao { - - private static final NoSqlDb noSqlDb = NoSqlDbFactory.getInstance().createInterface(); - private static final Mapper<EnrichedServiceArtifactEntity> mapper = - noSqlDb.getMappingManager().mapper( - EnrichedServiceArtifactEntity.class); - private static final VspServiceArtifactAccessor accessor = - noSqlDb.getMappingManager().createAccessor( - VspServiceArtifactAccessor.class); - private static final UDTMapper<Version> versionMapper = - noSqlDb.getMappingManager().udtMapper(Version.class); - - @Override - public void registerVersioning(String versionableEntityType) { - ActionVersioningManagerFactory.getInstance().createInterface().register(versionableEntityType, - new VersionableEntityMetadata(mapper.getTableMetadata().getName(), - mapper.getTableMetadata().getPartitionKey().get(0).getName(), - mapper.getTableMetadata().getPartitionKey().get(1).getName())); - } - - @Override - public Collection<ServiceArtifact> list(String vspId, Version version) { - List<EnrichedServiceArtifactEntity> entityList; - if (vspId != null && version != null) { - entityList = accessor.list(vspId, versionMapper.toUDT(version)).all(); - } else { - entityList = accessor.listAll().all(); - } - - return entityList.stream().map(entity -> entity.getServiceArtifact()) - .collect(Collectors.toList()); - } - - @Override - public void create(ServiceArtifact entity) { - EnrichedServiceArtifactEntity vspEnrichedServiceArtifactEntity = - new EnrichedServiceArtifactEntity(entity); - mapper.save(vspEnrichedServiceArtifactEntity); - } - - @Override - public void update(ServiceArtifact entity) { - EnrichedServiceArtifactEntity vspEnrichedServiceArtifactEntity = - new EnrichedServiceArtifactEntity(entity); - mapper.save(vspEnrichedServiceArtifactEntity); - } - - @Override - public ServiceArtifact get(String vspId, Version version) { - return mapper.get(getKeys(vspId, version)).getServiceArtifact(); - } - - @Override - public void delete(String vspId, Version version) { - accessor.delete(vspId, versionMapper.toUDT(version)); - } - - @Override - public Object[] getKeys(String vspId, Version version) { - return new Object[]{vspId, versionMapper.toUDT(version)}; - } - - @Override - public ServiceArtifact getArtifactInfo(String vspId, Version version, String name) { - EnrichedServiceArtifactEntity enrichedServiceArtifactEntity = accessor.getArtifactInfo(vspId, - versionMapper.toUDT(version), name).one(); - if (enrichedServiceArtifactEntity == null) { - return null; - } - - return enrichedServiceArtifactEntity.getServiceArtifact(); - } - - @Override - public void deleteAll(String vspId, Version version) { - accessor.deleteAll(vspId, versionMapper.toUDT(version)); - } - - @Accessor - interface VspServiceArtifactAccessor { - - @Query("SELECT vsp_id, version, name ,content_data FROM vsp_enriched_service_artifact") - Result<EnrichedServiceArtifactEntity> listAll(); - - @Query( - "SELECT vsp_id, version, name ,content_data FROM " - + "vsp_enriched_service_artifact where vsp_id=? and version=? ") - Result<EnrichedServiceArtifactEntity> list(String vspId, UDTValue version); - - @Query( - "SELECT vsp_id,version,name,content_data FROM " - + "vsp_enriched_service_artifact where vsp_id=? and version=? and name=?") - Result<EnrichedServiceArtifactEntity> getArtifactInfo(String vspId, UDTValue version, - String name); - - @Query("DELETE from vsp_enriched_service_artifact where vsp_id=? and version=?") - ResultSet delete(String vspId, UDTValue version); - - @Query("DELETE FROM vsp_enriched_service_artifact where vsp_id=? and version=?") - ResultSet deleteAll(String vspId, UDTValue version); - } - -} diff --git a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/src/main/java/org/openecomp/sdc/model/impl/EnrichedServiceModelDaoImpl.java b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/src/main/java/org/openecomp/sdc/model/impl/EnrichedServiceModelDaoImpl.java deleted file mode 100644 index 3bf61e5b39..0000000000 --- a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/src/main/java/org/openecomp/sdc/model/impl/EnrichedServiceModelDaoImpl.java +++ /dev/null @@ -1,55 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * SDC - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.openecomp.sdc.model.impl; - -import org.openecomp.core.model.dao.EnrichedServiceArtifactDaoFactory; -import org.openecomp.core.model.dao.EnrichedServiceModelDao; -import org.openecomp.core.model.dao.EnrichedServiceTemplateDaoFactory; -import org.openecomp.core.model.types.ServiceElement; -import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel; -import org.openecomp.sdc.versioning.dao.types.Version; - -public class EnrichedServiceModelDaoImpl extends AbstractServiceModelDao - implements EnrichedServiceModelDao<ToscaServiceModel, ServiceElement> { - public EnrichedServiceModelDaoImpl() { - templateDao = EnrichedServiceTemplateDaoFactory.getInstance().createInterface(); - artifactDao = EnrichedServiceArtifactDaoFactory.getInstance().createInterface(); - } - - /*@Override - public List<ServiceArtifact> getExternalArtifacts(String vspId, Version version) { - return (List<ServiceArtifact>) artifactDao.list(vspId, version); - } -*/ - - @Override - public void deleteAll(String vspId, Version version) { - templateDao.deleteAll(vspId, version); - artifactDao.deleteAll(vspId, version); - } - - @Override - public void overrideServiceModel(String vspId, Version version, ToscaServiceModel serviceModel) { - storeServiceModel(vspId, version, serviceModel); - } - - -} diff --git a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/src/main/java/org/openecomp/sdc/model/impl/EnrichedServiceTemplateDaoCassandraFactoryImpl.java b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/src/main/java/org/openecomp/sdc/model/impl/EnrichedServiceTemplateDaoCassandraFactoryImpl.java deleted file mode 100644 index 14aa986bd8..0000000000 --- a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/src/main/java/org/openecomp/sdc/model/impl/EnrichedServiceTemplateDaoCassandraFactoryImpl.java +++ /dev/null @@ -1,35 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * SDC - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.openecomp.sdc.model.impl; - -import org.openecomp.core.model.dao.EnrichedServiceTemplateDao; -import org.openecomp.core.model.dao.EnrichedServiceTemplateDaoFactory; - -public class EnrichedServiceTemplateDaoCassandraFactoryImpl - extends EnrichedServiceTemplateDaoFactory { - private static final EnrichedServiceTemplateDao INSTANCE = - new EnrichedServiceTemplateDaoCassandraImpl(); - - @Override - public EnrichedServiceTemplateDao createInterface() { - return INSTANCE; - } -} diff --git a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/src/main/java/org/openecomp/sdc/model/impl/EnrichedServiceTemplateDaoCassandraImpl.java b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/src/main/java/org/openecomp/sdc/model/impl/EnrichedServiceTemplateDaoCassandraImpl.java deleted file mode 100644 index 2e28ac94f8..0000000000 --- a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/src/main/java/org/openecomp/sdc/model/impl/EnrichedServiceTemplateDaoCassandraImpl.java +++ /dev/null @@ -1,150 +0,0 @@ -/* - * Copyright © 2016-2018 European Support Limited - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.openecomp.sdc.model.impl; - -import com.datastax.driver.core.ResultSet; -import com.datastax.driver.core.UDTValue; -import com.datastax.driver.mapping.Mapper; -import com.datastax.driver.mapping.Result; -import com.datastax.driver.mapping.UDTMapper; -import com.datastax.driver.mapping.annotations.Accessor; -import com.datastax.driver.mapping.annotations.Query; -import java.util.Collection; -import java.util.List; -import java.util.stream.Collectors; -import org.openecomp.core.model.dao.EnrichedServiceTemplateDao; -import org.openecomp.core.model.types.EnrichedServiceTemplateEntity; -import org.openecomp.core.model.types.ServiceTemplate; -import org.openecomp.core.nosqldb.api.NoSqlDb; -import org.openecomp.core.nosqldb.factory.NoSqlDbFactory; -import org.openecomp.sdc.versioning.ActionVersioningManagerFactory; -import org.openecomp.sdc.versioning.dao.types.Version; -import org.openecomp.sdc.versioning.types.VersionableEntityMetadata; - -public class EnrichedServiceTemplateDaoCassandraImpl implements EnrichedServiceTemplateDao { - - private static final NoSqlDb noSqlDb = NoSqlDbFactory.getInstance().createInterface(); - private static final Mapper<EnrichedServiceTemplateEntity> mapper = - noSqlDb.getMappingManager().mapper( - EnrichedServiceTemplateEntity.class); - private static final VspServiceTemplateAccessor accessor = - noSqlDb.getMappingManager().createAccessor( - VspServiceTemplateAccessor.class); - private static final UDTMapper<Version> versionMapper = - noSqlDb.getMappingManager().udtMapper(Version.class); - - @Override - public void registerVersioning(String versionableEntityType) { - ActionVersioningManagerFactory.getInstance().createInterface().register(versionableEntityType, - new VersionableEntityMetadata(mapper.getTableMetadata().getName(), - mapper.getTableMetadata().getPartitionKey().get(0).getName(), - mapper.getTableMetadata().getPartitionKey().get(1).getName())); - } - - @Override - public void create(ServiceTemplate entity) { - EnrichedServiceTemplateEntity vspEnrichedServiceTemplateEntity = - new EnrichedServiceTemplateEntity(entity); - mapper.save(vspEnrichedServiceTemplateEntity); - } - - @Override - public void update(ServiceTemplate entity) { - EnrichedServiceTemplateEntity vspEnrichedServiceTemplateEntity = - new EnrichedServiceTemplateEntity(entity); - mapper.save(vspEnrichedServiceTemplateEntity); - } - - @Override - public ServiceTemplate get(String vspId, Version version) { - return (mapper.get(getKeys(vspId, version))).getServiceTemplate(); - } - - @Override - public void delete(String vspId, Version version) { - mapper.delete(vspId, version); - } - - @Override - public Object[] getKeys(String vspId, Version version) { - return new Object[]{vspId, versionMapper.toUDT(version)}; - } - - @Override - public ServiceTemplate getTemplateInfo(String vspId, Version version, String name) { - EnrichedServiceTemplateEntity enrichedServiceTemplateEntity = accessor.getTemplateInfo(vspId, - versionMapper.toUDT(version), name).one(); - if (enrichedServiceTemplateEntity == null) { - return null; - } - return enrichedServiceTemplateEntity.getServiceTemplate(); - } - - @Override - public Collection<ServiceTemplate> list(String vspId, Version version) { - - List<EnrichedServiceTemplateEntity> entityList = accessor.list(vspId, version).all(); - return entityList.stream().map(entity -> entity.getServiceTemplate()) - .collect(Collectors.toList()); - } - - @Override - public String getBase(String vspId, Version version) { - Result<EnrichedServiceTemplateEntity> element = - accessor.getBase(vspId, versionMapper.toUDT(version)); - if (element != null) { - EnrichedServiceTemplateEntity vspEnrichedServiceTemplateEntity = element.one(); - if (vspEnrichedServiceTemplateEntity != null) { - return element.one().getBaseName(); - } - } - return null; - } - - @Override - public void deleteAll(String vspId, Version version) { - accessor.deleteAll(vspId, versionMapper.toUDT(version)); - } - - @Accessor - interface VspServiceTemplateAccessor { - - @Query( - "SELECT vsp_id, version, name, base_name ,content_data FROM vsp_enriched_service_template") - Result<EnrichedServiceTemplateEntity> listAll(); - - @Query( - "SELECT vsp_id, version, name, base_name ,content_data FROM " - + "vsp_enriched_service_template where vsp_id=? and version=?") - Result<EnrichedServiceTemplateEntity> list(String vspId, Version version); - - @Query( - "SELECT vsp_id, version, name, base_name ,content_data FROM " - + "vsp_enriched_service_template where vsp_id=? and version=? and name=?") - Result<EnrichedServiceTemplateEntity> getTemplateInfo(String vspId, UDTValue version, - String name); - - @Query( - "SELECT vsp_id, version, name, base_name FROM " - + "vsp_enriched_service_template where vsp_id=? and version=?") - Result<EnrichedServiceTemplateEntity> getBase(String vspId, UDTValue version); - - @Query("DELETE FROM vsp_enriched_service_template where vsp_id = ? and version = ?") - ResultSet deleteAll(String vspId, UDTValue version); - } - -} diff --git a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/src/main/java/org/openecomp/sdc/model/impl/ServiceArtifactDaoCassandraFactoryImpl.java b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/src/main/java/org/openecomp/sdc/model/impl/ServiceArtifactDaoCassandraFactoryImpl.java deleted file mode 100644 index ee40dad385..0000000000 --- a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/src/main/java/org/openecomp/sdc/model/impl/ServiceArtifactDaoCassandraFactoryImpl.java +++ /dev/null @@ -1,33 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * SDC - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.openecomp.sdc.model.impl; - -import org.openecomp.core.model.dao.ServiceArtifactDao; -import org.openecomp.core.model.dao.ServiceArtifactDaoFactory; - -public class ServiceArtifactDaoCassandraFactoryImpl extends ServiceArtifactDaoFactory { - private static final ServiceArtifactDao INSTANCE = new ServiceArtifactDaoCassandraImpl(); - - @Override - public ServiceArtifactDao createInterface() { - return INSTANCE; - } -} diff --git a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/src/main/java/org/openecomp/sdc/model/impl/ServiceArtifactDaoCassandraImpl.java b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/src/main/java/org/openecomp/sdc/model/impl/ServiceArtifactDaoCassandraImpl.java deleted file mode 100644 index 84972342f8..0000000000 --- a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/src/main/java/org/openecomp/sdc/model/impl/ServiceArtifactDaoCassandraImpl.java +++ /dev/null @@ -1,142 +0,0 @@ -/* - * Copyright © 2016-2018 European Support Limited - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.openecomp.sdc.model.impl; - -import com.datastax.driver.core.ResultSet; -import com.datastax.driver.core.UDTValue; -import com.datastax.driver.mapping.Mapper; -import com.datastax.driver.mapping.Result; -import com.datastax.driver.mapping.UDTMapper; -import com.datastax.driver.mapping.annotations.Accessor; -import com.datastax.driver.mapping.annotations.Query; -import java.util.Collection; -import java.util.List; -import java.util.stream.Collectors; -import org.openecomp.core.model.dao.ServiceArtifactDao; -import org.openecomp.core.model.types.ServiceArtifact; -import org.openecomp.core.model.types.ServiceArtifactEntity; -import org.openecomp.core.nosqldb.api.NoSqlDb; -import org.openecomp.core.nosqldb.factory.NoSqlDbFactory; -import org.openecomp.sdc.versioning.ActionVersioningManagerFactory; -import org.openecomp.sdc.versioning.dao.types.Version; -import org.openecomp.sdc.versioning.types.VersionableEntityMetadata; - -public class ServiceArtifactDaoCassandraImpl implements ServiceArtifactDao { - - private static final NoSqlDb noSqlDb = NoSqlDbFactory.getInstance().createInterface(); - private static final Mapper<ServiceArtifactEntity> mapper = noSqlDb.getMappingManager().mapper( - ServiceArtifactEntity.class); - private static final VspServiceArtifactAccessor accessor = - noSqlDb.getMappingManager().createAccessor( - VspServiceArtifactAccessor.class); - private static final UDTMapper<Version> versionMapper = - noSqlDb.getMappingManager().udtMapper(Version.class); - - @Override - public void registerVersioning(String versionableEntityType) { - ActionVersioningManagerFactory.getInstance().createInterface().register(versionableEntityType, - new VersionableEntityMetadata(mapper.getTableMetadata().getName(), - mapper.getTableMetadata().getPartitionKey().get(0).getName(), - mapper.getTableMetadata().getPartitionKey().get(1).getName())); - } - - @Override - public Collection<ServiceArtifact> list(String vspId, Version version) { - List<ServiceArtifactEntity> entityList; - if (vspId != null && version != null) { - entityList = accessor.list(vspId, versionMapper.toUDT(version)).all(); - } else { - entityList = accessor.listAll().all(); - } - - return entityList.stream().map(entity -> entity.getServiceArtifact()) - .collect(Collectors.toList()); - } - - @Override - public void create(ServiceArtifact entity) { - ServiceArtifactEntity vspServiceArtifactEntity = new ServiceArtifactEntity(entity); - mapper.save(vspServiceArtifactEntity); - } - - @Override - public void update(ServiceArtifact entity) { - ServiceArtifactEntity vspServiceArtifactEntity = new ServiceArtifactEntity(entity); - mapper.save(vspServiceArtifactEntity); - } - - @Override - public ServiceArtifact get(String vspId, Version version) { - return mapper.get(getKeys(vspId, version)).getServiceArtifact(); - } - - @Override - public void delete(String vspId, Version version) { - accessor.delete(vspId, versionMapper.toUDT(version)); - } - - // @Override - // public void deleteArtifacts(String vspId, Version version){ - // accessor.delete(vspId, versionMapper.toUDT(version)); - // } - - @Override - public Object[] getKeys(String vspId, Version version) { - return new Object[]{vspId, versionMapper.toUDT(version)}; - } - - @Override - public ServiceArtifact getArtifactInfo(String vspId, Version version, String name) { - ServiceArtifactEntity serviceArtifactEntity = - accessor.getArtifactInfo(vspId, versionMapper.toUDT(version), - name).one(); - if (serviceArtifactEntity == null) { - return null; - } - - return serviceArtifactEntity.getServiceArtifact(); - } - - @Override - public void deleteAll(String vspId, Version version) { - accessor.deleteAll(vspId, versionMapper.toUDT(version)); - } - - @Accessor - interface VspServiceArtifactAccessor { - - @Query("SELECT vsp_id, version, name ,content_data FROM vsp_service_artifact") - Result<ServiceArtifactEntity> listAll(); - - @Query( - "SELECT vsp_id, version, name ,content_data " - + "FROM vsp_service_artifact where vsp_id=? and version=? ") - Result<ServiceArtifactEntity> list(String vspId, UDTValue version); - - @Query( - "SELECT vsp_id,version,name,content_data FROM" - + " vsp_service_artifact where vsp_id=? and version=? and name=?") - Result<ServiceArtifactEntity> getArtifactInfo(String vspId, UDTValue version, String name); - - @Query("DELETE from vsp_service_artifact where vsp_id=? and version=?") - ResultSet delete(String vspId, UDTValue version); - - @Query("DELETE FROM vsp_service_artifact where vsp_id=? and version=?") - ResultSet deleteAll(String vspId, UDTValue version); - } - -} diff --git a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/src/main/java/org/openecomp/sdc/model/impl/ServiceModelDaoImpl.java b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/src/main/java/org/openecomp/sdc/model/impl/ServiceModelDaoImpl.java deleted file mode 100644 index b9a703e96d..0000000000 --- a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/src/main/java/org/openecomp/sdc/model/impl/ServiceModelDaoImpl.java +++ /dev/null @@ -1,48 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * SDC - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.openecomp.sdc.model.impl; - -import org.openecomp.core.model.dao.ServiceArtifactDaoFactory; -import org.openecomp.core.model.dao.ServiceModelDao; -import org.openecomp.core.model.dao.ServiceTemplateDaoFactory; -import org.openecomp.core.model.types.ServiceElement; -import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel; -import org.openecomp.sdc.versioning.dao.types.Version; - -public class ServiceModelDaoImpl extends AbstractServiceModelDao - implements ServiceModelDao<ToscaServiceModel, ServiceElement> { - - public ServiceModelDaoImpl() { - templateDao = ServiceTemplateDaoFactory.getInstance().createInterface(); - artifactDao = ServiceArtifactDaoFactory.getInstance().createInterface(); - } - - @Override - public void deleteAll(String vspId, Version version) { - - } - - @Override - public void overrideServiceModel(String vspId, Version version, - ToscaServiceModel serviceModel) { - storeServiceModel(vspId, version, serviceModel); - } -} diff --git a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/src/main/java/org/openecomp/sdc/model/impl/ServiceTemplateDaoCassandraFactoryImpl.java b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/src/main/java/org/openecomp/sdc/model/impl/ServiceTemplateDaoCassandraFactoryImpl.java deleted file mode 100644 index bc249701f2..0000000000 --- a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/src/main/java/org/openecomp/sdc/model/impl/ServiceTemplateDaoCassandraFactoryImpl.java +++ /dev/null @@ -1,33 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * SDC - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.openecomp.sdc.model.impl; - -import org.openecomp.core.model.dao.ServiceTemplateDao; -import org.openecomp.core.model.dao.ServiceTemplateDaoFactory; - -public class ServiceTemplateDaoCassandraFactoryImpl extends ServiceTemplateDaoFactory { - private static final ServiceTemplateDao INSTANCE = new ServiceTemplateDaoCassandraImpl(); - - @Override - public ServiceTemplateDao createInterface() { - return INSTANCE; - } -} diff --git a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/src/main/java/org/openecomp/sdc/model/impl/ServiceTemplateDaoCassandraImpl.java b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/src/main/java/org/openecomp/sdc/model/impl/ServiceTemplateDaoCassandraImpl.java deleted file mode 100644 index 9db89414d2..0000000000 --- a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/src/main/java/org/openecomp/sdc/model/impl/ServiceTemplateDaoCassandraImpl.java +++ /dev/null @@ -1,145 +0,0 @@ -/* - * Copyright © 2016-2018 European Support Limited - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.openecomp.sdc.model.impl; - -import com.datastax.driver.core.ResultSet; -import com.datastax.driver.core.UDTValue; -import com.datastax.driver.mapping.Mapper; -import com.datastax.driver.mapping.Result; -import com.datastax.driver.mapping.UDTMapper; -import com.datastax.driver.mapping.annotations.Accessor; -import com.datastax.driver.mapping.annotations.Query; -import java.util.Collection; -import java.util.List; -import java.util.stream.Collectors; -import org.openecomp.core.model.dao.ServiceTemplateDao; -import org.openecomp.core.model.types.ServiceTemplate; -import org.openecomp.core.model.types.ServiceTemplateEntity; -import org.openecomp.core.nosqldb.api.NoSqlDb; -import org.openecomp.core.nosqldb.factory.NoSqlDbFactory; -import org.openecomp.sdc.versioning.ActionVersioningManagerFactory; -import org.openecomp.sdc.versioning.dao.types.Version; -import org.openecomp.sdc.versioning.types.VersionableEntityMetadata; - -public class ServiceTemplateDaoCassandraImpl implements ServiceTemplateDao { - - private static final NoSqlDb noSqlDb = NoSqlDbFactory.getInstance().createInterface(); - private static final Mapper<ServiceTemplateEntity> mapper = noSqlDb.getMappingManager().mapper( - ServiceTemplateEntity.class); - private static final VspServiceTemplateAccessor accessor = - noSqlDb.getMappingManager().createAccessor( - VspServiceTemplateAccessor.class); - private static final UDTMapper<Version> versionMapper = - noSqlDb.getMappingManager().udtMapper(Version.class); - - @Override - public void registerVersioning(String versionableEntityType) { - ActionVersioningManagerFactory.getInstance().createInterface().register(versionableEntityType, - new VersionableEntityMetadata(mapper.getTableMetadata().getName(), - mapper.getTableMetadata().getPartitionKey().get(0).getName(), - mapper.getTableMetadata().getPartitionKey().get(1).getName())); - } - - @Override - public void create(ServiceTemplate entity) { - ServiceTemplateEntity vspServiceTemplateEntity = new ServiceTemplateEntity(entity); - mapper.save(vspServiceTemplateEntity); - } - - @Override - public void update(ServiceTemplate entity) { - ServiceTemplateEntity vspServiceTemplateEntity = new ServiceTemplateEntity(entity); - mapper.save(vspServiceTemplateEntity); - } - - @Override - public ServiceTemplate get(String vspId, Version version) { - return (mapper.get(getKeys(vspId, version))).getServiceTemplate(); - } - - @Override - public void delete(String vspId, Version version) { - mapper.delete(vspId, version); - } - - @Override - public Object[] getKeys(String vspId, Version version) { - return new Object[]{vspId, versionMapper.toUDT(version)}; - } - - @Override - public ServiceTemplate getTemplateInfo(String vspId, Version version, String name) { - ServiceTemplateEntity serviceTemplateEntity = - accessor.getTemplateInfo(vspId, versionMapper.toUDT(version), - name).one(); - if (serviceTemplateEntity == null) { - return null; - } - return serviceTemplateEntity.getServiceTemplate(); - } - - @Override - public Collection<ServiceTemplate> list(String vspId, Version version) { - - List<ServiceTemplateEntity> entityList = accessor.list(vspId, version).all(); - return entityList.stream().map(entity -> entity.getServiceTemplate()) - .collect(Collectors.toList()); - } - - @Override - public String getBase(String vspId, Version version) { - Result<ServiceTemplateEntity> element = accessor.getBase(vspId, versionMapper.toUDT(version)); - if (element != null) { - ServiceTemplateEntity vspServiceTemplateEntity = element.one(); - if (vspServiceTemplateEntity != null) { - return element.one().getBaseName(); - } - } - return null; - } - - @Override - public void deleteAll(String vspId, Version version) { - accessor.deleteAll(vspId, versionMapper.toUDT(version)); - } - - @Accessor - interface VspServiceTemplateAccessor { - - @Query("SELECT vsp_id, version, name, base_name ,content_data FROM vsp_service_template") - Result<ServiceTemplateEntity> listAll(); - - @Query( - "SELECT vsp_id, version, name, base_name ,content_data" - + " FROM vsp_service_template where vsp_id=? and version=?") - Result<ServiceTemplateEntity> list(String vspId, Version version); - - @Query( - "SELECT vsp_id, version, name, base_name ,content_data" - + " FROM vsp_service_template where vsp_id=? and version=? and name=?") - Result<ServiceTemplateEntity> getTemplateInfo(String vspId, UDTValue version, String name); - - @Query( - "SELECT vsp_id, version, name, base_name" - + " FROM vsp_service_template where vsp_id=? and version=?") - Result<ServiceTemplateEntity> getBase(String vspId, UDTValue version); - - @Query("DELETE FROM vsp_service_template where vsp_id = ? and version = ?") - ResultSet deleteAll(String vspId, UDTValue version); - } - -} |