package org.opendaylight.yangtools.util.concurrent;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.opendaylight.yangtools.util.concurrent.AsyncNotifyingListeningExecutorServiceTest.testListenerCallback;
+import static org.opendaylight.yangtools.util.concurrent.CommonTestUtils.SUBMIT_CALLABLE;
+import static org.opendaylight.yangtools.util.concurrent.CommonTestUtils.SUBMIT_RUNNABLE;
+import static org.opendaylight.yangtools.util.concurrent.CommonTestUtils.SUBMIT_RUNNABLE_WITH_RESULT;
-import java.util.concurrent.Callable;
+import com.google.common.base.Supplier;
+import com.google.common.util.concurrent.FutureCallback;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.ListeningExecutorService;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executor;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
-
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-
-import com.google.common.base.Function;
-import com.google.common.util.concurrent.FutureCallback;
-import com.google.common.util.concurrent.Futures;
-import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.ListeningExecutorService;
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
-
-import static org.opendaylight.yangtools.util.concurrent.AsyncNotifyingListeningExecutorServiceTest.testListenerCallback;
-import static org.opendaylight.yangtools.util.concurrent.CommonTestUtils.Invoker;
-import static org.opendaylight.yangtools.util.concurrent.CommonTestUtils.SUBMIT_CALLABLE;
-import static org.opendaylight.yangtools.util.concurrent.CommonTestUtils.SUBMIT_RUNNABLE;
-import static org.opendaylight.yangtools.util.concurrent.CommonTestUtils.SUBMIT_RUNNABLE_WITH_RESULT;
+import org.opendaylight.yangtools.util.concurrent.CommonTestUtils.Invoker;
/**
* Unit tests for DeadlockDetectingListeningExecutorService.
interface InitialInvoker {
void invokeExecutor( ListeningExecutorService executor, Runnable task );
- };
+ }
- static final InitialInvoker SUBMIT = new InitialInvoker() {
- @Override
- public void invokeExecutor( ListeningExecutorService executor, Runnable task ) {
- executor.submit( task );
- }
- };
+ static final InitialInvoker SUBMIT = ListeningExecutorService::submit;
- static final InitialInvoker EXECUTE = new InitialInvoker() {
- @Override
- public void invokeExecutor( ListeningExecutorService executor, Runnable task ) {
- executor.execute( task );
- }
- };
+ static final InitialInvoker EXECUTE = Executor::execute;
@SuppressWarnings("serial")
public static class TestDeadlockException extends Exception {
}
- public static Function<Void, Exception> DEADLOCK_EXECUTOR_FUNCTION = new Function<Void, Exception>() {
- @Override
- public Exception apply( Void notUsed ) {
- return new TestDeadlockException();
- }
- };
+ private static final Supplier<Exception> DEADLOCK_EXECUTOR_SUPPLIER = TestDeadlockException::new;
DeadlockDetectingListeningExecutorService executor;
@After
public void tearDown() {
- if( executor != null ) {
+ if (executor != null ) {
executor.shutdownNow();
}
}
DeadlockDetectingListeningExecutorService newExecutor() {
return new DeadlockDetectingListeningExecutorService( Executors.newSingleThreadExecutor(),
- DEADLOCK_EXECUTOR_FUNCTION );
+ DEADLOCK_EXECUTOR_SUPPLIER );
}
@Test
// Test submit with Callable.
- ListenableFuture<String> future = executor.submit( new Callable<String>() {
- @Override
- public String call() throws Exception{
- return "foo";
- }
- } );
+ ListenableFuture<String> future = executor.submit(() -> "foo");
assertEquals( "Future result", "foo", future.get( 5, TimeUnit.SECONDS ) );
// Test submit with Runnable.
- executor.submit( new Runnable() {
- @Override
- public void run(){
- }
- } ).get();
+ executor.submit(() -> {
+ }).get();
// Test submit with Runnable and value.
- future = executor.submit( new Runnable() {
- @Override
- public void run(){
- }
+ future = executor.submit(() -> {
}, "foo" );
assertEquals( "Future result", "foo", future.get( 5, TimeUnit.SECONDS ) );
testNonBlockingSubmitOnExecutorThread( EXECUTE, SUBMIT_CALLABLE );
}
- void testNonBlockingSubmitOnExecutorThread( InitialInvoker initialInvoker,
- final Invoker invoker ) throws Throwable {
+ void testNonBlockingSubmitOnExecutorThread( final InitialInvoker initialInvoker,
+ final Invoker invoker ) throws Throwable {
final AtomicReference<Throwable> caughtEx = new AtomicReference<>();
final CountDownLatch futureCompletedLatch = new CountDownLatch( 1 );
- Runnable task = new Runnable() {
- @SuppressWarnings({ "unchecked", "rawtypes" })
+ Runnable task = () -> Futures.addCallback( invoker.invokeExecutor( executor, null ), new FutureCallback() {
@Override
- public void run() {
-
- Futures.addCallback( invoker.invokeExecutor( executor, null ), new FutureCallback() {
- @Override
- public void onSuccess( Object result ) {
- futureCompletedLatch.countDown();
- }
-
- @Override
- public void onFailure( Throwable t ) {
- caughtEx.set( t );
- futureCompletedLatch.countDown();
- }
- } );
+ public void onSuccess( final Object result ) {
+ futureCompletedLatch.countDown();
}
- };
+ @Override
+ public void onFailure( final Throwable t ) {
+ caughtEx.set( t );
+ futureCompletedLatch.countDown();
+ }
+ } );
initialInvoker.invokeExecutor( executor, task );
assertTrue( "Task did not complete - executor likely deadlocked",
- futureCompletedLatch.await( 5, TimeUnit.SECONDS ) );
+ futureCompletedLatch.await( 5, TimeUnit.SECONDS ) );
- if( caughtEx.get() != null ) {
+ if (caughtEx.get() != null ) {
throw caughtEx.get();
}
}
testBlockingSubmitOnExecutorThread( EXECUTE, SUBMIT_CALLABLE );
}
- void testBlockingSubmitOnExecutorThread( InitialInvoker initialInvoker,
- final Invoker invoker ) throws Exception {
+ void testBlockingSubmitOnExecutorThread( final InitialInvoker initialInvoker,
+ final Invoker invoker ) throws Exception {
final AtomicReference<Throwable> caughtEx = new AtomicReference<>();
final CountDownLatch latch = new CountDownLatch( 1 );
- Runnable task = new Runnable() {
- @Override
- public void run() {
-
- try {
- invoker.invokeExecutor( executor, null ).get();
- } catch( ExecutionException e ) {
- caughtEx.set( e.getCause() );
- } catch( Throwable e ) {
- caughtEx.set( e );
- } finally {
- latch.countDown();
- }
- }
+ Runnable task = () -> {
+ try {
+ invoker.invokeExecutor( executor, null ).get();
+ } catch( ExecutionException e ) {
+ caughtEx.set( e.getCause() );
+ } catch( Throwable e ) {
+ caughtEx.set( e );
+ } finally {
+ latch.countDown();
+ }
};
initialInvoker.invokeExecutor( executor, task );
assertTrue( "Task did not complete - executor likely deadlocked",
- latch.await( 5, TimeUnit.SECONDS ) );
+ latch.await( 5, TimeUnit.SECONDS ) );
assertNotNull( "Expected exception thrown", caughtEx.get() );
assertEquals( "Caught exception type", TestDeadlockException.class, caughtEx.get().getClass() );
executor = new DeadlockDetectingListeningExecutorService(
Executors.newSingleThreadExecutor(
new ThreadFactoryBuilder().setNameFormat( "SingleThread" ).build() ),
- DEADLOCK_EXECUTOR_FUNCTION, listenerExecutor );
+ DEADLOCK_EXECUTOR_SUPPLIER, listenerExecutor );
try {
testListenerCallback( executor, SUBMIT_CALLABLE, listenerThreadPrefix );