Merge pull request #30 from DevFactory/release/Useless-parentheses-around-expressions

janithb · janithb · commit 896902389263 · 2016-02-18T23:32:12.000-08:00
Fixing squid:UselessParenthesesCheck - Useless parentheses around expressions should be removed to prevent any misunderstanding
diff --git a/src/main/java/org/audit4j/core/ValidationManager.java b/src/main/java/org/audit4j/core/ValidationManager.java
@@ -96,7 +96,7 @@ static boolean isSerializable(Object object) {
         } else {
             retVal = false;
         }
-        return (retVal);
+        return retVal;
     }
 
     /**
@@ -108,8 +108,8 @@ static boolean isSerializable(Object object) {
      */
     private static boolean implementsInterface(final Object o) {
         final boolean retVal;
-        retVal = ((o instanceof Serializable) || (o instanceof Externalizable));
-        return (retVal);
+        retVal = (o instanceof Serializable) || (o instanceof Externalizable);
+        return retVal;
     }
 
     /**
@@ -131,7 +131,7 @@ private static boolean attemptToSerialize(final Object o) {
             stream.writeObject(o);
             // could also re-serilalize at this point too
         } catch (final IOException ex) {
-            return (false);
+            return false;
         } finally {
             if (stream != null) {
                 try {
@@ -142,7 +142,7 @@ private static boolean attemptToSerialize(final Object o) {
             }
         }
 
-        return (true);
+        return true;
     }
 
     public static void main(String[] args) {
diff --git a/src/main/java/org/audit4j/core/schedule/ConcurrentTaskScheduler.java b/src/main/java/org/audit4j/core/schedule/ConcurrentTaskScheduler.java
@@ -141,8 +141,8 @@ public ConcurrentTaskScheduler(Executor concurrentExecutor, ScheduledExecutorSer
     public final void setScheduledExecutor(ScheduledExecutorService scheduledExecutor) {
         if (scheduledExecutor != null) {
             this.scheduledExecutor = scheduledExecutor;
-            this.enterpriseConcurrentScheduler = (managedScheduledExecutorServiceClass != null && managedScheduledExecutorServiceClass
-                    .isInstance(scheduledExecutor));
+            this.enterpriseConcurrentScheduler = managedScheduledExecutorServiceClass != null && managedScheduledExecutorServiceClass
+                    .isInstance(scheduledExecutor);
         } else {
             this.scheduledExecutor = Executors.newSingleThreadScheduledExecutor();
             this.enterpriseConcurrentScheduler = false;
@@ -173,8 +173,8 @@ public ScheduledFuture<?> schedule(Runnable task, Trigger trigger) {
             if (this.enterpriseConcurrentScheduler) {
                 return new EnterpriseConcurrentTriggerScheduler().schedule(decorateTask(task, true), trigger);
             } else {
-                ErrorHandler errorHandler = (this.errorHandler != null ? this.errorHandler : TaskUtils
-                        .getDefaultErrorHandler(true));
+                ErrorHandler errorHandler = this.errorHandler != null ? this.errorHandler : TaskUtils
+                        .getDefaultErrorHandler(true);
                 return new ReschedulingRunnable(task, trigger, this.scheduledExecutor, errorHandler).schedule();
             }
         } catch (RejectedExecutionException ex) {
diff --git a/src/main/java/org/audit4j/core/schedule/CronTrigger.java b/src/main/java/org/audit4j/core/schedule/CronTrigger.java
@@ -83,8 +83,8 @@ public String getExpression() {
      */
     @Override
     public boolean equals(Object obj) {
-        return (this == obj || (obj instanceof CronTrigger && this.sequenceGenerator
-                .equals(((CronTrigger) obj).sequenceGenerator)));
+        return this == obj || (obj instanceof CronTrigger && this.sequenceGenerator
+                .equals(((CronTrigger) obj).sequenceGenerator));
     }
 
     /**
diff --git a/src/main/java/org/audit4j/core/schedule/PeriodicTrigger.java b/src/main/java/org/audit4j/core/schedule/PeriodicTrigger.java
@@ -57,7 +57,7 @@ public PeriodicTrigger(long period) {
      */
     public PeriodicTrigger(long period, TimeUnit timeUnit) {
         //Assert.isTrue(period >= 0, "period must not be negative");
-        this.timeUnit = (timeUnit != null ? timeUnit : TimeUnit.MILLISECONDS);
+        this.timeUnit = timeUnit != null ? timeUnit : TimeUnit.MILLISECONDS;
         this.period = this.timeUnit.toMillis(period);
     }
 
