Remove redundant type arguments

[yangtools.git] / common / util / src / main / java / org / opendaylight / yangtools / util / ExecutorServiceUtil.java

diff --git a/common/util/src/main/java/org/opendaylight/yangtools/util/ExecutorServiceUtil.java b/common/util/src/main/java/org/opendaylight/yangtools/util/ExecutorServiceUtil.java
index 429bb0bd0c0e66ce33b49f6f619bdbb1e004c4ee..c6a933ab0d2fde82185a0436418430b1413c9664 100644 (file)
--- a/common/util/src/main/java/org/opendaylight/yangtools/util/ExecutorServiceUtil.java
+++ b/common/util/src/main/java/org/opendaylight/yangtools/util/ExecutorServiceUtil.java
@@ -14,6 +14,7 @@ import java.util.concurrent.RejectedExecutionException;
 import java.util.concurrent.RejectedExecutionHandler;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
+import org.eclipse.jdt.annotation.NonNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -23,9 +24,10 @@ import org.slf4j.LoggerFactory;
 public final class ExecutorServiceUtil {
     private static final class WaitInQueueExecutionHandler implements RejectedExecutionHandler {
         @Override
+        @SuppressWarnings("checkstyle:parameterName")
         public void rejectedExecution(final Runnable r, final ThreadPoolExecutor executor) {
-            if (executor.isShutdown() ) {
-                throw new RejectedExecutionException( "Executor has been shutdown." );
+            if (executor.isShutdown()) {
+                throw new RejectedExecutionException("Executor has been shutdown.");
             }
 
             try {
@@ -38,10 +40,10 @@ public final class ExecutorServiceUtil {
     }
 
     private static final Logger LOG = LoggerFactory.getLogger(ExecutorServiceUtil.class);
-    private static final RejectedExecutionHandler WAIT_IN_QUEUE_HANDLER = new WaitInQueueExecutionHandler();
+    private static final @NonNull RejectedExecutionHandler WAIT_IN_QUEUE_HANDLER = new WaitInQueueExecutionHandler();
 
     private ExecutorServiceUtil() {
-        throw new UnsupportedOperationException("Utility class");
+        // Hidden on purpose
     }
 
     /**
@@ -53,9 +55,10 @@ public final class ExecutorServiceUtil {
      * @param delegate Backing blocking queue.
      * @return A new blocking queue backed by the delegate
      */
-    public static <E> BlockingQueue<E> offerFailingBlockingQueue(final BlockingQueue<E> delegate) {
-        return new ForwardingBlockingQueue<E>() {
+    public static <E> @NonNull BlockingQueue<E> offerFailingBlockingQueue(final BlockingQueue<E> delegate) {
+        return new ForwardingBlockingQueue<>() {
             @Override
+            @SuppressWarnings("checkstyle:parameterName")
             public boolean offer(final E o) {
                 return false;
             }
@@ -73,7 +76,7 @@ public final class ExecutorServiceUtil {
      *
      * @return A shared RejectedExecutionHandler instance.
      */
-    public static RejectedExecutionHandler waitInQueueExecutionHandler() {
+    public static @NonNull RejectedExecutionHandler waitInQueueExecutionHandler() {
         return WAIT_IN_QUEUE_HANDLER;
     }
 
@@ -82,16 +85,15 @@ public final class ExecutorServiceUtil {
      * timeout period. If the timeout elapses before termination, the executor is forcefully
      * shutdown.
      */
-    public static void tryGracefulShutdown(final ExecutorService executor, long timeout,
-            TimeUnit unit ) {
-
+    public static void tryGracefulShutdown(final @NonNull ExecutorService executor, final long timeout,
+            final @NonNull TimeUnit unit) {
         executor.shutdown();
 
         try {
             if (!executor.awaitTermination(timeout, unit)) {
                 executor.shutdownNow();
             }
-        } catch( InterruptedException e ) {
+        } catch (InterruptedException e) {
             executor.shutdownNow();
         }
     }