Fix Blocker & Critical Sonar issues in asdctool

Fix NullPointerException issues
Update test case

Issue-ID: SDC-1895
Change-Id: I183b0bee127efa4331e79a1b76df558dbc9ca33a
Signed-off-by: Parshad Patel <pars.patel@samsung.com>

diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/ArtifactUuidFix.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/ArtifactUuidFix.java
index 8c70435..03f3e41 100644 (file)
--- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/ArtifactUuidFix.java
+++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/ArtifactUuidFix.java
@@ -381,7 +381,7 @@ public class ArtifactUuidFix {
                        return true;
                }
 
-               if (artifacts.size() < artifactsUuid.size()) {
+               if ((artifactsUuid != null) && (artifacts.size() < artifactsUuid.size())) {
                        log.info(" artifacts.size() < artifactsUuid.size() group {} in resource {} ", gr.getName(), resourceName);
                        return true;
                }
@@ -391,7 +391,7 @@ public class ArtifactUuidFix {
                                        gr.getName(), resourceName);
                        return true;
                }
-               if (artifactsUuid.contains(null)) {
+               if (artifactsUuid != null && artifactsUuid.contains(null)) {
                        log.info(" artifactsUuid.contains(null) group {} in resource {} ", gr.getName(), resourceName);
                        return true;
                }
@@ -412,7 +412,7 @@ public class ArtifactUuidFix {
                                                        artifactlabel, artifactId, gr.getName(), resourceName);
                                        return true;
                                }
-                               if (!artifactsUuid.contains(artifactDefinition.getArtifactUUID())) {
+                               if (artifactsUuid != null && !artifactsUuid.contains(artifactDefinition.getArtifactUUID())) {
                                        log.info(
                                                        " artifactsUuid.contains(artifactDefinition.getArtifactUUID() label {} group {} in resource {} ",
                                                        artifactlabel, gr.getName(), resourceName);
@@ -454,7 +454,7 @@ public class ArtifactUuidFix {
                        instArtifatIdSet.addAll(instArtifactsId);
                }
 
-               if (artifacts.size() < artifactsUuid.size()) {
+               if ((artifactsUuid != null) && (artifacts.size() < artifactsUuid.size())) {
                        log.info(" artifacts.size() < artifactsUuid.size() inst {} in service {} ", instName, servicename);
                        return true;
                }
@@ -464,7 +464,7 @@ public class ArtifactUuidFix {
                                        instName, servicename);
                        return true;
                }
-               if (artifactsUuid.contains(null)) {
+               if (artifactsUuid != null && artifactsUuid.contains(null)) {
                        log.info(" artifactsUuid.contains(null) inst {} in service {} ", instName, servicename);
                        return true;
                }
@@ -496,7 +496,7 @@ public class ArtifactUuidFix {
                                                        artifactlabel, artifactId, instName, servicename);
                                        return true;
                                }
-                               if (!artifactsUuid.contains(artifactDefinition.getArtifactUUID())) {
+                               if (artifactsUuid != null && !artifactsUuid.contains(artifactDefinition.getArtifactUUID())) {
                                        log.info(
                                                        " artifactsUuid.contains(artifactDefinition.getArtifactUUID() label {} inst {} in service {} ",
                                                        artifactlabel, instName, servicename);
@@ -522,7 +522,7 @@ public class ArtifactUuidFix {
                                return true;
                        }
                }
-               if(vfModule != null ){
+               if(vfModule != null && artifactsUuid != null){
                        return isProblematicVFModule(vfModule, artifactsUuid, instArtifactsUuid);
                }
                
@@ -658,7 +658,7 @@ public class ArtifactUuidFix {
                                writer.flush();
                        }
                } catch (IOException e) {
-                       log.error(e.getMessage());
+                   log.error(e.getMessage());
                } finally {
                        titanDao.commit();
                }
@@ -1043,7 +1043,7 @@ public class ArtifactUuidFix {
                        }
                } catch (IOException e) {
 
-                       log.error(e.getMessage());
+                   log.error(e.getMessage());
                }
        }
 

diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/DataMigration.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/DataMigration.java
index 4842163..ebd2e2e 100644 (file)
--- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/DataMigration.java
+++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/DataMigration.java
@@ -159,7 +159,7 @@ public class DataMigration {
                try {
                        elasticSearchClient.initialize();
                } catch (URISyntaxException e) {
-                       e.printStackTrace();
+                   log.error(e.getMessage());
                        return false;
                }
                return true;

diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/ProductLogic.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/ProductLogic.java
index de23c69..d8b8936 100644 (file)
--- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/ProductLogic.java
+++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/ProductLogic.java
@@ -76,7 +76,9 @@ public class ProductLogic {
                        return productsToDelete;
                } catch (Exception e) {
                        log.info("get All Products failed - {}" , e);
-                       graph.tx().rollback();
+                       if(graph != null) {
+                           graph.tx().rollback();
+                       }
                        return null;
 
                } finally {

diff --git a/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/ProductLogicTest.java b/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/ProductLogicTest.java
index 08de0eb..982c85b 100644 (file)
--- a/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/ProductLogicTest.java
+++ b/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/ProductLogicTest.java
@@ -1,5 +1,6 @@
 package org.openecomp.sdc.asdctool.impl;
 
+import static org.junit.Assert.assertFalse;
 import org.junit.Test;
 
 public class ProductLogicTest {
@@ -8,7 +9,7 @@ public class ProductLogicTest {
                return new ProductLogic();
        }
 
-       @Test(expected=NullPointerException.class)
+       @Test
        public void testDeleteAllProducts() throws Exception {
                ProductLogic testSubject;
                String titanFile = "";
@@ -20,5 +21,6 @@ public class ProductLogicTest {
                // default test
                testSubject = createTestSubject();
                result = testSubject.deleteAllProducts(titanFile, beHost, bePort, adminUser);
+               assertFalse(result);
        }
-}
\ No newline at end of file
+}