From 82c84075c71e285d1009bbe7e183ad2f0358d335 Mon Sep 17 00:00:00 2001 From: Parshad Patel Date: Tue, 27 Nov 2018 15:36:08 +0900 Subject: Fix critical sonar issues Fix rethrow the "InterruptedException" and Use "isAssignableFrom" sonar issues Issue-ID: SDC-1895 Change-Id: I2cadc08b9e7acdc84cf25a3ce9d22199711afa5d Signed-off-by: Parshad Patel --- .../java/org/openecomp/sdc/asdctool/impl/TitanGraphInitializer.java | 2 +- .../sdc/asdctool/migration/tasks/mig1710/UpgradeMigration1710.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'asdctool') diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/TitanGraphInitializer.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/TitanGraphInitializer.java index 28a5bbdb24..8b89cc2706 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/TitanGraphInitializer.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/TitanGraphInitializer.java @@ -133,7 +133,7 @@ public class TitanGraphInitializer { PropertyKey propKey = null; if (!graphMgt.containsPropertyKey(prop.getProperty())) { Class clazz = prop.getClazz(); - if (!ArrayList.class.getName().equals(clazz.getName()) && !HashMap.class.getName().equals(clazz.getName())) { + if (!clazz.isAssignableFrom(ArrayList.class) && !clazz.isAssignableFrom(HashMap.class)) { propKey = graphMgt.makePropertyKey(prop.getProperty()).dataType(prop.getClazz()).make(); } } else { diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/migration/tasks/mig1710/UpgradeMigration1710.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/migration/tasks/mig1710/UpgradeMigration1710.java index 4b9af31092..c63749e0d6 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/migration/tasks/mig1710/UpgradeMigration1710.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/migration/tasks/mig1710/UpgradeMigration1710.java @@ -1110,6 +1110,7 @@ public class UpgradeMigration1710 implements PostMigration { } } catch (InterruptedException e) { log.error("Error occurred: {}", e.getMessage()); + Thread.currentThread().interrupt(); } } return false; -- cgit 1.2.3-korg