@@ -114,7 +114,7 @@ public boolean equals(Object obj) {
             return false;
         }
         PeriodicTrigger other = (PeriodicTrigger) obj;
-        return (this.fixedRate == other.fixedRate && this.initialDelay == other.initialDelay && this.period == other.period);
+        return this.fixedRate == other.fixedRate && this.initialDelay == other.initialDelay && this.period == other.period;
     }
 
     /**
diff --git a/src/main/java/org/audit4j/core/schedule/ReschedulingRunnable.java b/src/main/java/org/audit4j/core/schedule/ReschedulingRunnable.java
@@ -190,6 +190,6 @@ public int compareTo(Delayed other) {
             return 0;
         }
         long diff = getDelay(TimeUnit.MILLISECONDS) - other.getDelay(TimeUnit.MILLISECONDS);
-        return (diff == 0 ? 0 : ((diff < 0) ? -1 : 1));
+        return diff == 0 ? 0 : (diff < 0) ? -1 : 1;
     }
 }
diff --git a/src/main/java/org/audit4j/core/schedule/TaskUtils.java b/src/main/java/org/audit4j/core/schedule/TaskUtils.java
@@ -55,7 +55,7 @@ public static DelegatingErrorHandlingRunnable decorateTaskWithErrorHandler(Runna
         if (task instanceof DelegatingErrorHandlingRunnable) {
             return (DelegatingErrorHandlingRunnable) task;
         }
-        ErrorHandler eh = (errorHandler != null ? errorHandler : getDefaultErrorHandler(isRepeatingTask));
+        ErrorHandler eh = errorHandler != null ? errorHandler : getDefaultErrorHandler(isRepeatingTask);
         return new DelegatingErrorHandlingRunnable(task, eh);
     }
 
@@ -69,7 +69,7 @@ public static DelegatingErrorHandlingRunnable decorateTaskWithErrorHandler(Runna
      * @return the default error handler
      */
     public static ErrorHandler getDefaultErrorHandler(boolean isRepeatingTask) {
-        return (isRepeatingTask ? LOG_AND_SUPPRESS_ERROR_HANDLER : LOG_AND_PROPAGATE_ERROR_HANDLER);
+        return isRepeatingTask ? LOG_AND_SUPPRESS_ERROR_HANDLER : LOG_AND_PROPAGATE_ERROR_HANDLER;
     }
 
     /**
diff --git a/src/main/java/org/audit4j/core/schedule/ThreadPoolTaskScheduler.java b/src/main/java/org/audit4j/core/schedule/ThreadPoolTaskScheduler.java
@@ -304,8 +304,8 @@ public boolean prefersShortLivedTasks() {
     public ScheduledFuture<?> schedule(Runnable task, Trigger trigger) {
         ScheduledExecutorService executor = getScheduledExecutor();
         try {
-            ErrorHandler errorHandler = (this.errorHandler != null ? this.errorHandler : TaskUtils
-                    .getDefaultErrorHandler(true));
+            ErrorHandler errorHandler = this.errorHandler != null ? this.errorHandler : TaskUtils
+                    .getDefaultErrorHandler(true);
             return new ReschedulingRunnable(task, trigger, executor, errorHandler).schedule();
         } catch (RejectedExecutionException ex) {
             throw new TaskRejectedException("Executor [" + executor + "] did not accept task: " + task, ex);
diff --git a/src/main/java/org/audit4j/core/schedule/util/ClassUtils.java b/src/main/java/org/audit4j/core/schedule/util/ClassUtils.java
@@ -29,7 +29,7 @@ private ClassUtils(){
      * @see Class#getMethod
      */
     public static boolean hasMethod(Class<?> clazz, String methodName, Class<?>... paramTypes) {
-        return (getMethodIfAvailable(clazz, methodName, paramTypes) != null);
+        return getMethodIfAvailable(clazz, methodName, paramTypes) != null;
     }
 
     /**
diff --git a/src/main/java/org/audit4j/core/schedule/util/CustomizableThreadCreator.java b/src/main/java/org/audit4j/core/schedule/util/CustomizableThreadCreator.java
@@ -38,15 +38,15 @@ public CustomizableThreadCreator() {
      *            the prefix to use for the names of newly created threads
      */
     public CustomizableThreadCreator(String threadNamePrefix) {
-        this.threadNamePrefix = (threadNamePrefix != null ? threadNamePrefix : getDefaultThreadNamePrefix());
+        this.threadNamePrefix = threadNamePrefix != null ? threadNamePrefix : getDefaultThreadNamePrefix();
     }
 
     /**
      * Specify the prefix to use for the names of newly created threads. Default
      * is "SimpleAsyncTaskExecutor-".
      */
     public void setThreadNamePrefix(String threadNamePrefix) {
-        this.threadNamePrefix = (threadNamePrefix != null ? threadNamePrefix : getDefaultThreadNamePrefix());
+        this.threadNamePrefix = threadNamePrefix != null ? threadNamePrefix : getDefaultThreadNamePrefix();
     }
 
     /**
diff --git a/src/main/java/org/audit4j/core/schedule/util/StringUtils.java b/src/main/java/org/audit4j/core/schedule/util/StringUtils.java
@@ -48,7 +48,7 @@ private StringUtils(){
      * @since 3.2.1
      */
     public static boolean isEmpty(Object str) {
-        return (str == null || "".equals(str));
+        return str == null || "".equals(str);
     }
 
     /**
@@ -70,7 +70,7 @@ public static boolean isEmpty(Object str) {
      * @see #hasText(String)
      */
     public static boolean hasLength(CharSequence str) {
-        return (str != null && str.length() > 0);
+        return str != null && str.length() > 0;
     }
 
     /**
@@ -470,7 +470,7 @@ public static String deleteAny(String inString, String charsToDelete) {
      *         input was {@code null}
      */
     public static String quote(String str) {
-        return (str != null ? "'" + str + "'" : null);
+        return str != null ? "'" + str + "'" : null;
     }
 
     /**
@@ -483,7 +483,7 @@ public static String quote(String str) {
      *         if not a String
      */
     public static Object quoteIfString(Object obj) {
-        return (obj instanceof String ? quote((String) obj) : obj);
+        return obj instanceof String ? quote((String) obj) : obj;
     }
 
     /**
@@ -561,7 +561,7 @@ public static String getFilename(String path) {
             return null;
         }
         int separatorIndex = path.lastIndexOf(FOLDER_SEPARATOR);
-        return (separatorIndex != -1 ? path.substring(separatorIndex + 1) : path);
+        return separatorIndex != -1 ? path.substring(separatorIndex + 1) : path;
     }
 
     /**
@@ -726,8 +726,8 @@ public static boolean pathEquals(String path1, String path2) {
      */
     public static Locale parseLocaleString(String localeString) {
         String[] parts = tokenizeToStringArray(localeString, "_ ", false, false);
-        String language = (parts.length > 0 ? parts[0] : "");
-        String country = (parts.length > 1 ? parts[1] : "");
+        String language = parts.length > 0 ? parts[0] : "";
+        String country = parts.length > 1 ? parts[1] : "";
         validateLocalePart(language);
         validateLocalePart(country);
         String variant = "";
@@ -743,7 +743,7 @@ public static Locale parseLocaleString(String localeString) {
                 variant = trimLeadingCharacter(variant, '_');
             }
         }
