Remove dead code asdctool 89/45289/3
authorTal Gitelman <tg851x@intl.att.com>
Mon, 30 Apr 2018 16:06:20 +0000 (19:06 +0300)
committerYuli Shlosberg <ys9693@att.com>
Tue, 1 May 2018 11:31:43 +0000 (11:31 +0000)
Change-Id: I467f70b442a02a15b8a18b160309bac9a8ab3f9a
Issue-ID: SDC-1270
Signed-off-by: Tal Gitelman <tg851x@intl.att.com>
40 files changed:
asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/ArtifactUuidFix.java
asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/GraphMLConverter.java
asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/ArtifactToolBL.java
asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/ValidationToolBL.java
asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/executers/TopologyTemplateValidatorExecuter.java
asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/tasks/artifacts/VfArtifactValidationTask.java
asdctool/src/main/java/org/openecomp/sdc/asdctool/main/ArtifactValidatorTool.java
asdctool/src/main/java/org/openecomp/sdc/asdctool/main/DataSchemaMenu.java
asdctool/src/main/java/org/openecomp/sdc/asdctool/main/EsToCassandraDataMigrationMenu.java
asdctool/src/main/java/org/openecomp/sdc/asdctool/main/RemoveUtils.java
asdctool/src/main/java/org/openecomp/sdc/asdctool/main/UpdateIsVnfMenu.java
asdctool/src/main/java/org/openecomp/sdc/asdctool/main/ValidationTool.java
asdctool/src/main/java/org/openecomp/sdc/asdctool/migration/tasks/mig1710/UpgradeMigration1710.java
asdctool/src/main/java/org/openecomp/sdc/asdctool/servlets/ExportImportTitanServlet.java
asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/config/ValidationConfigManagerTest.java
asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/config/ValidationToolConfigurationTest.java
asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/executers/ServiceValidatorExecuterTest.java
asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/executers/TopologyTemplateValidatorExecuterTest.java
asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/executers/VfValidatorExecuterTest.java
asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/tasks/artifacts/ArtifactsVertexResultTest.java
asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/utils/ElementTypeEnumTest.java
asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/utils/ValidationTaskResultTest.java
asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/utils/VertexResultTest.java
asdctool/src/test/java/org/openecomp/sdc/asdctool/migration/core/DBVersionTest.java
asdctool/src/test/java/org/openecomp/sdc/asdctool/migration/core/SdcMigrationToolTest.java
asdctool/src/test/java/org/openecomp/sdc/asdctool/migration/core/execution/MigrationExecutorImplTest.java
asdctool/src/test/java/org/openecomp/sdc/asdctool/migration/core/task/MigrationResultTest.java
asdctool/src/test/java/org/openecomp/sdc/asdctool/migration/resolver/SpringBeansMigrationResolverTest.java
asdctool/src/test/java/org/openecomp/sdc/asdctool/migration/service/SdcRepoServiceTest.java
asdctool/src/test/java/org/openecomp/sdc/asdctool/migration/task/MigrationTasksTest.java
asdctool/src/test/java/org/openecomp/sdc/asdctool/servlets/EntryPointTest.java
catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentInstanceBusinessLogic.java
catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/GroupBusinessLogic.java
catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceBusinessLogic.java
catalog-be/src/main/java/org/openecomp/sdc/be/components/lifecycle/LifecycleBusinessLogic.java
catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/GraphLockOperation.java
catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/GroupInstanceOperation.java
catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/PropertyOperation.java
openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-core/src/main/java/org/openecomp/sdc/generator/core/services/ManualVspToscaGenerationService.java
openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-core/src/main/java/org/openecomp/sdc/versioning/impl/VersionCalculatorImpl.java

index 5d4610c..d413c3f 100644 (file)
@@ -330,7 +330,7 @@ public class ArtifactUuidFix {
                return true;
        }
 
