From 2dcab93bd32ffcde021651cfefa05d4e9b70e46e Mon Sep 17 00:00:00 2001 From: smisger Date: Thu, 18 Feb 2016 19:00:21 +0530 Subject: [PATCH] Fixing squid:UselessParenthesesCheck - Useless parentheses around expressions should be removed to prevent any misunderstanding --- .../java/org/audit4j/core/ValidationManager.java | 10 +++++----- .../core/schedule/ConcurrentTaskScheduler.java | 8 ++++---- .../org/audit4j/core/schedule/CronTrigger.java | 4 ++-- .../audit4j/core/schedule/PeriodicTrigger.java | 4 ++-- .../core/schedule/ReschedulingRunnable.java | 2 +- .../org/audit4j/core/schedule/TaskUtils.java | 4 ++-- .../core/schedule/ThreadPoolTaskScheduler.java | 4 ++-- .../audit4j/core/schedule/util/ClassUtils.java | 2 +- .../schedule/util/CustomizableThreadCreator.java | 4 ++-- .../audit4j/core/schedule/util/StringUtils.java | 16 ++++++++-------- src/main/java/org/audit4j/core/util/EnvUtil.java | 2 +- 11 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/main/java/org/audit4j/core/ValidationManager.java b/src/main/java/org/audit4j/core/ValidationManager.java index 6d32b05..cd0fcf0 100644 --- 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 index f2af0c6..4c6f738 100644 --- 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 index 292a610..6c305d3 100644 --- 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 index c5aa616..3098e60 100644 --- 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 index 80dd9f3..372c76c 100644 --- 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; } } \ No newline at end of file diff --git a/src/main/java/org/audit4j/core/schedule/TaskUtils.java b/src/main/java/org/audit4j/core/schedule/TaskUtils.java index b2431fa..2fd02dd 100644 --- 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 index 0b25f47..3ba729e 100644 --- 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 index 6c6165b..8c36f20 100644 --- 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 index 0be2e4a..cb3c199 100644 --- a/src/main/java/org/audit4j/core/schedule/util/CustomizableThreadCreator.java +++ b/src/main/java/org/audit4j/core/schedule/util/CustomizableThreadCreator.java @@ -38,7 +38,7 @@ 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(); } /** @@ -46,7 +46,7 @@ public CustomizableThreadCreator(String threadNamePrefix) { * 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 index 84b36a9..e3ba1da 100644 --- 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 index bc8e4d6..e9e998a 100644 --- 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; }