Sonar critical issues fix

[so.git] / bpmn / MSOURN-plugin / src / main / java / org / openecomp / camunda / bpmn / plugin / urnmap / resources / URNResource.java

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