-       private boolean isProblematicService( Service service, String serviceName) throws IOException {
+       private boolean isProblematicService( Service service, String serviceName) {
                
                List<ComponentInstance> componentInstances = service.getComponentInstances();
                
index 7bea2ea..b692541 100644 (file)
@@ -457,8 +457,6 @@ public class GraphMLConverter {
                                        } catch (Exception e) {
                                                e.printStackTrace();
 
-                                               GraphPropertiesDictionary[] values = GraphPropertiesDictionary.values();
-
                                                Object property1 = vertex.value(GraphPropertiesDictionary.HEALTH_CHECK.getProperty());
                                                System.out.println(property1);
 
index 341a56f..f702364 100644 (file)
@@ -16,12 +16,8 @@ public class ArtifactToolBL {
            @Autowired
            protected List<IArtifactValidatorExecuter> validators;
 
-           @Autowired
-           protected ReportManager reportManager;
-
            private boolean allValid = true;
 
-
            public boolean validateAll() {
                for (IArtifactValidatorExecuter validatorExec: validators) {
                    System.out.println("ValidatorExecuter "+validatorExec.getName()+" started");
index e373107..9406351 100644 (file)
@@ -20,12 +20,8 @@ public class ValidationToolBL {
     @Autowired
     protected List<ValidatorExecuter> validators;
 
-    @Autowired
-    protected ReportManager reportManager;
-
     private boolean allValid = true;
 
-
     public boolean validateAll() {
         for (ValidatorExecuter validatorExec: validators) {
             System.out.println("ValidatorExecuter "+validatorExec.getName()+" started");
index 04f014f..f875aa4 100644 (file)
@@ -34,9 +34,6 @@ public class TopologyTemplateValidatorExecuter {
     @Autowired
     protected TitanDao titanDao;
 
-    @Autowired
-    protected TopologyTemplateOperation topologyTemplateOperation;
-
     protected String name;
 
     public void setName(String name) {
index bb25d25..1c18fb7 100644 (file)
@@ -15,9 +15,6 @@ public class VfArtifactValidationTask extends VfValidationTask {
     @Autowired
     ArtifactValidationUtils artifactValidationUtils;
 
-    @Autowired
-    protected TopologyTemplateOperation topologyTemplateOperation;
-
     public VfArtifactValidationTask() {
         this.name = "VF Artifact Validation Task";
     }
index 5ae543c..b1180f9 100644 (file)
@@ -15,7 +15,7 @@ import org.springframework.context.annotation.AnnotationConfigApplicationContext
 public class ArtifactValidatorTool {
        private static Logger log = LoggerFactory.getLogger(ValidationTool.class.getName());
        
-       public static void main(String[] args) throws Exception {
+       public static void main(String[] args) {
 
         String outputPath = args[0];
         ValidationConfigManager.setOutputFullFilePath(outputPath);
index 2fb3270..b0e3dbe 100644 (file)
@@ -33,7 +33,7 @@ public class DataSchemaMenu {
 
        private static Logger log = LoggerFactory.getLogger(DataSchemaMenu.class.getName());
 
-       public static void main(String[] args) throws Exception {
+       public static void main(String[] args) {
 
                String operation = args[0];
 
index 0bac1df..f791098 100644 (file)
@@ -34,7 +34,7 @@ public class EsToCassandraDataMigrationMenu {
 
        private static Logger log = LoggerFactory.getLogger(EsToCassandraDataMigrationMenu.class.getName());
 
-       public static void main(String[] args) throws Exception {
+       public static void main(String[] args) {
 
                if (args == null || args.length < 2) {
                        usageAndExit();
index ddece75..5546300 100644 (file)
@@ -27,7 +27,7 @@ import org.openecomp.sdc.asdctool.impl.ProductLogic;
  */
 public class RemoveUtils {
 
-       public static void main(String[] args) throws Exception {
+       public static void main(String[] args) {
 
                if (args == null || args.length < 1) {
                        removeUsage();
index dce9f9c..b9a1e17 100644 (file)
@@ -45,7 +45,7 @@ public class UpdateIsVnfMenu {
                                "Usage: updateIsVnfTrue <titan.properties> <systemServiceName1,systemServiceName2,...,systemServiceNameN>");
        }
 
-       public static void main(String[] args) throws Exception {
+       public static void main(String[] args) {
 
                if (args == null || args.length < 1) {
                        usageAndExit();
index 51e2d50..e07b3af 100644 (file)
@@ -19,7 +19,7 @@ public class ValidationTool {
 
     private static Logger log = LoggerFactory.getLogger(ValidationTool.class.getName());
 
-    public static void main(String[] args) throws Exception {
+    public static void main(String[] args) {
 
         String outputPath = args[0];
         ValidationConfigManager.setOutputFullFilePath(outputPath);
index ca8c4c8..e6acb7a 100644 (file)
@@ -803,21 +803,6 @@ public class UpgradeMigration1710 implements PostMigration {
         return titanDao.getByCriteria(vertexType, propertiesToMatch, propertiesNotToMatch, JsonParseFlagEnum.ParseMetadata);
     }
 
-    protected Either<List<String>, TitanOperationStatus> findResourcesPathRecursively(GraphVertex nodeTypeV, List<String> allCertifiedUids) {
-        Either<List<GraphVertex>, TitanOperationStatus> parentResourceRes = titanDao.getParentVertecies(nodeTypeV, EdgeLabelEnum.DERIVED_FROM, JsonParseFlagEnum.ParseMetadata);
-        if (parentResourceRes.isRight()) {
-            return Either.right(parentResourceRes.right().value());
-        }
-        List<GraphVertex> derivedResourcesUid = new ArrayList<>();
-        for (GraphVertex chV : parentResourceRes.left().value()) {
-            Optional<String> op = allCertifiedUids.stream().filter(id -> id.equals((String) chV.getJsonMetadataField(JsonPresentationFields.UNIQUE_ID))).findAny();
-            if (op.isPresent()) {
-                derivedResourcesUid.add(chV);
-            }
-        }
-        return null;
-    }
-
     private Either<List<GraphVertex>, StorageOperationStatus> getLatestByName(GraphPropertyEnum property, String nodeName) {
 
         Map<GraphPropertyEnum, Object> propertiesToMatch = new EnumMap<>(GraphPropertyEnum.class);
index 898bd96..9d40354 100644 (file)
@@ -161,8 +161,6 @@ public class ExportImportTitanServlet {
                        // graph.commit();
                        graph.tx().commit();
 
-                       String exportedGraph = out.toString();
-
                        result = outputFile;
 
                } catch (Exception e) {
index 6adbdcc..1dd5926 100644 (file)
@@ -13,7 +13,7 @@ public class ValidationConfigManagerTest {
 
        
        @Test
-       public void testGetOutputFilePath() throws Exception {
+       public void testGetOutputFilePath() {
                String result;
 
                // default test
@@ -21,7 +21,7 @@ public class ValidationConfigManagerTest {
        }
        
        @Test
-       public void testGetCsvReportFilePath() throws Exception {
+       public void testGetCsvReportFilePath() {
                String result;
 
                // default test
@@ -30,7 +30,7 @@ public class ValidationConfigManagerTest {
 
        
        @Test
-       public void testSetCsvReportFilePath() throws Exception {
+       public void testSetCsvReportFilePath() {
                String outputPath = "";
 
                // default test
@@ -39,7 +39,7 @@ public class ValidationConfigManagerTest {
 
        
        @Test
-       public void testSetValidationConfiguration() throws Exception {
+       public void testSetValidationConfiguration() {
                String path = "";
                Properties result;
 
@@ -49,7 +49,7 @@ public class ValidationConfigManagerTest {
 
        
        @Test
-       public void testGetValidationConfiguration() throws Exception {
+       public void testGetValidationConfiguration() {
                Properties result;
 
                // default test
index fb91654..8dc2c4f 100644 (file)
@@ -32,7 +32,7 @@ public class ValidationToolConfigurationTest {
 
        
        @Test
-       public void testBasicServiceValidator() throws Exception {
+       public void testBasicServiceValidator() {
                ValidationToolConfiguration testSubject;
                ServiceValidatorExecuter result;
 
@@ -43,7 +43,7 @@ public class ValidationToolConfigurationTest {
 
        
        @Test
-       public void testVfArtifactValidationTask() throws Exception {
+       public void testVfArtifactValidationTask() {
                ValidationToolConfiguration testSubject;
                VfArtifactValidationTask result;
 
@@ -54,7 +54,7 @@ public class ValidationToolConfigurationTest {
 
        
        @Test
-       public void testServiceArtifactValidationTask() throws Exception {
+       public void testServiceArtifactValidationTask() {
                ValidationToolConfiguration testSubject;
                ServiceArtifactValidationTask result;
 
@@ -65,7 +65,7 @@ public class ValidationToolConfigurationTest {
 
        
        @Test
-       public void testModuleJsonTask() throws Exception {
+       public void testModuleJsonTask() {
                ValidationToolConfiguration testSubject;
                ModuleJsonTask result;
 
@@ -76,7 +76,7 @@ public class ValidationToolConfigurationTest {
 
        
        @Test
-       public void testValidationToolBL() throws Exception {
+       public void testValidationToolBL() {
                ValidationToolConfiguration testSubject;
                ValidationToolBL result;
 
@@ -87,7 +87,7 @@ public class ValidationToolConfigurationTest {
 
        
        @Test
-       public void testBasicVfValidator() throws Exception {
+       public void testBasicVfValidator() {
                ValidationToolConfiguration testSubject;
                VfValidatorExecuter result;
 
@@ -97,7 +97,7 @@ public class ValidationToolConfigurationTest {
        }
        
        @Test
-       public void testArtifactCassandraDao() throws Exception {
+       public void testArtifactCassandraDao() {
                ValidationToolConfiguration testSubject;
                ArtifactCassandraDao result;
 
@@ -108,7 +108,7 @@ public class ValidationToolConfigurationTest {
 
        
        @Test
-       public void testArtifactValidationUtils() throws Exception {
+       public void testArtifactValidationUtils() {
                ValidationToolConfiguration testSubject;
                ArtifactValidationUtils result;
 
@@ -119,7 +119,7 @@ public class ValidationToolConfigurationTest {
 
        
        @Test
-       public void testJsonGroupsOperation() throws Exception {
+       public void testJsonGroupsOperation() {
                ValidationToolConfiguration testSubject;
                GroupsOperation result;
 
@@ -130,7 +130,7 @@ public class ValidationToolConfigurationTest {
 
        
        @Test
-       public void testCassandraClient() throws Exception {
+       public void testCassandraClient() {
                ValidationToolConfiguration testSubject;
                CassandraClient result;
 
@@ -141,7 +141,7 @@ public class ValidationToolConfigurationTest {
 
        
        @Test
-       public void testDaoStrategy() throws Exception {
+       public void testDaoStrategy() {
                ValidationToolConfiguration testSubject;
                TitanClientStrategy result;
 
@@ -155,7 +155,7 @@ public class ValidationToolConfigurationTest {
 
        
        @Test
-       public void testToscaOperationFacade() throws Exception {
+       public void testToscaOperationFacade() {
                ValidationToolConfiguration testSubject;
                ToscaOperationFacade result;
 
@@ -166,7 +166,7 @@ public class ValidationToolConfigurationTest {
 
        
        @Test
-       public void testNodeTypeOperation() throws Exception {
+       public void testNodeTypeOperation() {
                ValidationToolConfiguration testSubject;
                DerivedNodeTypeResolver migrationDerivedNodeTypeResolver = null;
                NodeTypeOperation result;
@@ -178,7 +178,7 @@ public class ValidationToolConfigurationTest {
 
        
        @Test
-       public void testTopologyTemplateOperation() throws Exception {
+       public void testTopologyTemplateOperation() {
                ValidationToolConfiguration testSubject;
                TopologyTemplateOperation result;
 
@@ -192,7 +192,7 @@ public class ValidationToolConfigurationTest {
 
        
        @Test
-       public void testMigrationDerivedNodeTypeResolver() throws Exception {
+       public void testMigrationDerivedNodeTypeResolver() {
                ValidationToolConfiguration testSubject;
                DerivedNodeTypeResolver result;
 
@@ -203,7 +203,7 @@ public class ValidationToolConfigurationTest {
 
        
        @Test
-       public void testTitanDao() throws Exception {
+       public void testTitanDao() {
                ValidationToolConfiguration testSubject;
                TitanGraphClient titanGraphClient = null;
                TitanDao result;
@@ -215,7 +215,7 @@ public class ValidationToolConfigurationTest {
 
        
        @Test
-       public void testCategoryOperation() throws Exception {
+       public void testCategoryOperation() {
                ValidationToolConfiguration testSubject;
                CategoryOperation result;
 
@@ -226,7 +226,7 @@ public class ValidationToolConfigurationTest {
 
        
        @Test
-       public void testArtifactsOperation() throws Exception {
+       public void testArtifactsOperation() {
                ValidationToolConfiguration testSubject;
                ArtifactsOperations result;
 
@@ -237,7 +237,7 @@ public class ValidationToolConfigurationTest {
 
        
        @Test
-       public void testToscaDataOperation() throws Exception {
+       public void testToscaDataOperation() {
                ValidationToolConfiguration testSubject;
                ToscaDataOperation result;
 
@@ -248,7 +248,7 @@ public class ValidationToolConfigurationTest {
 
        
        @Test
-       public void testToscaElementLifecycleOperation() throws Exception {
+       public void testToscaElementLifecycleOperation() {
                ValidationToolConfiguration testSubject;
                ToscaElementLifecycleOperation result;
 
index 05acd9a..890bdfd 100644 (file)
@@ -14,7 +14,7 @@ public class ServiceValidatorExecuterTest {
 
        
        @Test
-       public void testGetName() throws Exception {
+       public void testGetName() {
                ServiceValidatorExecuter testSubject;
                String result;
 
index 3747d7f..f3fdebe 100644 (file)
@@ -11,7 +11,7 @@ public class TopologyTemplateValidatorExecuterTest {
 
        
        @Test
-       public void testSetName() throws Exception {
+       public void testSetName() {
                TopologyTemplateValidatorExecuter testSubject;
                String name = "";
 
@@ -22,7 +22,7 @@ public class TopologyTemplateValidatorExecuterTest {
 
        
        @Test
-       public void testGetName() throws Exception {
+       public void testGetName() {
                TopologyTemplateValidatorExecuter testSubject;
                String result;
 
index 12136df..83dac8a 100644 (file)
@@ -12,7 +12,7 @@ public class VfValidatorExecuterTest {
 
        
        @Test
-       public void testGetName() throws Exception {
+       public void testGetName() {
                VfValidatorExecuter testSubject;
                String result;
 
index 8ba509c..d16c3fc 100644 (file)
@@ -11,7 +11,7 @@ public class ArtifactsVertexResultTest {
 
        
        @Test
-       public void testAddNotFoundArtifact() throws Exception {
+       public void testAddNotFoundArtifact() {
                ArtifactsVertexResult testSubject;
                String artifactId = "";
 
@@ -22,7 +22,7 @@ public class ArtifactsVertexResultTest {
 
        
        @Test
-       public void testGetResult() throws Exception {
+       public void testGetResult() {
                ArtifactsVertexResult testSubject;
                String result;
 
index 7467699..e6e564e 100644 (file)
@@ -13,7 +13,7 @@ public class ElementTypeEnumTest {
 
        
        @Test
-       public void testGetByType() throws Exception {
+       public void testGetByType() {
                String elementType = "";
                ElementTypeEnum result;
 
@@ -23,7 +23,7 @@ public class ElementTypeEnumTest {
 
        
        @Test
-       public void testGetAllTypes() throws Exception {
+       public void testGetAllTypes() {
                List<String> result;
 
                // default test
@@ -32,7 +32,7 @@ public class ElementTypeEnumTest {
 
        
        @Test
-       public void testGetElementType() throws Exception {
+       public void testGetElementType() {
                ElementTypeEnum testSubject;
                String result;
 
@@ -43,7 +43,7 @@ public class ElementTypeEnumTest {
 
        
        @Test
-       public void testSetElementType() throws Exception {
+       public void testSetElementType() {
                ElementTypeEnum testSubject;
                String elementType = "";
 
@@ -54,7 +54,7 @@ public class ElementTypeEnumTest {
 
        
        @Test
-       public void testGetClazz() throws Exception {
+       public void testGetClazz() {
                ElementTypeEnum testSubject;
                Class result;
 
@@ -65,7 +65,7 @@ public class ElementTypeEnumTest {
 
        
        @Test
-       public void testSetClazz() throws Exception {
+       public void testSetClazz() {
                ElementTypeEnum testSubject;
                Class clazz = null;
 
index d51075b..78ef2e6 100644 (file)
@@ -12,7 +12,7 @@ public class ValidationTaskResultTest {
 
        
        @Test
-       public void testGetName() throws Exception {
+       public void testGetName() {
                ValidationTaskResult testSubject;
                String result;
 
@@ -23,7 +23,7 @@ public class ValidationTaskResultTest {
 
        
        @Test
-       public void testSetName() throws Exception {
+       public void testSetName() {
                ValidationTaskResult testSubject;
                String name = "";
 
@@ -34,7 +34,7 @@ public class ValidationTaskResultTest {
 
        
        @Test
-       public void testGetResultMessage() throws Exception {
+       public void testGetResultMessage() {
                ValidationTaskResult testSubject;
                String result;
 
@@ -45,7 +45,7 @@ public class ValidationTaskResultTest {
 
        
        @Test
-       public void testSetResultMessage() throws Exception {
+       public void testSetResultMessage() {
                ValidationTaskResult testSubject;
                String resultMessage = "";
 
@@ -56,7 +56,7 @@ public class ValidationTaskResultTest {
 
        
        @Test
-       public void testIsSuccessful() throws Exception {
+       public void testIsSuccessful() {
                ValidationTaskResult testSubject;
                boolean result;
 
@@ -67,7 +67,7 @@ public class ValidationTaskResultTest {
 
        
        @Test
-       public void testSetSuccessful() throws Exception {
+       public void testSetSuccessful() {
                ValidationTaskResult testSubject;
                boolean successful = false;
 
index 9b44eef..d65fb00 100644 (file)
@@ -11,7 +11,7 @@ public class VertexResultTest {
 
        
        @Test
-       public void testGetStatus() throws Exception {
+       public void testGetStatus() {
                VertexResult testSubject;
                boolean result;
 
@@ -22,7 +22,7 @@ public class VertexResultTest {
 
        
        @Test
-       public void testSetStatus() throws Exception {
+       public void testSetStatus() {
                VertexResult testSubject;
                boolean status = false;
 
@@ -33,7 +33,7 @@ public class VertexResultTest {
 
        
        @Test
-       public void testGetResult() throws Exception {
+       public void testGetResult() {
                VertexResult testSubject;
                String result;
 
index afdd0d6..d5473cd 100644 (file)
@@ -51,7 +51,7 @@ public class DBVersionTest {
     }
 
     @Test(dataProvider = "versionComparisionProvider")
-    public void testVersionCompareTo2(String firstVersion, String otherVersion, int expectedComparisionResult) throws Exception {
+    public void testVersionCompareTo2(String firstVersion, String otherVersion, int expectedComparisionResult) {
         assertEquals(DBVersion.fromString(firstVersion).compareTo(DBVersion.fromString(otherVersion)), expectedComparisionResult);
     }
 }
index fe74891..8783071 100644 (file)
@@ -31,12 +31,12 @@ public class SdcMigrationToolTest {
     private SdcRepoService sdcRepoServiceMock;
 
     @BeforeMethod
-    public void setUp() throws Exception {
+    public void setUp() {
         MockitoAnnotations.initMocks(this);
     }
 
     @Test
-    public void testMigrate_noMigrations() throws Exception {
+    public void testMigrate_noMigrations() {
         when(migrationResolverMock.resolveMigrations()).thenReturn(Collections.emptyList());
         testInstance.migrate(false);
         verify(sdcRepoServiceMock, new Times(0)).clearTasksForCurrentMajor();
@@ -44,14 +44,14 @@ public class SdcMigrationToolTest {
     }
 
     @Test
-    public void testMigrate_enforceFlag_removeAllMigrationTasksForCurrentVersion() throws Exception {
+    public void testMigrate_enforceFlag_removeAllMigrationTasksForCurrentVersion() {
         when(migrationResolverMock.resolveMigrations()).thenReturn(Collections.emptyList());
         testInstance.migrate(true);
         verify(sdcRepoServiceMock, new Times(1)).clearTasksForCurrentMajor();
     }
 
     @Test
-    public void testMigrate_stopAfterFirstFailure() throws Exception {
+    public void testMigrate_stopAfterFirstFailure() {
         when(migrationResolverMock.resolveMigrations()).thenReturn(Arrays.asList(new SuccessfulMigration(), new FailedMigration(), new SuccessfulMigration()));
         testInstance.migrate(false);
         verify(sdcRepoServiceMock, new Times(0)).clearTasksForCurrentMajor();
index 9547abc..3f9766d 100644 (file)
@@ -11,7 +11,7 @@ import org.testng.annotations.Test;
 public class MigrationExecutorImplTest {
 
     @Test
-    public void testExecuteMigration() throws Exception {
+    public void testExecuteMigration() {
         MigrationExecutionResult execute = new MigrationExecutorImpl().execute(DummyMigrationFactory.SUCCESSFUL_MIGRATION);
         assertMigrationTaskEntryByMigrationExecutionResult(execute, DummyMigrationFactory.SUCCESSFUL_MIGRATION);
     }
index 04a8bd2..8167b92 100644 (file)
@@ -12,7 +12,7 @@ public class MigrationResultTest {
 
        
        @Test
-       public void testGetMsg() throws Exception {
+       public void testGetMsg() {
                MigrationResult testSubject;
                String result;
 
@@ -23,7 +23,7 @@ public class MigrationResultTest {
 
        
        @Test
-       public void testSetMsg() throws Exception {
+       public void testSetMsg() {
                MigrationResult testSubject;
                String msg = "";
 
@@ -34,7 +34,7 @@ public class MigrationResultTest {
 
        
        @Test
-       public void testGetMigrationStatus() throws Exception {
+       public void testGetMigrationStatus() {
                MigrationResult testSubject;
                MigrationStatus result;
 
@@ -45,7 +45,7 @@ public class MigrationResultTest {
 
        
        @Test
-       public void testSetMigrationStatus() throws Exception {
+       public void testSetMigrationStatus() {
                MigrationResult testSubject;
                MigrationStatus migrationStatus = null;
 
index 360b3aa..636b1c6 100644 (file)
@@ -31,13 +31,13 @@ public class SpringBeansMigrationResolverTest {
 
 
     @BeforeMethod
-    public void setUp() throws Exception {
+    public void setUp() {
         MockitoAnnotations.initMocks(this);
         testInstance.setMigrations(migrations);
     }
 
     @Test
-    public void testResolveMigrations_getMigrationsWithVersionGreaterThanLatest() throws Exception {
+    public void testResolveMigrations_getMigrationsWithVersionGreaterThanLatest() {
         when(sdcRepoServiceMock.getLatestDBVersion()).thenReturn(DBVersion.fromString("1710.2"));
         testInstance.setPostMigrations(Collections.emptyList());
         List<IMigrationStage> resolvedMigrations = testInstance.resolveMigrations();
@@ -47,7 +47,7 @@ public class SpringBeansMigrationResolverTest {
     }
 
     @Test
-    public void testResolveMigration_noLatestVersionForCurrentMajorVersion() throws Exception {
+    public void testResolveMigration_noLatestVersionForCurrentMajorVersion() {
         when(sdcRepoServiceMock.getLatestDBVersion()).thenReturn(DBVersion.fromString("1710.-1"));
         testInstance.setPostMigrations(Collections.emptyList());
         List<IMigrationStage> resolvedMigrations = testInstance.resolveMigrations();
@@ -58,7 +58,7 @@ public class SpringBeansMigrationResolverTest {
     }
 
     @Test
-    public void testResolveMigrations_emptyMigrationsList() throws Exception {
+    public void testResolveMigrations_emptyMigrationsList() {
         testInstance.setMigrations(Collections.emptyList());
         testInstance.setPostMigrations(Collections.emptyList());
         when(sdcRepoServiceMock.getLatestDBVersion()).thenReturn(DBVersion.fromString("1710.-1"));
index 31e1a63..2745f59 100644 (file)
@@ -25,12 +25,12 @@ public class SdcRepoServiceTest {
     private MigrationTasksDao migrationTasksDaoMock;
 
     @BeforeMethod
-    public void setUp() throws Exception {
+    public void setUp() {
         MockitoAnnotations.initMocks(this);
     }
 
     @Test
-    public void testGetLatestVersion_noMinorVersionForCurrentVersion() throws Exception {
+    public void testGetLatestVersion_noMinorVersionForCurrentVersion() {
         when(migrationTasksDaoMock.getLatestMinorVersion(DBVersion.CURRENT_VERSION.getMajor())).thenReturn(null);
         DBVersion latestDBVersion = testInstance.getLatestDBVersion();
         assertEquals(latestDBVersion.getMajor(), DBVersion.CURRENT_VERSION.getMajor());
@@ -38,7 +38,7 @@ public class SdcRepoServiceTest {
     }
 
     @Test
-    public void testGetLatestVersion() throws Exception {
+    public void testGetLatestVersion() {
         when(migrationTasksDaoMock.getLatestMinorVersion(DBVersion.CURRENT_VERSION.getMajor())).thenReturn(BigInteger.TEN);
         DBVersion latestDBVersion = testInstance.getLatestDBVersion();
         assertEquals(latestDBVersion.getMajor(), DBVersion.CURRENT_VERSION.getMajor());
@@ -46,7 +46,7 @@ public class SdcRepoServiceTest {
     }
 
     @Test
-    public void testCreateMigrationTask() throws Exception {
+    public void testCreateMigrationTask() {
         MigrationTaskEntry taskEntry =  new MigrationTaskEntry();
         testInstance.createMigrationTask(taskEntry);
         verify(migrationTasksDaoMock, new Times(1)).createMigrationTask(taskEntry);
index fa61b7e..52dc7c9 100644 (file)
@@ -21,13 +21,13 @@ public class MigrationTasksTest  {
     private List<Migration> migrations;
 
     @BeforeMethod
-    public void setUp() throws Exception {
+    public void setUp() {
         ClassScanner classScanner = new ClassScanner();
         migrations = classScanner.getAllClassesOfType(MIGRATIONS_BASE_PACKAGE, Migration.class);
     }
 
     @Test
-    public void testNoTasksWithSameVersion() throws Exception {
+    public void testNoTasksWithSameVersion() {
         Map<DBVersion, List<Migration>> migrationsByVersion = migrations.stream().collect(Collectors.groupingBy(Migration::getVersion));
         migrationsByVersion.forEach((version, migrations) -> {
             if (migrations.size() > 1) {
@@ -38,7 +38,7 @@ public class MigrationTasksTest  {
     }
 
     @Test
-    public void testNoTaskWithVersionGreaterThanCurrentVersion() throws Exception {
+    public void testNoTaskWithVersionGreaterThanCurrentVersion() {
         Set<Migration> migrationsWithVersionsGreaterThanCurrent = migrations.stream().filter(mig -> mig.getVersion().compareTo(DBVersion.CURRENT_VERSION) > 0)
                 .collect(Collectors.toSet());
 
index 217bc39..4b0b398 100644 (file)
@@ -11,7 +11,7 @@ public class EntryPointTest {
 
        
        @Test
-       public void testTest() throws Exception {
+       public void testTest() {
                EntryPoint testSubject;
                String result;
 
index 2eca73c..9d9d008 100644 (file)
@@ -1390,10 +1390,6 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
                 && ComponentTypeEnum.SERVICE == componentTypeEnum;
     }
 
-    private StorageOperationStatus concatServiceNameToVLINetworkRolePropertyValue(ToscaOperationFacade toscaOperationFacade, ComponentTypeEnum componentTypeEnum, String componentId, String resourceInstanceId, ComponentInstanceProperty property) {
-        return concatServiceNameToVLINetworkRolePropertiesValues(toscaOperationFacade, componentTypeEnum, componentId, resourceInstanceId, Arrays.asList(property));
-    }
-
     // US833308 VLI in service - specific network_role property value logic
     private StorageOperationStatus concatServiceNameToVLINetworkRolePropertiesValues(ToscaOperationFacade toscaOperationFacade, ComponentTypeEnum componentTypeEnum, String componentId, String resourceInstanceId, List<ComponentInstanceProperty> properties) {
         for (ComponentInstanceProperty property: properties) {
index 63b72b9..a2fd6c4 100644 (file)
@@ -1465,11 +1465,6 @@ public class GroupBusinessLogic extends BaseBusinessLogic {
                 component.getComponentType().toString());
     }
 
-    private Boolean onFailedToLockComponent(ResponseFormat responseFormat) {
-        throw new ComponentException(responseFormat);
-    }
-
-
     public Either<List<GroupDefinition>, ResponseFormat> createGroups(Component component, final List<GroupDefinition> groupDefinitions) {
 
         Map<String, GroupDataDefinition> groups = new HashMap<>();
index bbdb14f..bac9bb6 100644 (file)
@@ -4816,11 +4816,6 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
         }
     }
 
-    private void auditCreateResource(User user, Resource persistedResource, AuditingActionEnum actionEnum) {
-        ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.CREATED);
-        componentsUtils.auditResource(responseFormat, user, persistedResource, actionEnum);
-    }
-
     private Either<Resource, ResponseFormat> createResourceTransaction(Resource resource, User user,
                                                                        boolean isNormative, boolean inTransaction) {
         // validate resource name uniqueness
index 75b0bd9..5e65ede 100644 (file)
@@ -344,18 +344,6 @@ public class LifecycleBusinessLogic {
         return Either.left(eitherResourceResponse.left().value());
     }
 
-    private Either<Boolean, ResponseFormat> validateHighestVersion(User modifier, LifeCycleTransition lifeCycleTransition, Resource resource, String resourceCurrVersion) {
-        ResponseFormat errorResponse;
-        if (!resource.isHighestVersion()) {
-            log.debug("resource version {} is not the last version of resource {}", resource.getVersion(), resource.getName());
-            errorResponse = componentUtils.getResponseFormat(ActionStatus.COMPONENT_HAS_NEWER_VERSION, resource.getName(), ComponentTypeEnum.RESOURCE.name().toLowerCase());
-            componentUtils.auditResource(errorResponse, modifier, resource, lifeCycleTransition.getAuditingAction(), ResourceAuditData.newBuilder()
-                    .state(resource.getLifecycleState().name()).version(resourceCurrVersion).build());
-            return Either.right(errorResponse);
-        }
-        return Either.left(true);
-    }
-
     private Either<Boolean, ResponseFormat> validateHighestVersion(User modifier, LifeCycleTransition lifeCycleTransition, Component component, String resourceCurrVersion, ComponentTypeEnum componentType) {
         ResponseFormat errorResponse;
         if (!component.isHighestVersion()) {
index 776012a..e5a743a 100644 (file)
@@ -50,9 +50,7 @@ public class GraphLockOperation implements IGraphLockOperation {
                log.info("lock resource with id {}", componentId);
                TitanOperationStatus lockElementStatus = null;
                try {
-
                        lockElementStatus = titanGenericDao.lockElement(componentId, nodeType);
-
                } catch (Exception e) {
                        lockElementStatus = TitanOperationStatus.ALREADY_LOCKED;
 
index 662e2ec..3b7b5de 100644 (file)
@@ -432,7 +432,6 @@ public class GroupInstanceOperation extends AbstractOperation implements IGroupI
 
        }
 
-
        /**
         * update value of attribute on resource instance
         * 
@@ -661,73 +660,6 @@ public class GroupInstanceOperation extends AbstractOperation implements IGroupI
                }
        }
 
-       private Either<GroupInstance, TitanOperationStatus> getGroupInstanceFromGraph(String uniqueId, boolean skipProperties, boolean skipArtifacts) {
-
-               Either<GroupInstance, TitanOperationStatus> result = null;
-
-               Either<GroupInstanceData, TitanOperationStatus> groupInstRes = titanGenericDao.getNode(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.GroupInstance), uniqueId, GroupInstanceData.class);
-               if (groupInstRes.isRight()) {
-                       TitanOperationStatus status = groupInstRes.right().value();
-                       log.debug("Failed to retrieve group {}  from graph. Status is {}", uniqueId, status);
-                       BeEcompErrorManager.getInstance().logBeFailedRetrieveNodeError("Fetch Group", uniqueId, String.valueOf(status));
-                       result = Either.right(status);
-                       return result;
-               }
-
-               GroupInstanceData groupInstData = groupInstRes.left().value();
-
-               GroupInstance groupInstance = new GroupInstance(groupInstData.getGroupDataDefinition());
-               String instOriginGroupId = groupInstance.getGroupUid();
-               Either<GroupDefinition, TitanOperationStatus> groupRes = groupOperation.getGroupFromGraph(instOriginGroupId, false, true, false);
-
-               if (groupRes.isRight()) {
-                       TitanOperationStatus status = groupRes.right().value();
-                       result = Either.right(status);
-
-               }
-               GroupDefinition groupDefinition = groupRes.left().value();
-               Either<Map<String, PropertyValueData>, TitanOperationStatus> groupInstancePropertyValuesRes = getAllGroupInstancePropertyValuesData(groupInstData);
-               if(groupInstancePropertyValuesRes.isRight()){
-                       result = Either.right(groupInstancePropertyValuesRes.right().value());
-               }
-               buildGroupInstanceFromGroup(groupInstance, groupDefinition, groupInstancePropertyValuesRes.left().value());
-
-               /*
-                * if (false == skipProperties) { Either<List<GroupProperty>, TitanOperationStatus> propertiesRes = getGroupProperties(uniqueId); if (propertiesRes.isRight()) { TitanOperationStatus status = propertiesRes.right().value(); if (status !=
-                * TitanOperationStatus.OK) { result = Either.right(status); return result; } } else { List<GroupProperty> properties = propertiesRes.left().value(); groupDefinition.setProperties(properties); } }
-                */
-
-               if (false == skipArtifacts) {
-                       Either<List<ImmutablePair<String, String>>, TitanOperationStatus> artifactsRes = getGroupArtifactsPairs(uniqueId);
-                       if (artifactsRes.isRight()) {
-                               TitanOperationStatus status = artifactsRes.right().value();
-                               if (status != TitanOperationStatus.OK) {
-                                       result = Either.right(status);
-                                       return result;
-                               }
-                       } else {
-                               List<String> artifactsUid = new ArrayList<>();
-                               List<String> artifactsUUID = new ArrayList<>();
-
-                               List<ImmutablePair<String, String>> list = artifactsRes.left().value();
-                               if (list != null) {
-                                       for (ImmutablePair<String, String> pair : list) {
-                                               String uid = pair.left;
-                                               String UUID = pair.right;
-                                               artifactsUid.add(uid);
-                                               artifactsUUID.add(UUID);
-                                       }
-                                       groupInstance.setGroupInstanceArtifacts(artifactsUid);
-                                       groupInstance.setGroupInstanceArtifactsUuid(artifactsUUID);
-                               }
-                       }
-               }
-               result = Either.left(groupInstance);
-
-               return result;
-
-       }
-
        private void buildGroupInstanceFromGroup(GroupInstance groupInstance, GroupDefinition groupDefinition, Map<String, PropertyValueData> groupInstancePropertyValues) {
 
                groupInstance.setGroupName(groupDefinition.getName());
index a2996ac..f0d0b51 100644 (file)
@@ -1297,37 +1297,6 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
 
        }
 
-       private Either<Map<String, DataTypeDefinition>, TitanOperationStatus> findAllDataTypeDefinition(DataTypeDefinition dataTypeDefinition) {
-
-               Map<String, DataTypeDefinition> nameToDataTypeDef = new HashMap<>();
-
-               DataTypeDefinition typeDefinition = dataTypeDefinition;
-
-               while (typeDefinition != null) {
-
-                       List<PropertyDefinition> properties = typeDefinition.getProperties();
-                       if (properties != null) {
-                               for (PropertyDefinition propertyDefinition : properties) {
-                                       String type = propertyDefinition.getType();
-                                       Either<DataTypeDefinition, TitanOperationStatus> dataTypeByName = this.getDataTypeUsingName(type);
-                                       if (dataTypeByName.isRight()) {
-                                               return Either.right(dataTypeByName.right().value());
-                                       } else {
-                                               DataTypeDefinition value = dataTypeByName.left().value();
-                                               if (false == nameToDataTypeDef.containsKey(type)) {
-                                                       nameToDataTypeDef.put(type, value);
-                                               }
-                                       }
-
-                               }
-                       }
-
-                       typeDefinition = typeDefinition.getDerivedFrom();
-               }
-
-               return Either.left(nameToDataTypeDef);
-       }
-
        public Either<List<ComponentInstanceProperty>, TitanOperationStatus> getAllPropertiesOfResourceInstanceOnlyPropertyDefId(String resourceInstanceUid, NodeTypeEnum instanceNodeType) {
 
                Either<TitanVertex, TitanOperationStatus> findResInstanceRes = titanGenericDao.getVertexByProperty(UniqueIdBuilder.getKeyByNodeType(instanceNodeType), resourceInstanceUid);
index 76717f3..24a344a 100644 (file)
@@ -189,14 +189,6 @@ public class ManualVspToscaGenerationService {
     return componentName + GeneratorConstants.TOSCA_SERVICE_TEMPLATE_FILE_NAME_SUFFIX;
   }
 
-  private String getNodeTemplateId(String componentName, String idPrefix, String idSuffix) {
-    StringBuilder builder = new StringBuilder();
-    //builder.append(idPrefix);
-    builder.append(componentName);
-    builder.append(idSuffix);
-    return builder.toString();
-  }
-
   private ServiceTemplate createInitMainServiceTemplate(String releaseVendor) {
     ServiceTemplate mainServiceTemplate = new ServiceTemplate();
     Map<String, String> templateMetadata = new HashMap<>();
@@ -349,18 +341,6 @@ public class ManualVspToscaGenerationService {
 
   //*************** CREATE GLOBAL SUBSTITUTION SERVICE TEMPLATE **********************
 
-  private ServiceTemplate createGlobalSubstitutionServiceTemplate(ServiceTemplate
-                                                                      substitutionServiceTemplate,
-                                                                  String componentName) {
-    ServiceTemplate globalSubstitutionServiceTemplate = fetchGlobalSubstitutionServiceTemplate();
-    NodeType substitutionNodeType =
-        createGlobalSubstitutionNodeType(substitutionServiceTemplate, componentName);
-    String substitutionNodeTypeId = getSubstitutionNodeTypeId(componentName);
-    DataModelUtil.addNodeType(globalSubstitutionServiceTemplate, substitutionNodeTypeId,
-        substitutionNodeType);
-    return globalSubstitutionServiceTemplate;
-  }
-
   private ServiceTemplate createInitGlobalSubstitutionServiceTemplate() {
     ServiceTemplate globalSubstitutionServiceTemplate = new ServiceTemplate();
     Map<String, String> templateMetadata = new HashMap<>();
index b7008de..df52cdd 100644 (file)
@@ -54,75 +54,6 @@ public class VersionCalculatorImpl implements VersionCalculator {
     return CommonMethods.arrayToSeparatedString(versionLevels, '.');
   }
 
-
-  // version calculator when there are no version restrictions
- /* @Override
-  public String calculate(String baseVersion, VersionCreationMethod creationMethod) {
-
-    return calculate(baseVersion,creationMethod,2);
-  }
-
-  private String calculate(String baseVersion, VersionCreationMethod creationMethod,int
-      maxVersionLevels) {
-    if (baseVersion == null) {
-      return INITIAL_VERSION;
-    }
-
-    String[] versionLevels = baseVersion.split("\\.");
-    if (versionLevels.length > maxVersionLevels) {
-      throw new IllegalArgumentException(VERSION_STRING_VIOLATION_MSG);
-    }
-
-    int index;
-    int versionLevel = calcVersionLevel(versionLevels);
-    if (versionLevel == -1) {
-      throw new IllegalArgumentException(
-          VERSION_STRING_VIOLATION_MSG + " given version:" + baseVersion);
-    }
-    int requiredVersionLevelIncrease;
-    switch (creationMethod) {
-      case parent_level:
-        if (versionLevel == 0) {
-          throw new IllegalArgumentException(
-              PARENT_LEVEL_VERSION_CANNOT_BE_CREATED_FROM_TOP_LEVEL + " version:" + baseVersion);
-
-        }
-        requiredVersionLevelIncrease = versionLevel - 1;
-        versionLevels[versionLevel] = "0";
-        index = Integer.getInteger(versionLevels[requiredVersionLevelIncrease]);
-        index++;
-        versionLevels[requiredVersionLevelIncrease] = Integer.toString(index);
-        break;
-      case same_level:
-        requiredVersionLevelIncrease = versionLevel;
-        index = Integer.valueOf(versionLevels[requiredVersionLevelIncrease]);
-        index++;
-        versionLevels[requiredVersionLevelIncrease] = Integer.toString(index);
-        break;
-      case sub_level:
-        if (versionLevel == versionLevels.length - 1) {
-          throw new IllegalArgumentException(
-              SUB_LEVEL_VERSION_CANNOT_BE_CREATED_FROM_LOWEST_LEVEL + " version:" + baseVersion);
-        }
-        requiredVersionLevelIncrease = versionLevel + 1;
-        if(requiredVersionLevelIncrease>maxVersionLevels){
-          throw new IllegalArgumentException(INVALID_CREATION_METHOD_MSG+" max " +
-              "levels:"+maxVersionLevels + "requested level:"+requiredVersionLevelIncrease);
-        }
-        String newVersion = baseVersion + ".1";
-        versionLevels = newVersion.split("\\.");
-
-        break;
-      default:
-        throw new IllegalArgumentException(VERSION_CALCULATION_ERROR_MSG + " base " +
-            "version:" + baseVersion + " creation method:" + creationMethod);
-
-    }
-
-    return CommonMethods.arrayToSeparatedString(versionLevels, '.');
-  }*/
-
-
   @Override
   public void injectAdditionalInfo(Version version, Set<String> existingVersions) {
     String optionalVersion;
@@ -143,13 +74,4 @@ public class VersionCalculatorImpl implements VersionCalculator {
 
   }
 
-
-  private int calcVersionLevel(String[] versionLevels) {
-    for (int i = versionLevels.length - 1; i >= 0; i--) {
-      if (!versionLevels[i].equals("0")) {
-        return i;
-      }
-    }
-    return -1;
-  }
 }