From c83f9964fcde966e0e259648965e5e3ffc3c69c0 Mon Sep 17 00:00:00 2001
From: Faisal Hameed <faisal.hameed@devfactory.com>
Date: Wed, 25 May 2016 16:14:38 +0500
Subject: [PATCH] Fixing squid:S1155, squid:UselessParenthesesCheck,
 squid:S2153

---
 .../org/easetech/easytest/internal/EasyAssignments.java   | 2 +-
 src/main/java/org/easetech/easytest/io/UrlResource.java   | 2 +-
 .../java/org/easetech/easytest/loader/CSVDataLoader.java  | 2 +-
 .../easytest/reports/data/TestMethodDuration.java         | 2 +-
 .../easetech/easytest/runner/DataDrivenTestRunner.java    | 2 +-
 src/main/java/org/easetech/easytest/util/CommonUtils.java | 2 +-
 src/main/java/org/easetech/easytest/util/GeneralUtil.java | 8 ++++----
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/easetech/easytest/internal/EasyAssignments.java b/src/main/java/org/easetech/easytest/internal/EasyAssignments.java
index 59bc789..d180b9c 100644
--- a/src/main/java/org/easetech/easytest/internal/EasyAssignments.java
+++ b/src/main/java/org/easetech/easytest/internal/EasyAssignments.java
@@ -67,7 +67,7 @@ public static EasyAssignments allUnassigned(Method testMethod, TestClass testCla
     }
 
     public boolean isComplete() {
-        return fUnassigned.size() == 0;
+        return fUnassigned.isEmpty();
     }
 
     public EasyParamSignature nextUnassigned() {
diff --git a/src/main/java/org/easetech/easytest/io/UrlResource.java b/src/main/java/org/easetech/easytest/io/UrlResource.java
index 2897897..98a9e61 100644
--- a/src/main/java/org/easetech/easytest/io/UrlResource.java
+++ b/src/main/java/org/easetech/easytest/io/UrlResource.java
@@ -78,7 +78,7 @@ public boolean exists() {
             HttpURLConnection.setFollowRedirects(false);
             HttpURLConnection con = (HttpURLConnection) URL.openConnection();
             con.setRequestMethod("HEAD");
-            return (con.getResponseCode() == HttpURLConnection.HTTP_OK);
+            return con.getResponseCode() == HttpURLConnection.HTTP_OK;
         } catch (Exception e) {
             Log.debug("Exception occured while trying to find whether the resource exists or not ", e);
             return false;
diff --git a/src/main/java/org/easetech/easytest/loader/CSVDataLoader.java b/src/main/java/org/easetech/easytest/loader/CSVDataLoader.java
index 5c03dbd..c64fe20 100644
--- a/src/main/java/org/easetech/easytest/loader/CSVDataLoader.java
+++ b/src/main/java/org/easetech/easytest/loader/CSVDataLoader.java
@@ -342,7 +342,7 @@ private void writeDataToCSV(Resource resource, Map<String, List<Map<String, Obje
                     String[] finalValues = new String[dataKeys.length];
                     finalValues[0] = EMPTY_STRING;
                     for(int i=1 ;i<dataKeys.length ; i++){
-                        finalValues[i] = (currentRowData.get(dataKeys[i]) == null ? "null" :currentRowData.get(dataKeys[i]).toString());
+                        finalValues[i] = currentRowData.get(dataKeys[i]) == null ? "null" :currentRowData.get(dataKeys[i]).toString();
                     }
                     writeOutputData(currentRowData, finalValues, dataKeys);
                     writableData.add(finalValues);
diff --git a/src/main/java/org/easetech/easytest/reports/data/TestMethodDuration.java b/src/main/java/org/easetech/easytest/reports/data/TestMethodDuration.java
index d352beb..27a6ae7 100644
--- a/src/main/java/org/easetech/easytest/reports/data/TestMethodDuration.java
+++ b/src/main/java/org/easetech/easytest/reports/data/TestMethodDuration.java
@@ -86,7 +86,7 @@ public void setEndInNano(long endInNano) {
 	 * @return Time difference in nano seconds
 	 */
 	public long getNanoDifference() {
-		return (this.endInNano - this.startInNano);
+		return this.endInNano - this.startInNano;
 	}
 
 	/**
diff --git a/src/main/java/org/easetech/easytest/runner/DataDrivenTestRunner.java b/src/main/java/org/easetech/easytest/runner/DataDrivenTestRunner.java
index a74fabc..aa79568 100644
--- a/src/main/java/org/easetech/easytest/runner/DataDrivenTestRunner.java
+++ b/src/main/java/org/easetech/easytest/runner/DataDrivenTestRunner.java
@@ -322,7 +322,7 @@ protected void validateInstanceMethods(List<Throwable> errors) {
         validatePublicVoidNoArgMethods(Before.class, false, errors);
         validateTestMethods(errors);
 
-        if (getTestClass().getAnnotatedMethods(Test.class).size() == 0)
+        if (getTestClass().getAnnotatedMethods(Test.class).isEmpty())
             errors.add(new Exception("No runnable methods"));
     }
 
diff --git a/src/main/java/org/easetech/easytest/util/CommonUtils.java b/src/main/java/org/easetech/easytest/util/CommonUtils.java
index 226b70d..37341c9 100644
--- a/src/main/java/org/easetech/easytest/util/CommonUtils.java
+++ b/src/main/java/org/easetech/easytest/util/CommonUtils.java
@@ -341,7 +341,7 @@ public static String deleteAny(String inString, String charsToDelete) {
      * @see #hasText(String)
      */
     public static boolean hasLength(String str) {
-        return (str != null && str.length() > 0);
+        return str != null && str.length() > 0;
     }
 
     /**
diff --git a/src/main/java/org/easetech/easytest/util/GeneralUtil.java b/src/main/java/org/easetech/easytest/util/GeneralUtil.java
index 8a66c72..13c0bdf 100644
--- a/src/main/java/org/easetech/easytest/util/GeneralUtil.java
+++ b/src/main/java/org/easetech/easytest/util/GeneralUtil.java
@@ -77,8 +77,8 @@ public static Double getRounded(double valueToRound, int numberOfDecimalPlaces)
      * @return String value or null if it is not set in the data.
      */
     public static String getStringValue(String paramName, Map<String, Object> data) {
-        return (data.get(paramName) != null && !data.get(paramName).equals("null") ? data.get(paramName).toString()
-            : null);
+        return data.get(paramName) != null && !data.get(paramName).equals("null") ? data.get(paramName).toString()
+            : null;
 
     }
 
@@ -318,7 +318,7 @@ public static Long convertToLong(Object object) {
         Long longvalue = null;
         if (object != null) {
             if (object instanceof Long) {
-                longvalue = ((Long) object).longValue();
+                longvalue = (Long) object;
             } else if (object instanceof Integer) {
                 longvalue = ((Integer) object).longValue();
             } else if (object instanceof Double) {
@@ -348,7 +348,7 @@ public static Double convertToDouble(Object object) {
             } else if (object instanceof Integer) {
                 doublevalue = ((Integer) object).doubleValue();
             } else if (object instanceof Double) {
-                doublevalue = ((Double) object).doubleValue();
+                doublevalue = (Double) object;
             } else if (object instanceof String && !"".equals((String)object)) {
                 doublevalue = Double.valueOf((String) object);
             }