Sonar critical issues fix

Issue-Id : SO-98

Change-Id: I229819e850c36fce9f8715d1534f8e5c5d812a0a
Signed-off-by: Seshu-Kumar-M <seshu.kumar.m@huawei.com>

diff --git a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/plugins/LoggingAndURNMappingPlugin.java b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/plugins/LoggingAndURNMappingPlugin.java
index 2453700..2688513 100644 (file)
--- a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/plugins/LoggingAndURNMappingPlugin.java
+++ b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/plugins/LoggingAndURNMappingPlugin.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * OPENECOMP - MSO
+ * ONAP - SO
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -412,7 +412,7 @@ public class LoggingAndURNMappingPlugin extends AbstractProcessEnginePlugin {
                                                }
                                        }
                                } catch(Exception e) {
-                                       // Do nothing
+                                       LOGGER.debug("Exception at notify: " + e);
                                }
                        }
                }

diff --git a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/xml/XmlTool.java b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/xml/XmlTool.java
index 4211475..ac0c795 100644 (file)
--- a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/xml/XmlTool.java
+++ b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/xml/XmlTool.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * OPENECOMP - MSO
+ * ONAP - SO
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -46,6 +46,7 @@ import javax.xml.xpath.XPathConstants;
 import javax.xml.xpath.XPathExpressionException;
 import javax.xml.xpath.XPathFactory;
 
