From 4dc878ccce1219a78cd64c3bdaee78421c68d11d Mon Sep 17 00:00:00 2001 From: talig Date: Mon, 11 Jun 2018 12:28:33 +0300 Subject: 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 --- .../dao/impl/EntitlementPoolCassandraDaoImpl.java | 148 --------------- .../dao/impl/FeatureGroupCassandraDaoImpl.java | 202 --------------------- .../dao/impl/LicenseAgreementCassandraDaoImpl.java | 156 ---------------- .../dao/impl/LicenseKeyGroupCassandraDaoImpl.java | 130 ------------- .../impl/VendorLicenseModelCassandraDaoImpl.java | 77 -------- 5 files changed, 713 deletions(-) delete mode 100644 openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/dao/impl/EntitlementPoolCassandraDaoImpl.java delete mode 100644 openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/dao/impl/FeatureGroupCassandraDaoImpl.java delete mode 100644 openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/dao/impl/LicenseAgreementCassandraDaoImpl.java delete mode 100644 openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/dao/impl/LicenseKeyGroupCassandraDaoImpl.java delete mode 100644 openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/dao/impl/VendorLicenseModelCassandraDaoImpl.java (limited to 'openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core') diff --git a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/dao/impl/EntitlementPoolCassandraDaoImpl.java b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/dao/impl/EntitlementPoolCassandraDaoImpl.java deleted file mode 100644 index ac43ed19fe..0000000000 --- a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/dao/impl/EntitlementPoolCassandraDaoImpl.java +++ /dev/null @@ -1,148 +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.vendorlicense.dao.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.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.Set; -import org.openecomp.core.dao.impl.CassandraBaseDao; -import org.openecomp.core.nosqldb.api.NoSqlDb; -import org.openecomp.core.nosqldb.factory.NoSqlDbFactory; -import org.openecomp.core.utilities.CommonMethods; -import org.openecomp.sdc.vendorlicense.VendorLicenseConstants; -import org.openecomp.sdc.vendorlicense.dao.EntitlementPoolDao; -import org.openecomp.sdc.vendorlicense.dao.types.EntitlementPoolEntity; -import org.openecomp.sdc.versioning.ActionVersioningManagerFactory; -import org.openecomp.sdc.versioning.dao.types.Version; -import org.openecomp.sdc.versioning.types.UniqueValueMetadata; -import org.openecomp.sdc.versioning.types.VersionableEntityMetadata; - -public class EntitlementPoolCassandraDaoImpl extends CassandraBaseDao - implements EntitlementPoolDao { - - private static NoSqlDb noSqlDb = NoSqlDbFactory.getInstance().createInterface(); - private static Mapper mapper = - noSqlDb.getMappingManager().mapper(EntitlementPoolEntity.class); - private static EntitlementPoolAccessor accessor = - noSqlDb.getMappingManager().createAccessor(EntitlementPoolAccessor.class); - private static UDTMapper versionMapper = - noSqlDb.getMappingManager().udtMapper(Version.class); - - @Override - public void registerVersioning(String versionableEntityType) { - VersionableEntityMetadata metadata = new VersionableEntityMetadata( - mapper.getTableMetadata().getName(), - mapper.getTableMetadata().getPartitionKey().get(0).getName(), - mapper.getTableMetadata().getPartitionKey().get(1).getName()); - - metadata.setUniqueValuesMetadata(Collections.singletonList( - new UniqueValueMetadata(VendorLicenseConstants.UniqueValues.ENTITLEMENT_POOL_NAME, - Arrays.asList(mapper.getTableMetadata().getPartitionKey().get(0).getName(), - mapper.getTableMetadata().getPartitionKey().get(1).getName(), "name")))); - - ActionVersioningManagerFactory.getInstance().createInterface() - .register(versionableEntityType, metadata); - } - - @Override - protected Mapper getMapper() { - return mapper; - } - - @Override - protected Object[] getKeys(EntitlementPoolEntity entity) { - return new Object[]{entity.getVendorLicenseModelId(), versionMapper.toUDT(entity.getVersion()), - entity.getId()}; - } - - @Override - public String getManufacturerReferenceNumber(EntitlementPoolEntity entitlementPoolEntity) { - return null; - } - - @Override - public Collection list(EntitlementPoolEntity entity) { - return accessor.listByVlmVersion(entity.getVendorLicenseModelId(), - versionMapper.toUDT(entity.getVersion())).all(); - } - - @Override - public long count(EntitlementPoolEntity entity) { - return accessor.countByVlmVersion(entity.getVendorLicenseModelId(), - versionMapper.toUDT(entity.getVersion())).one().getLong("count"); - } - - @Override - public void deleteAll(EntitlementPoolEntity entity) { - accessor.deleteByVlmVersion(entity.getVendorLicenseModelId(), - versionMapper.toUDT(entity.getVersion())).all(); - } - - @Override - public void addReferencingFeatureGroup(EntitlementPoolEntity entity, - String referencingFeatureGroupId) { - accessor - .addReferencingFeatureGroups(CommonMethods.toSingleElementSet(referencingFeatureGroupId), - entity.getVendorLicenseModelId(), versionMapper.toUDT(entity.getVersion()), - entity.getId()); - } - - @Override - public void removeReferencingFeatureGroup(EntitlementPoolEntity entity, - String referencingFeatureGroupId) { - accessor - .removeReferencingFeatureGroups(CommonMethods.toSingleElementSet(referencingFeatureGroupId), - entity.getVendorLicenseModelId(), versionMapper.toUDT(entity.getVersion()), - entity.getId()); - } - - @Accessor - interface EntitlementPoolAccessor { - - @Query("select * from entitlement_pool where vlm_id=? AND version=?") - Result listByVlmVersion(String vendorLicenseModelId, - UDTValue vendorLicenseModelVersion); - - @Query("delete from entitlement_pool where vlm_id=? AND version=?") - ResultSet deleteByVlmVersion(String vendorLicenseModelId, UDTValue vendorLicenseModelVersion); - - @Query("select count(1) from entitlement_pool where vlm_id=? AND version=?") - ResultSet countByVlmVersion(String vendorLicenseModelId, UDTValue vendorLicenseModelVersion); - - @Query( - "UPDATE entitlement_pool SET ref_fg_ids = ref_fg_ids + ? WHERE vlm_id=? AND version=? " - + " AND ep_id=?") - ResultSet addReferencingFeatureGroups(Set referencingFeatureGroups, - String vendorLicenseModelId, - UDTValue vendorLicenseModelVersion, String id); - - @Query( - "UPDATE entitlement_pool SET ref_fg_ids = ref_fg_ids - ? WHERE vlm_id=? AND version=? " - + "AND ep_id=?") - ResultSet removeReferencingFeatureGroups(Set referencingFeatureGroups, - String vendorLicenseModelId, - UDTValue vendorLicenseModelVersion, String id); - } -} diff --git a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/dao/impl/FeatureGroupCassandraDaoImpl.java b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/dao/impl/FeatureGroupCassandraDaoImpl.java deleted file mode 100644 index 3c804f3bfe..0000000000 --- a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/dao/impl/FeatureGroupCassandraDaoImpl.java +++ /dev/null @@ -1,202 +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.vendorlicense.dao.impl; - -import static org.openecomp.core.utilities.CommonMethods.toSingleElementSet; - -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.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.HashSet; -import java.util.Set; -import org.openecomp.core.dao.impl.CassandraBaseDao; -import org.openecomp.core.nosqldb.api.NoSqlDb; -import org.openecomp.core.nosqldb.factory.NoSqlDbFactory; -import org.openecomp.core.utilities.CommonMethods; -import org.openecomp.sdc.vendorlicense.VendorLicenseConstants; -import org.openecomp.sdc.vendorlicense.dao.FeatureGroupDao; -import org.openecomp.sdc.vendorlicense.dao.types.FeatureGroupEntity; -import org.openecomp.sdc.versioning.ActionVersioningManagerFactory; -import org.openecomp.sdc.versioning.dao.types.Version; -import org.openecomp.sdc.versioning.types.UniqueValueMetadata; -import org.openecomp.sdc.versioning.types.VersionableEntityMetadata; - -public class FeatureGroupCassandraDaoImpl extends CassandraBaseDao - implements FeatureGroupDao { - - private static NoSqlDb noSqlDb = NoSqlDbFactory.getInstance().createInterface(); - private static Mapper mapper = - noSqlDb.getMappingManager().mapper(FeatureGroupEntity.class); - private static FeatureGroupAccessor accessor = - noSqlDb.getMappingManager().createAccessor(FeatureGroupAccessor.class); - private static UDTMapper versionMapper = - noSqlDb.getMappingManager().udtMapper(Version.class); - - private static Set emptyIfNull(Set set) { - return set == null ? new HashSet<>() : set; - } - - @Override - public void registerVersioning(String versionableEntityType) { - VersionableEntityMetadata metadata = new VersionableEntityMetadata( - mapper.getTableMetadata().getName(), - mapper.getTableMetadata().getPartitionKey().get(0).getName(), - mapper.getTableMetadata().getPartitionKey().get(1).getName()); - - metadata.setUniqueValuesMetadata(Collections.singletonList( - new UniqueValueMetadata(VendorLicenseConstants.UniqueValues.FEATURE_GROUP_NAME, - Arrays.asList(mapper.getTableMetadata().getPartitionKey().get(0).getName(), - mapper.getTableMetadata().getPartitionKey().get(1).getName(), "name")))); - - ActionVersioningManagerFactory.getInstance().createInterface() - .register(versionableEntityType, metadata); - } - - @Override - protected Mapper getMapper() { - return mapper; - } - - @Override - protected Object[] getKeys(FeatureGroupEntity entity) { - return new Object[]{entity.getVendorLicenseModelId(), versionMapper.toUDT(entity.getVersion()), - entity.getId()}; - } - - @Override - public long count(FeatureGroupEntity entity) { - return accessor.countByVlmVersion(entity.getVendorLicenseModelId(), - versionMapper.toUDT(entity.getVersion())).one().getLong("count"); - } - - @Override - public void deleteAll(FeatureGroupEntity entity) { - accessor.deleteByVlmVersion(entity.getVendorLicenseModelId(), - versionMapper.toUDT(entity.getVersion())).all(); - } - - @Override - public void updateFeatureGroup(FeatureGroupEntity entity, - Set addedEntitlementPools, - Set removedEntitlementPools, - Set addedLicenseKeyGroups, - Set removedLicenseKeyGroups) { - accessor.updateColumnsAndDeltaFeatureGroupIds( - entity.getName(), - entity.getDescription(), - entity.getPartNumber(), - emptyIfNull(addedEntitlementPools), - emptyIfNull(removedEntitlementPools), - emptyIfNull(addedLicenseKeyGroups), - emptyIfNull(removedLicenseKeyGroups), - entity.getVendorLicenseModelId(), - versionMapper.toUDT(entity.getVersion()), - entity.getId() - ); - } - - @Override - public void addReferencingLicenseAgreement(FeatureGroupEntity entity, String licenseAgreementId) { - accessor.addReferencingLicenseAgreements(CommonMethods.toSingleElementSet(licenseAgreementId), - entity.getVendorLicenseModelId(), versionMapper.toUDT(entity.getVersion()), entity.getId()); - } - - @Override - public void removeReferencingLicenseAgreement(FeatureGroupEntity entity, - String licenseAgreementId) { - accessor - .removeReferencingLicenseAgreements(CommonMethods.toSingleElementSet(licenseAgreementId), - entity.getVendorLicenseModelId(), versionMapper.toUDT(entity.getVersion()), - entity.getId()); - } - - @Override - public void removeEntitlementPool(FeatureGroupEntity entity, String entitlementPoolId) { - accessor.removeEntitlementPools(toSingleElementSet(entitlementPoolId), - entity.getVendorLicenseModelId(), versionMapper.toUDT(entity.getVersion()), entity.getId()); - } - - @Override - public void removeLicenseKeyGroup(FeatureGroupEntity entity, String licenseKeyGroupId) { - accessor.removeLicenseKeyGroup(toSingleElementSet(licenseKeyGroupId), - entity.getVendorLicenseModelId(), versionMapper.toUDT(entity.getVersion()), entity.getId()); - } - - @Override - public Collection list(FeatureGroupEntity entity) { - return accessor.listByVlmVersion(entity.getVendorLicenseModelId(), - versionMapper.toUDT(entity.getVersion())).all(); - } - - @Accessor - interface FeatureGroupAccessor { - - @Query("select * from feature_group where vlm_id=? AND version=?") - Result listByVlmVersion(String vendorLicenseModelId, UDTValue version); - - @Query("select count(1) from feature_group where vlm_id=? AND version=?") - ResultSet countByVlmVersion(String vendorLicenseModelId, UDTValue vendorLicenseModelVersion); - - @Query("delete from feature_group where vlm_id=? AND version=?") - ResultSet deleteByVlmVersion(String vendorLicenseModelId, UDTValue vendorLicenseModelVersion); - - @Query( - "update feature_group set name=?,description=?, part_num=?, ep_ids=ep_ids+ ?," - + "ep_ids=ep_ids-?, lkg_ids=lkg_ids+?,lkg_ids=lkg_ids-? WHERE vlm_id=? AND version=? " - + "AND fg_id=?") - ResultSet updateColumnsAndDeltaFeatureGroupIds(String name, String description, - String partNumber, - Set addedEntitlementPools, - Set removedEntitlementPools, - Set addedLicenseKeyGroups, - Set removedLicenseKeyGroups, - String vendorLicenseModelId, UDTValue version, - String id); - - @Query( - "UPDATE feature_group SET ref_la_ids = ref_la_ids + ? WHERE vlm_id=? AND version=? " - + "AND fg_id=?") - ResultSet addReferencingLicenseAgreements(Set licenseAgreementIds, - String vendorLicenseModelId, UDTValue version, - String id); - - @Query( - "UPDATE feature_group SET ref_la_ids = ref_la_ids - ? WHERE vlm_id=? AND version=? AND " - + "fg_id=?") - ResultSet removeReferencingLicenseAgreements(Set licenseAgreementIds, - String vendorLicenseModelId, UDTValue version, - String id); - - @Query("UPDATE feature_group SET ep_ids = ep_ids - ? WHERE vlm_id=? AND version=? AND fg_id=?") - ResultSet removeEntitlementPools(Set entitlementPoolIds, String vendorLicenseModelId, - UDTValue version, String id); - - @Query( - "UPDATE feature_group SET lkg_ids = lkg_ids - ? WHERE vlm_id=? AND version=? AND fg_id=?") - ResultSet removeLicenseKeyGroup(Set licenseKeyGroupIds, String vendorLicenseModelId, - UDTValue version, String id); - - } -} - diff --git a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/dao/impl/LicenseAgreementCassandraDaoImpl.java b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/dao/impl/LicenseAgreementCassandraDaoImpl.java deleted file mode 100644 index 0ba9ca3899..0000000000 --- a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/dao/impl/LicenseAgreementCassandraDaoImpl.java +++ /dev/null @@ -1,156 +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.vendorlicense.dao.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.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.HashSet; -import java.util.Set; -import org.openecomp.core.dao.impl.CassandraBaseDao; -import org.openecomp.core.nosqldb.api.NoSqlDb; -import org.openecomp.core.nosqldb.factory.NoSqlDbFactory; -import org.openecomp.core.utilities.CommonMethods; -import org.openecomp.sdc.vendorlicense.VendorLicenseConstants; -import org.openecomp.sdc.vendorlicense.dao.LicenseAgreementDao; -import org.openecomp.sdc.vendorlicense.dao.types.ChoiceOrOther; -import org.openecomp.sdc.vendorlicense.dao.types.LicenseAgreementEntity; -import org.openecomp.sdc.versioning.ActionVersioningManagerFactory; -import org.openecomp.sdc.versioning.dao.types.Version; -import org.openecomp.sdc.versioning.types.UniqueValueMetadata; -import org.openecomp.sdc.versioning.types.VersionableEntityMetadata; - - -public class LicenseAgreementCassandraDaoImpl extends CassandraBaseDao - implements LicenseAgreementDao { - private static NoSqlDb noSqlDb = NoSqlDbFactory.getInstance().createInterface(); - private static Mapper mapper = - noSqlDb.getMappingManager().mapper(LicenseAgreementEntity.class); - private static LicenseAgreementAccessor accessor = - noSqlDb.getMappingManager().createAccessor(LicenseAgreementAccessor.class); - private static UDTMapper choiceOrOtherMapper = - noSqlDb.getMappingManager().udtMapper(ChoiceOrOther.class); - private static UDTMapper versionMapper = - noSqlDb.getMappingManager().udtMapper(Version.class); - - private static Set emptyIfNull(Set set) { - return set == null ? new HashSet<>() : set; - } - - @Override - public void registerVersioning(String versionableEntityType) { - VersionableEntityMetadata metadata = new VersionableEntityMetadata( - mapper.getTableMetadata().getName(), - mapper.getTableMetadata().getPartitionKey().get(0).getName(), - mapper.getTableMetadata().getPartitionKey().get(1).getName()); - - metadata.setUniqueValuesMetadata(Collections.singletonList( - new UniqueValueMetadata(VendorLicenseConstants.UniqueValues.LICENSE_AGREEMENT_NAME, - Arrays.asList(mapper.getTableMetadata().getPartitionKey().get(0).getName(), - mapper.getTableMetadata().getPartitionKey().get(1).getName(), "name")))); - - ActionVersioningManagerFactory.getInstance().createInterface() - .register(versionableEntityType, metadata); - } - - @Override - protected Mapper getMapper() { - return mapper; - } - - @Override - protected Object[] getKeys(LicenseAgreementEntity entity) { - return new Object[]{entity.getVendorLicenseModelId(), versionMapper.toUDT(entity.getVersion()), - entity.getId()}; - } - - @Override - public Collection list(LicenseAgreementEntity entity) { - return accessor.listByVlmVersion(entity.getVendorLicenseModelId(), - versionMapper.toUDT(entity.getVersion())).all(); - } - - @Override - public long count(LicenseAgreementEntity entity) { - return accessor.countByVlmVersion(entity.getVendorLicenseModelId(), - versionMapper.toUDT(entity.getVersion())).one().getLong("count"); - } - - @Override - public void deleteAll(LicenseAgreementEntity entity) { - accessor.deleteByVlmVersion(entity.getVendorLicenseModelId(), - versionMapper.toUDT(entity.getVersion())).all(); - } - - @Override - public void removeFeatureGroup(LicenseAgreementEntity licenseAgreement, String featureGroupId) { - accessor.removeFeatureGroup(CommonMethods.toSingleElementSet(featureGroupId), - licenseAgreement.getVendorLicenseModelId(), - versionMapper.toUDT(licenseAgreement.getVersion()), licenseAgreement.getId()); - } - - @Override - public void updateColumnsAndDeltaFeatureGroupIds(LicenseAgreementEntity licenseAgreement, - Set addedFeatureGroupIds, - Set removedFeatureGroupIds) { - accessor.updateColumnsAndDeltaFeatureGroupIds(licenseAgreement.getName(), - licenseAgreement.getDescription(), - licenseAgreement.getLicenseTerm() == null ? null - : choiceOrOtherMapper.toUDT(licenseAgreement.getLicenseTerm()), - licenseAgreement.getRequirementsAndConstrains(), - emptyIfNull(addedFeatureGroupIds), - emptyIfNull(removedFeatureGroupIds), - licenseAgreement.getVendorLicenseModelId(), - versionMapper.toUDT(licenseAgreement.getVersion()), - licenseAgreement.getId()); - - } - - @Accessor - interface LicenseAgreementAccessor { - - @Query("SELECT * FROM license_agreement WHERE vlm_id=? and version=?") - Result listByVlmVersion(String vendorLicenseModelId, UDTValue version); - - @Query("select count(1) from license_agreement where vlm_id=? AND version=?") - ResultSet countByVlmVersion(String vendorLicenseModelId, UDTValue vendorLicenseModelVersion); - - @Query("delete from license_agreement where vlm_id=? AND version=?") - ResultSet deleteByVlmVersion(String vendorLicenseModelId, UDTValue vendorLicenseModelVersion); - - @Query( - "UPDATE license_agreement SET name=?, description=?, lic_term=?, req_const=?, " - + "fg_ids=fg_ids+?, fg_ids=fg_ids-? WHERE vlm_id=? AND version=? AND la_id=?") - ResultSet updateColumnsAndDeltaFeatureGroupIds(String name, String description, - UDTValue licenseTerm, String reqAndConst, - Set addedFeatureGroupIds, - Set removedFeatureGroupIds, - String vendorLicenseModelId, UDTValue version, - String id); - - @Query("UPDATE license_agreement SET fg_ids=fg_ids-? WHERE vlm_id=? AND version=? AND la_id=?") - ResultSet removeFeatureGroup(Set featureGroupIds, String vendorLicenseModelId, - UDTValue version, String id); - } -} diff --git a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/dao/impl/LicenseKeyGroupCassandraDaoImpl.java b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/dao/impl/LicenseKeyGroupCassandraDaoImpl.java deleted file mode 100644 index fdd5716472..0000000000 --- a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/dao/impl/LicenseKeyGroupCassandraDaoImpl.java +++ /dev/null @@ -1,130 +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.vendorlicense.dao.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.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.Set; -import org.openecomp.core.dao.impl.CassandraBaseDao; -import org.openecomp.core.nosqldb.api.NoSqlDb; -import org.openecomp.core.nosqldb.factory.NoSqlDbFactory; -import org.openecomp.core.utilities.CommonMethods; -import org.openecomp.sdc.vendorlicense.VendorLicenseConstants; -import org.openecomp.sdc.vendorlicense.dao.LicenseKeyGroupDao; -import org.openecomp.sdc.vendorlicense.dao.types.LicenseKeyGroupEntity; -import org.openecomp.sdc.versioning.ActionVersioningManagerFactory; -import org.openecomp.sdc.versioning.dao.types.Version; -import org.openecomp.sdc.versioning.types.UniqueValueMetadata; -import org.openecomp.sdc.versioning.types.VersionableEntityMetadata; - - -public class LicenseKeyGroupCassandraDaoImpl extends CassandraBaseDao - implements LicenseKeyGroupDao { - private static NoSqlDb noSqlDb = NoSqlDbFactory.getInstance().createInterface(); - private static Mapper mapper = - noSqlDb.getMappingManager().mapper(LicenseKeyGroupEntity.class); - private static LicenseKeyGroupAccessor accessor = - noSqlDb.getMappingManager().createAccessor(LicenseKeyGroupAccessor.class); - private static UDTMapper versionMapper = - noSqlDb.getMappingManager().udtMapper(Version.class); - - @Override - public void registerVersioning(String versionableEntityType) { - VersionableEntityMetadata metadata = new VersionableEntityMetadata( - mapper.getTableMetadata().getName(), - mapper.getTableMetadata().getPartitionKey().get(0).getName(), - mapper.getTableMetadata().getPartitionKey().get(1).getName()); - - metadata.setUniqueValuesMetadata(Collections.singletonList( - new UniqueValueMetadata(VendorLicenseConstants.UniqueValues.LICENSE_KEY_GROUP_NAME, - Arrays.asList(mapper.getTableMetadata().getPartitionKey().get(0).getName(), - mapper.getTableMetadata().getPartitionKey().get(1).getName(), "name")))); - - ActionVersioningManagerFactory.getInstance().createInterface() - .register(versionableEntityType, metadata); - } - - @Override - protected Mapper getMapper() { - return mapper; - } - - @Override - protected Object[] getKeys(LicenseKeyGroupEntity entity) { - return new Object[]{entity.getVendorLicenseModelId(), versionMapper.toUDT(entity.getVersion()), - entity.getId()}; - } - - @Override - public Collection list(LicenseKeyGroupEntity entity) { - return accessor.listByVlmVersion(entity.getVendorLicenseModelId(), - versionMapper.toUDT(entity.getVersion())).all(); - } - - @Override - public long count(LicenseKeyGroupEntity licenseKeyGroup) { - return 0; - } - - @Override - public void deleteAll(LicenseKeyGroupEntity entity) { - accessor.deleteByVlmVersion(entity.getVendorLicenseModelId(), - versionMapper.toUDT(entity.getVersion())).all(); - } - - @Override - public void addReferencingFeatureGroup(LicenseKeyGroupEntity entity, String featureGroupId) { - accessor.addReferencingFeatureGroups(CommonMethods.toSingleElementSet(featureGroupId), - entity.getVendorLicenseModelId(), versionMapper.toUDT(entity.getVersion()), entity.getId()); - } - - @Override - public void removeReferencingFeatureGroup(LicenseKeyGroupEntity entity, String featureGroupId) { - accessor.removeReferencingFeatureGroups(CommonMethods.toSingleElementSet(featureGroupId), - entity.getVendorLicenseModelId(), versionMapper.toUDT(entity.getVersion()), entity.getId()); - } - - @Accessor - interface LicenseKeyGroupAccessor { - @Query("select * from license_key_group where vlm_id=? and version=?") - Result listByVlmVersion(String vendorLicenseModelId, UDTValue version); - - @Query("delete from license_key_group where vlm_id=? and version=?") - Result deleteByVlmVersion(String vendorLicenseModelId, UDTValue version); - - @Query( - "UPDATE license_key_group SET ref_fg_ids = ref_fg_ids + ? WHERE vlm_id=? AND version=? " - + "AND lkg_id=?") - ResultSet addReferencingFeatureGroups(Set referencingFeatureGroups, - String vendorLicenseModelId, UDTValue version, String id); - - @Query( - "UPDATE license_key_group SET ref_fg_ids = ref_fg_ids - ? WHERE vlm_id=? AND version=? " - + "AND lkg_id=?") - ResultSet removeReferencingFeatureGroups(Set referencingFeatureGroups, - String vendorLicenseModelId, UDTValue version, - String id); - } -} diff --git a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/dao/impl/VendorLicenseModelCassandraDaoImpl.java b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/dao/impl/VendorLicenseModelCassandraDaoImpl.java deleted file mode 100644 index 9574dac3d5..0000000000 --- a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/dao/impl/VendorLicenseModelCassandraDaoImpl.java +++ /dev/null @@ -1,77 +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.vendorlicense.dao.impl; - -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 org.openecomp.core.dao.impl.CassandraBaseDao; -import org.openecomp.core.nosqldb.api.NoSqlDb; -import org.openecomp.core.nosqldb.factory.NoSqlDbFactory; -import org.openecomp.sdc.vendorlicense.dao.VendorLicenseModelDao; -import org.openecomp.sdc.vendorlicense.dao.types.VendorLicenseModelEntity; -import org.openecomp.sdc.versioning.ActionVersioningManagerFactory; -import org.openecomp.sdc.versioning.dao.types.Version; -import org.openecomp.sdc.versioning.types.VersionableEntityMetadata; - -public class VendorLicenseModelCassandraDaoImpl extends CassandraBaseDao - implements - VendorLicenseModelDao { - - private static NoSqlDb noSqlDb = NoSqlDbFactory.getInstance().createInterface(); - private static Mapper mapper = - noSqlDb.getMappingManager().mapper(VendorLicenseModelEntity.class); - private static VendorLicenseModelAccessor accessor = - noSqlDb.getMappingManager().createAccessor(VendorLicenseModelAccessor.class); - private static UDTMapper 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 - protected Mapper getMapper() { - return mapper; - } - - @Override - protected Object[] getKeys(VendorLicenseModelEntity entity) { - return new Object[]{entity.getId(), versionMapper.toUDT(entity.getVersion())}; - } - - @Override - public Collection list(VendorLicenseModelEntity vendorLicenseModel) { - return accessor.getAll().all(); - } - - @Accessor - interface VendorLicenseModelAccessor { - - @Query("SELECT * FROM vendor_license_model") - Result getAll(); - - } -} -- cgit 1.2.3-korg