Upgrade datastax cassandra driver to 3.4.0

Upgrage zusammen to 1.0.0 which uses datastax cassandra driver 3.4.0

Change-Id: Ie7217986b67cd95de015daedd0f7106c2d0a972d
Issue-ID: SDC-1416
Signed-off-by: talig <talig@amdocs.com>

1 files changed, 0 insertions, 218 deletions

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;
-  }
-}