+import org.openecomp.mso.logger.MsoLogger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
@@ -58,7 +59,7 @@ import org.xml.sax.SAXException;
 public final class XmlTool {
 
        private static final Map<String, Integer> ENTITIES = new HashMap<String, Integer>();
-
+       private static final MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.BPEL);
        static {
                ENTITIES.put("amp", new Integer(38));
                ENTITIES.put("quot", new Integer(34));
@@ -276,6 +277,7 @@ public final class XmlTool {
         */
        public static String removeNamespaces(Object xml) {
                if (xml == null) {
+               LOGGER.debug("removeNamespaces input object is null , returning null");
                        return null;
                }
 
@@ -326,7 +328,7 @@ public final class XmlTool {
                                try {
                                        stream.close();
                                } catch (Exception e) {
-                                       // Ignore
+                                       LOGGER.debug("Exception at readResourceFile close stream: " + e);
                                }
                        }
                }

diff --git a/bpmn/MSOURN-plugin/src/main/java/org/openecomp/camunda/bpmn/plugin/urnmap/URNMapPlugin.java b/bpmn/MSOURN-plugin/src/main/java/org/openecomp/camunda/bpmn/plugin/urnmap/URNMapPlugin.java
index 09fdc1c..4f6ead0 100644 (file)
--- a/bpmn/MSOURN-plugin/src/main/java/org/openecomp/camunda/bpmn/plugin/urnmap/URNMapPlugin.java
+++ b/bpmn/MSOURN-plugin/src/main/java/org/openecomp/camunda/bpmn/plugin/urnmap/URNMapPlugin.java
@@ -1,6 +1,6 @@
 /*-\r
  * ============LICENSE_START=======================================================\r
- * OPENECOMP - MSO\r
+ * ONAP - SO\r
  * ================================================================================\r
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.\r
  * ================================================================================\r
@@ -32,14 +32,15 @@ import org.openecomp.camunda.bpmn.plugin.urnmap.resources.URNMapPluginRootResour
 \r
 public class URNMapPlugin  extends AbstractCockpitPlugin{\r
        public static final String ID = "urnMap-plugin";\r
-\r
+         \r
+         @Override\r
          public String getId() {\r
            return ID;\r
          }\r
 \r
          @Override\r
          public Set<Class<?>> getResourceClasses() {\r
-           Set<Class<?>> classes = new HashSet<Class<?>>();\r
+           Set<Class<?>> classes = new HashSet<>();\r
 \r
            classes.add(URNMapPluginRootResource.class);\r
 \r

diff --git a/bpmn/MSOURN-plugin/src/main/java/org/openecomp/camunda/bpmn/plugin/urnmap/resources/URNResource.java b/bpmn/MSOURN-plugin/src/main/java/org/openecomp/camunda/bpmn/plugin/urnmap/resources/URNResource.java
index 3dc6c24..5ef77ee 100644 (file)
--- a/bpmn/MSOURN-plugin/src/main/java/org/openecomp/camunda/bpmn/plugin/urnmap/resources/URNResource.java
+++ b/bpmn/MSOURN-plugin/src/main/java/org/openecomp/camunda/bpmn/plugin/urnmap/resources/URNResource.java
@@ -1,6 +1,6 @@
 /*-\r
  * ============LICENSE_START=======================================================\r
- * OPENECOMP - MSO\r
+ * ONAP - SO\r
  * ================================================================================\r
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.\r
  * ================================================================================\r
@@ -28,6 +28,7 @@ import java.sql.SQLException;
 import java.sql.Connection;\r
 import java.sql.PreparedStatement;\r
 import java.sql.ResultSet;\r
+import java.sql.SQLException;\r
 import java.util.ArrayList;\r
 import java.util.List;\r
 import java.util.StringTokenizer;\r
@@ -60,11 +61,11 @@ public class URNResource extends AbstractCockpitPluginResource{
   public List<URNData> getUrnDataMap() \r
   {  \r
          List<URNData> list = new ArrayList();\r
-         \r
+         PreparedStatement psData = null;\r
          try {\r
                        \r
                    conn = getDBConnection();\r
-                           PreparedStatement psData = conn\r
+                       psData = conn\r
                                                .prepareStatement("select * from MSO_URN_MAPPING order by NAME_");\r
                            \r
                            ResultSet r = psData.executeQuery();\r
@@ -79,13 +80,25 @@ public class URNResource extends AbstractCockpitPluginResource{
                                        list.add(d);                                    \r
                                }\r
                                \r
-                           psData.close();\r
-                               conn.close();\r
-                       \r
                } catch (Exception e) \r
                {\r
-                       \r
-                       e.printStackTrace();\r
+                       msoLogger.debug("Exception in getUrnDataMap " + e);                     \r
+               } finally {\r
+                       if(psData != null){\r
+                               try {\r
+                                       psData.close();\r
+                                       conn.close();\r
+                               } catch (SQLException e) {\r
+                                       msoLogger.debug("Exception while closing the PreparedStatement: " + e);\r
+                               }\r
+                       }\r
+                       if(conn != null){\r
+                               try {\r
+                                       conn.close();\r
+                               } catch (SQLException e) {\r
+                                       msoLogger.debug("Exception while closing the connection: " + e);\r
+                               }\r
+                       }\r
                }\r
      \r
     for(URNData d: list)\r
@@ -130,8 +143,7 @@ public class URNResource extends AbstractCockpitPluginResource{
                        \r
                } catch (Exception e) \r
                {\r
-                       \r
-                       e.printStackTrace();\r
+                       msoLogger.debug("Exception in DBConnection " + e);\r
                }\r
          \r
          return conn;\r
@@ -158,24 +170,36 @@ public class URNResource extends AbstractCockpitPluginResource{
          nRow.setVer_("1");    \r
          final String myKey = key_;\r
          final String myValue = value_;\r
-         \r
+         PreparedStatement psData = null;\r
+         \r
                msoLogger.debug("----------- START ----------------------");\r
                try {\r
                        \r
                    conn = getDBConnection();\r
-                           PreparedStatement psData = conn\r
+                       psData = conn\r
                                                .prepareStatement("Insert into MSO_URN_MAPPING values ('" + key_ + "', '" + value_  + "', '1')");\r
                            \r
-                           psData.executeUpdate();\r
-                           \r
-                           psData.close();\r
-                               conn.close();\r
-                       //}                      \r
+                           psData.executeUpdate();              \r
                        \r
                } catch (Exception e) \r
                {\r
-                       \r
-                       e.printStackTrace();\r
+                       msoLogger.debug("Exception in insertNewRow " + e);\r
+               }finally {\r
+                       if(psData != null){\r
+                               try {\r
+                                       psData.close();\r
+                                       conn.close();\r
+                               } catch (SQLException e) {\r
+                                       msoLogger.debug("Exception while closing the PreparedStatement: " + e);\r
+                               }\r
+                       }\r
+                       if(conn != null){\r
+                               try {\r
+                                       conn.close();\r
+                               } catch (SQLException e) {\r
+                                       msoLogger.debug("Exception while closing the connection: " + e);\r
+                               }\r
+                       }\r
                }\r
        // getQueryService().executeQuery("cockpit.urnMap.insertNewRow", nRow, URNData.class);\r
    }\r
@@ -184,21 +208,34 @@ public class URNResource extends AbstractCockpitPluginResource{
   public void getPersistData(URNData d) {  \r
          \r
                //getQueryService().executeQuery("cockpit.urnMap.persistURNData", d, URNData.class);\r
-           \r
+           PreparedStatement psData = null;\r
          try {\r
                        \r
                    conn = getDBConnection();\r
-                       PreparedStatement psData = conn\r
+                       psData = conn\r
                                                .prepareStatement("UPDATE MSO_URN_MAPPING set VALUE_ ='"+ d.getURNValue() + "' WHERE NAME_='" + d.getURNName() + "'");\r
                            \r
                            psData.executeUpdate();\r
-                           \r
-                           psData.close();\r
-                               conn.close();\r
+                          \r
                } catch (Exception e) \r
                {\r
-                       \r
-                       e.printStackTrace();\r
+                       msoLogger.debug("Exception in PersistData " + e);\r
+               }finally {\r
+                       if(psData != null){\r
+                               try {\r
+                                       psData.close();\r
+                                       conn.close();\r
+                               } catch (SQLException e) {\r
+                                       msoLogger.debug("Exception while closing the PreparedStatement: " + e);\r
+                               }\r
+                       }\r
+                       if(conn != null){\r
+                               try {\r
+                                       conn.close();\r
+                               } catch (SQLException e) {\r
+                                       msoLogger.debug("Exception while closing the connection: " + e);\r
+                               }\r
+                       }\r
                }\r
         \r
        }\r