Fix eclipse/checkstyle warnings

[yangtools.git] / common / util / src / test / java / org / opendaylight / yangtools / util / concurrent / CommonTestUtils.java

diff --git a/common/util/src/test/java/org/opendaylight/yangtools/util/concurrent/CommonTestUtils.java b/common/util/src/test/java/org/opendaylight/yangtools/util/concurrent/CommonTestUtils.java
index 7404c8c3843995cbd367e6ec6adc568f1855d650..9ee60f7ad045744b5d566c742b2048b49f9d9e60 100644 (file)
--- a/common/util/src/test/java/org/opendaylight/yangtools/util/concurrent/CommonTestUtils.java
+++ b/common/util/src/test/java/org/opendaylight/yangtools/util/concurrent/CommonTestUtils.java
@@ -11,7 +11,6 @@ package org.opendaylight.yangtools.util.concurrent;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.ListeningExecutorService;
 import com.google.common.util.concurrent.Uninterruptibles;
-import java.util.concurrent.Callable;
 import java.util.concurrent.CountDownLatch;
 
 /**
@@ -20,31 +19,27 @@ import java.util.concurrent.CountDownLatch;
  * @author Thomas Pantelis
  */
 public class CommonTestUtils {
-
+    @FunctionalInterface
     public interface Invoker {
-        ListenableFuture<?> invokeExecutor( ListeningExecutorService executor,
-                CountDownLatch blockingLatch );
+        ListenableFuture<?> invokeExecutor(ListeningExecutorService executor, CountDownLatch blockingLatch);
     }
 
-    public static final Invoker SUBMIT_CALLABLE = (executor, blockingLatch) -> executor.submit(new Callable<Void>() {
-        @Override
-        public Void call() throws Exception {
-            if (blockingLatch != null ) {
-                Uninterruptibles.awaitUninterruptibly( blockingLatch );
-            }
-            return null;
+    public static final Invoker SUBMIT_CALLABLE = (executor, blockingLatch) -> executor.submit(() -> {
+        if (blockingLatch != null) {
+            Uninterruptibles.awaitUninterruptibly(blockingLatch);
         }
-    } );
+        return null;
+    });
 
     public static final Invoker SUBMIT_RUNNABLE = (executor, blockingLatch) -> executor.submit(() -> {
-        if (blockingLatch != null ) {
-            Uninterruptibles.awaitUninterruptibly( blockingLatch );
+        if (blockingLatch != null) {
+            Uninterruptibles.awaitUninterruptibly(blockingLatch);
         }
     });
 
     public static final Invoker SUBMIT_RUNNABLE_WITH_RESULT = (executor, blockingLatch) -> executor.submit(() -> {
-        if (blockingLatch != null ) {
-            Uninterruptibles.awaitUninterruptibly( blockingLatch );
+        if (blockingLatch != null) {
+            Uninterruptibles.awaitUninterruptibly(blockingLatch);
         }
-    }, "foo" );
+    }, "foo");
 }