-        return (language.length() > 0 ? new Locale(language, country, variant) : null);
+        return language.length() > 0 ? new Locale(language, country, variant) : null;
     }
 
     private static void validateLocalePart(String localePart) {
diff --git a/src/main/java/org/audit4j/core/util/EnvUtil.java b/src/main/java/org/audit4j/core/util/EnvUtil.java
@@ -112,7 +112,7 @@ static public boolean isJaninoAvailable() {
         ClassLoader classLoader = EnvUtil.class.getClassLoader();
         try {
             Class<?> bindingClass = classLoader.loadClass("org.codehaus.janino.ScriptEvaluator");
-            return (bindingClass != null);
+            return bindingClass != null;
         } catch (ClassNotFoundException e) {
             return false;
         }

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ static boolean isSerializable(Object object) {`
`96`	`96`	`} else {`
`97`	`97`	`retVal = false;`
`98`	`98`	`}`
`99`		`- return (retVal);`
	`99`	`+ return retVal;`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`/**`
`@@ -108,8 +108,8 @@ static boolean isSerializable(Object object) {`
`108`	`108`	`*/`
`109`	`109`	`private static boolean implementsInterface(final Object o) {`
`110`	`110`	`final boolean retVal;`
`111`		`- retVal = ((o instanceof Serializable) \|\| (o instanceof Externalizable));`
`112`		`- return (retVal);`
	`111`	`+ retVal = (o instanceof Serializable) \|\| (o instanceof Externalizable);`
	`112`	`+ return retVal;`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`/**`
`@@ -131,7 +131,7 @@ private static boolean attemptToSerialize(final Object o) {`
`131`	`131`	`stream.writeObject(o);`
`132`	`132`	`// could also re-serilalize at this point too`
`133`	`133`	`} catch (final IOException ex) {`
`134`		`- return (false);`
	`134`	`+ return false;`
`135`	`135`	`} finally {`
`136`	`136`	`if (stream != null) {`
`137`	`137`	`try {`
`@@ -142,7 +142,7 @@ private static boolean attemptToSerialize(final Object o) {`
`142`	`142`	`}`
`143`	`143`	`}`
`144`	`144`
`145`		`- return (true);`
	`145`	`+ return true;`
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`public static void main(String[] args) {`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public PeriodicTrigger(long period) {`
`57`	`57`	`*/`
`58`	`58`	`public PeriodicTrigger(long period, TimeUnit timeUnit) {`
`59`	`59`	`//Assert.isTrue(period >= 0, "period must not be negative");`
`60`		`- this.timeUnit = (timeUnit != null ? timeUnit : TimeUnit.MILLISECONDS);`
	`60`	`+ this.timeUnit = timeUnit != null ? timeUnit : TimeUnit.MILLISECONDS;`
`61`	`61`	`this.period = this.timeUnit.toMillis(period);`
`62`	`62`	`}`
`63`	`63`
`@@ -114,7 +114,7 @@ public boolean equals(Object obj) {`
`114`	`114`	`return false;`
`115`	`115`	`}`
`116`	`116`	`PeriodicTrigger other = (PeriodicTrigger) obj;`
`117`		`- return (this.fixedRate == other.fixedRate && this.initialDelay == other.initialDelay && this.period == other.period);`
	`117`	`+ return this.fixedRate == other.fixedRate && this.initialDelay == other.initialDelay && this.period == other.period;`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -190,6 +190,6 @@ public int compareTo(Delayed other) {`
`190`	`190`	`return 0;`
`191`	`191`	`}`
`192`	`192`	`long diff = getDelay(TimeUnit.MILLISECONDS) - other.getDelay(TimeUnit.MILLISECONDS);`
`193`		`- return (diff == 0 ? 0 : ((diff < 0) ? -1 : 1));`
	`193`	`+ return diff == 0 ? 0 : (diff < 0) ? -1 : 1;`
`194`	`194`	`}`
`195`	`195`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public static DelegatingErrorHandlingRunnable decorateTaskWithErrorHandler(Runna`
`55`	`55`	`if (task instanceof DelegatingErrorHandlingRunnable) {`
`56`	`56`	`return (DelegatingErrorHandlingRunnable) task;`
`57`	`57`	`}`
`58`		`- ErrorHandler eh = (errorHandler != null ? errorHandler : getDefaultErrorHandler(isRepeatingTask));`
	`58`	`+ ErrorHandler eh = errorHandler != null ? errorHandler : getDefaultErrorHandler(isRepeatingTask);`
`59`	`59`	`return new DelegatingErrorHandlingRunnable(task, eh);`
`60`	`60`	`}`
`61`	`61`
`@@ -69,7 +69,7 @@ public static DelegatingErrorHandlingRunnable decorateTaskWithErrorHandler(Runna`
`69`	`69`	`* @return the default error handler`
`70`	`70`	`*/`
`71`	`71`	`public static ErrorHandler getDefaultErrorHandler(boolean isRepeatingTask) {`
`72`		`- return (isRepeatingTask ? LOG_AND_SUPPRESS_ERROR_HANDLER : LOG_AND_PROPAGATE_ERROR_HANDLER);`
	`72`	`+ return isRepeatingTask ? LOG_AND_SUPPRESS_ERROR_HANDLER : LOG_AND_PROPAGATE_ERROR_HANDLER;`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ private ClassUtils(){`
`29`	`29`	`* @see Class#getMethod`
`30`	`30`	`*/`
`31`	`31`	`public static boolean hasMethod(Class<?> clazz, String methodName, Class<?>... paramTypes) {`
`32`		`- return (getMethodIfAvailable(clazz, methodName, paramTypes) != null);`
	`32`	`+ return getMethodIfAvailable(clazz, methodName, paramTypes) != null;`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`/**`