From 485bacef37de06dbda4d8ba26b775b2a0ccff6bd Mon Sep 17 00:00:00 2001 From: Tal Gitelman Date: Mon, 30 Apr 2018 17:03:43 +0300 Subject: Remove dead code catalog-dao Change-Id: Id4383326458c328d2316c8e3599c87cf265ec415 Issue-ID: SDC-1270 Signed-off-by: Tal Gitelman --- .../sdc/be/dao/cassandra/AuditCassandraDao.java | 1 - .../org/openecomp/sdc/be/dao/impl/AuditingDao.java | 1 - .../openecomp/sdc/be/dao/impl/ESCatalogDAO.java | 1 - .../sdc/be/dao/titan/TitanGenericDao.java | 57 ---------------------- .../sdc/be/dao/titan/TitanGraphClient.java | 1 - .../org/openecomp/sdc/be/dao/utils/MapUtil.java | 3 -- .../sdc/be/resources/impl/ResourceUploader.java | 1 - .../sdc/be/resources/TitanGenericDaoTest.java | 3 -- 8 files changed, 68 deletions(-) (limited to 'catalog-dao/src') diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/cassandra/AuditCassandraDao.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/cassandra/AuditCassandraDao.java index 681d20cde3..1562f8a8d1 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/cassandra/AuditCassandraDao.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/cassandra/AuditCassandraDao.java @@ -36,7 +36,6 @@ import org.openecomp.sdc.be.resources.data.auditing.DistributionDeployEvent; import org.openecomp.sdc.be.resources.data.auditing.DistributionNotificationEvent; import org.openecomp.sdc.be.resources.data.auditing.DistributionStatusEvent; import org.openecomp.sdc.be.resources.data.auditing.ResourceAdminEvent; -import org.openecomp.sdc.common.config.EcompErrorName; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/impl/AuditingDao.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/impl/AuditingDao.java index dfa2b3ac4a..65f4314b26 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/impl/AuditingDao.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/impl/AuditingDao.java @@ -38,7 +38,6 @@ import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum; import org.openecomp.sdc.be.resources.data.auditing.AuditingGenericEvent; import org.openecomp.sdc.be.resources.data.auditing.AuditingTypesConstants; import org.openecomp.sdc.be.resources.data.auditing.ResourceAdminEvent; -import org.openecomp.sdc.common.config.EcompErrorName; import org.openecomp.sdc.common.datastructure.AuditingFieldsKeysEnum; import org.openecomp.sdc.common.datastructure.ESTimeBasedEvent; import org.slf4j.Logger; diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/impl/ESCatalogDAO.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/impl/ESCatalogDAO.java index 6a2600a3b2..985875e200 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/impl/ESCatalogDAO.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/impl/ESCatalogDAO.java @@ -39,7 +39,6 @@ import org.openecomp.sdc.be.dao.api.ResourceUploadStatus; import org.openecomp.sdc.be.resources.data.ESArtifactData; import org.openecomp.sdc.be.resources.exception.ResourceDAOException; import org.openecomp.sdc.common.api.HealthCheckInfo.HealthCheckStatus; -import org.openecomp.sdc.common.config.EcompErrorName; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/titan/TitanGenericDao.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/titan/TitanGenericDao.java index 1db807fa0e..9b9fa9c333 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/titan/TitanGenericDao.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/titan/TitanGenericDao.java @@ -796,35 +796,6 @@ public class TitanGenericDao { } } - private boolean vertexLeftNotContainsAllRightProps(Map leftProps, Map rightProps) { - - if (rightProps != null) { - - for (Entry entry : rightProps.entrySet()) { - String key = entry.getKey(); - Object leftValue = leftProps.get(key); - Object rightValue = entry.getValue(); - - if (leftValue == null) { - if (rightValue == null) { - return false; - } else { - continue; - } - } - - if (true == leftValue.equals(rightValue)) { - logger.trace("The value of key {} is differnet between properties. {} vs {}", key, leftValue, rightValue); - return false; - } - } - - } - - return true; - - } - public Either, TitanOperationStatus> getByCriteria(NodeTypeEnum type, Map props, Class clazz) { Either graph = titanClient.getGraph(); if (graph.isLeft()) { @@ -878,34 +849,6 @@ public class TitanGenericDao { } } - private boolean vertexLeftContainsRightProps(Map leftProps, Map rightProps) { - - if (rightProps != null) { - - for (Entry entry : rightProps.entrySet()) { - String key = entry.getKey(); - Object leftValue = leftProps.get(key); - Object rightValue = entry.getValue(); - if (leftValue == null) { - if (rightValue == null) { - continue; - } else { - logger.debug("The key {} cannot be found in the properties {}", key, leftProps); - return false; - } - } - - if (false == leftValue.equals(rightValue)) { - logger.trace("The value of key {} is differnet between properties. {} vs {} ", key, leftValue, rightValue); - return false; - } - } - - } - - return true; - } - public Either, TitanOperationStatus> getByCriteriaWithPredicate(NodeTypeEnum type, Map> props, Class clazz) { Either graph = titanClient.getGraph(); if (graph.isLeft()) { diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/titan/TitanGraphClient.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/titan/TitanGraphClient.java index 7d151f1a3e..6575e1f395 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/titan/TitanGraphClient.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/titan/TitanGraphClient.java @@ -40,7 +40,6 @@ import org.openecomp.sdc.be.config.ConfigurationManager; import org.openecomp.sdc.be.dao.DAOTitanStrategy; import org.openecomp.sdc.be.dao.TitanClientStrategy; import org.openecomp.sdc.be.dao.neo4j.GraphPropertiesDictionary; -import org.openecomp.sdc.common.config.EcompErrorName; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/utils/MapUtil.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/utils/MapUtil.java index 991fb0b29f..cd4cf38f1f 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/utils/MapUtil.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/utils/MapUtil.java @@ -22,11 +22,8 @@ package org.openecomp.sdc.be.dao.utils; import java.util.*; import java.util.function.Function; -import java.util.stream.Collector; import java.util.stream.Collectors; -import static java.util.stream.Collectors.groupingBy; - /** * Utility class to ease map manipulation. */ diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/impl/ResourceUploader.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/impl/ResourceUploader.java index 2c659ff527..e4642c821f 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/impl/ResourceUploader.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/impl/ResourceUploader.java @@ -30,7 +30,6 @@ import org.openecomp.sdc.be.dao.api.ResourceUploadStatus; import org.openecomp.sdc.be.resources.api.IResourceUploader; import org.openecomp.sdc.be.resources.data.ESArtifactData; import org.openecomp.sdc.be.resources.exception.ResourceDAOException; -import org.openecomp.sdc.common.config.EcompErrorName; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/TitanGenericDaoTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/TitanGenericDaoTest.java index 97ccb43959..6dede29977 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/TitanGenericDaoTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/TitanGenericDaoTest.java @@ -23,7 +23,6 @@ package org.openecomp.sdc.be.resources; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; import java.util.List; @@ -73,8 +72,6 @@ import com.thinkaurelius.titan.core.TitanFactory; import com.thinkaurelius.titan.core.TitanGraph; import com.thinkaurelius.titan.core.TitanVertex; import com.thinkaurelius.titan.core.attribute.Text; -import com.thinkaurelius.titan.core.schema.ConsistencyModifier; -import com.thinkaurelius.titan.core.schema.TitanGraphIndex; import com.thinkaurelius.titan.core.schema.TitanManagement; import fj.data.Either; -- cgit 1.2.3-korg