Fix review chages

Author: lasanthaDLPDS

core/src/main/java/org/wso2/testgrid/core/command/FinalizeRunTestplan.java

@@ -141,11 +141,11 @@ public void execute() throws CommandExecutionException {
             }
             updateProductStatus();
         } catch (IOException e) {
-            logger.error("Error occurred while trying to read " + testPlanYamlFilePath);
+            logger.error("Error occurred while trying to read " + testPlanYamlFilePath, e);
         } catch (TestGridDAOException e) {
-            logger.error("Error while fetching test plan from database.");
+            logger.error("Error while fetching test plan from database.", e);
         } catch (TestGridException e) {
-            logger.error("Error occured while updating the product status.");
+            logger.error("Error occured while updating the product status.", e);
         }
     }
 
@@ -168,7 +168,7 @@ private void persistTestPlan(TestPlan testPlan) {
      *
      */
     private void updateProductStatus() throws TestGridException {
-        Path source = Paths.get(workspace + "/test-plans");
+        Path source = Paths.get(workspace, "test-plans");
         String productId;
         Boolean isCompleteBuild = true;
         try (Stream<Path> stream = Files.list(source).filter(Files::isRegularFile)) {
@@ -200,9 +200,9 @@ private void updateProductStatus() throws TestGridException {
                 }
             }
         } catch (TestGridDAOException e) {
-            logger.error("Error occured when updating the product table of TG");
+            logger.error("Error occured when updating the product table of TG", e);
         } catch (IOException e) {
-            logger.error("Error occured when reading a test plan yaml file");
+            logger.error("Error occured when reading a test plan yaml file", e);
         }
     }
 }

dao/src/main/java/org/wso2/testgrid/dao/repository/ProductRepository.java

@@ -153,31 +153,25 @@ private List<ProductTestStatus> getProductTestStatuses(List<Object[]> results) {
     /**
      * This method updates the last_success_timestamp column or last_failure_timestamp column with given timestamp.
      * The column is selected by considering product status.
+     * ex:- UPDATE product SET last_failure_timestamp = <timestamp> where id = <product_id>;
      *
      * @param status Status of the product
      * @param timestamp Current timestamp
      * @param productId Id of the product
      */
-    public void updateProductStatusTimestamp(Status status, Date timestamp, String productId)
-            throws TestGridDAOException {
-        try {
-            String queryStr = "UPDATE product SET ";
-            if (status.equals(Status.SUCCESS)) {
-                queryStr += "last_success_timestamp = ";
-            } else if (status.equals(Status.FAIL)) {
-                queryStr += "last_failure_timestamp = ";
-            }
-            queryStr += "'" + timestamp + "' where id = '" + productId + "';";
-
-            // Begin entity manager transaction
-            entityManager.getTransaction().begin();
-
-            entityManager.createNativeQuery(queryStr).executeUpdate();
-
-            // Commit transaction
-            entityManager.getTransaction().commit();
-        } catch (Exception e) {
-            throw new TestGridDAOException("Error on executing the native SQL query to update product table.", e);
+    public void updateProductStatusTimestamp(Status status, Date timestamp, String productId) {
+        String queryStr = "UPDATE product SET ";
+        if (status.equals(Status.SUCCESS)) {
+            queryStr += "last_success_timestamp = ";
+        } else if (status.equals(Status.FAIL)) {
+            queryStr += "last_failure_timestamp = ";
         }
+
+        // Begin entity manager transaction
+        entityManager.getTransaction().begin();
+        entityManager.createNativeQuery(
+                StringUtil.concatStrings(queryStr, "'", timestamp, "' where id = '", productId, "';")).executeUpdate();
+        // Commit transaction
+        entityManager.getTransaction().commit();
     }
 }