Fix checkstyle/findbugs violations in the toaster sample
[controller.git] / opendaylight / md-sal / samples / toaster-consumer / src / main / java / org / opendaylight / controller / sample / kitchen / impl / KitchenServiceImpl.java
index 55bb9e426707684a302fb4275d475aaa5f1767cd..0583368c20f97e7601dbbf0c0b37f720116636b2 100644 (file)
@@ -17,7 +17,6 @@ import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.ListeningExecutorService;
 import com.google.common.util.concurrent.MoreExecutors;
 import java.util.List;
-import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
@@ -43,12 +42,11 @@ import org.slf4j.LoggerFactory;
 public class KitchenServiceImpl extends AbstractMXBean
         implements KitchenService, KitchenServiceRuntimeMXBean, ToasterListener {
 
-    private static final Logger log = LoggerFactory.getLogger( KitchenServiceImpl.class );
+    private static final Logger LOG = LoggerFactory.getLogger(KitchenServiceImpl.class);
 
     private final ToasterService toaster;
 
-    private final ListeningExecutorService executor =
-                                   MoreExecutors.listeningDecorator( Executors.newCachedThreadPool() );
+    private final ListeningExecutorService executor = MoreExecutors.listeningDecorator(Executors.newCachedThreadPool());
 
     private volatile boolean toasterOutOfBread;
 
@@ -58,98 +56,77 @@ public class KitchenServiceImpl extends AbstractMXBean
     }
 
     @Override
-    public Future<RpcResult<Void>> makeBreakfast( EggsType eggsType, Class<? extends ToastType> toastType,
-                                                  int toastDoneness ) {
+    public Future<RpcResult<Void>> makeBreakfast(EggsType eggsType, Class<? extends ToastType> toastType,
+            int toastDoneness) {
+        // Call makeToast and use JdkFutureAdapters to convert the Future to a ListenableFuture, The
+        // OpendaylightToaster impl already returns a ListenableFuture so the conversion is actually a no-op.
 
-        // Call makeToast and use JdkFutureAdapters to convert the Future to a ListenableFuture,
-        // The OpendaylightToaster impl already returns a ListenableFuture so the conversion is
-        // actually a no-op.
+        ListenableFuture<RpcResult<Void>> makeToastFuture = JdkFutureAdapters
+                .listenInPoolThread(makeToast(toastType, toastDoneness), executor);
 
-        ListenableFuture<RpcResult<Void>> makeToastFuture = JdkFutureAdapters.listenInPoolThread(
-                makeToast( toastType, toastDoneness ), executor );
+        ListenableFuture<RpcResult<Void>> makeEggsFuture = makeEggs(eggsType);
 
-        ListenableFuture<RpcResult<Void>> makeEggsFuture = makeEggs( eggsType );
+        // Combine the 2 ListenableFutures into 1 containing a list RpcResults.
 
-        // Combine the 2 ListenableFutures into 1 containing a list of RpcResults.
-
-        ListenableFuture<List<RpcResult<Void>>> combinedFutures =
-                Futures.allAsList( ImmutableList.of( makeToastFuture, makeEggsFuture ) );
+        ListenableFuture<List<RpcResult<Void>>> combinedFutures = Futures
+                .allAsList(ImmutableList.of(makeToastFuture, makeEggsFuture));
 
         // Then transform the RpcResults into 1.
 
-        return Futures.transform( combinedFutures,
-            new AsyncFunction<List<RpcResult<Void>>,RpcResult<Void>>() {
-                @Override
-                public ListenableFuture<RpcResult<Void>> apply( List<RpcResult<Void>> results )
-                                                                                 throws Exception {
-                    boolean atLeastOneSucceeded = false;
-                    Builder<RpcError> errorList = ImmutableList.builder();
-                    for( RpcResult<Void> result: results ) {
-                        if( result.isSuccessful() ) {
-                            atLeastOneSucceeded = true;
-                        }
-
-                        if( result.getErrors() != null ) {
-                            errorList.addAll( result.getErrors() );
-                        }
+        return Futures.transform(combinedFutures,
+            (AsyncFunction<List<RpcResult<Void>>, RpcResult<Void>>) results -> {
+                boolean atLeastOneSucceeded = false;
+                Builder<RpcError> errorList = ImmutableList.builder();
+                for (RpcResult<Void> result : results) {
+                    if (result.isSuccessful()) {
+                        atLeastOneSucceeded = true;
                     }
 
-                    return Futures.immediateFuture(
-                              RpcResultBuilder.<Void> status( atLeastOneSucceeded )
-                                              .withRpcErrors( errorList.build() ).build() );
+                    if (result.getErrors() != null) {
+                        errorList.addAll(result.getErrors());
+                    }
                 }
-        } );
-    }
-
-    private ListenableFuture<RpcResult<Void>> makeEggs( EggsType eggsType ) {
 
-        return executor.submit( new Callable<RpcResult<Void>>() {
-
-            @Override
-            public RpcResult<Void> call() throws Exception {
+                return Futures.immediateFuture(RpcResultBuilder.<Void>status(atLeastOneSucceeded)
+                        .withRpcErrors(errorList.build()).build());
+            });
+    }
 
-                // We don't actually do anything here - just return a successful result.
-                return RpcResultBuilder.<Void> success().build();
-            }
-        } );
+    private ListenableFuture<RpcResult<Void>> makeEggs(EggsType eggsType) {
+        return executor.submit(() -> RpcResultBuilder.<Void>success().build());
     }
 
-    private Future<RpcResult<Void>> makeToast( Class<? extends ToastType> toastType,
-                                               int toastDoneness ) {
+    private Future<RpcResult<Void>> makeToast(Class<? extends ToastType> toastType, int toastDoneness) {
 
-        if( toasterOutOfBread )
-        {
-            log.info( "We're out of toast but we can make eggs" );
-            return Futures.immediateFuture( RpcResultBuilder.<Void> success()
-                     .withWarning( ErrorType.APPLICATION, "partial-operation",
-                                      "Toaster is out of bread but we can make you eggs" ).build() );
+        if (toasterOutOfBread) {
+            LOG.info("We're out of toast but we can make eggs");
+            return Futures.immediateFuture(RpcResultBuilder.<Void>success().withWarning(ErrorType.APPLICATION,
+                    "partial-operation", "Toaster is out of bread but we can make you eggs").build());
         }
 
         // Access the ToasterService to make the toast.
 
-        MakeToastInput toastInput = new MakeToastInputBuilder()
-            .setToasterDoneness( (long) toastDoneness )
-            .setToasterToastType( toastType )
-            .build();
+        MakeToastInput toastInput = new MakeToastInputBuilder().setToasterDoneness((long) toastDoneness)
+                .setToasterToastType(toastType).build();
 
-        return toaster.makeToast( toastInput );
+        return toaster.makeToast(toastInput);
     }
 
     @Override
     public Boolean makeScrambledWithWheat() {
         try {
             // This call has to block since we must return a result to the JMX client.
-            RpcResult<Void> result = makeBreakfast( EggsType.SCRAMBLED, WheatBread.class, 2 ).get();
-            if( result.isSuccessful() ) {
-                log.info( "makeBreakfast succeeded" );
+            RpcResult<Void> result = makeBreakfast(EggsType.SCRAMBLED, WheatBread.class, 2).get();
+            if (result.isSuccessful()) {
+                LOG.info("makeBreakfast succeeded");
             } else {
-                log.warn( "makeBreakfast failed: " + result.getErrors() );
+                LOG.warn("makeBreakfast failed: " + result.getErrors());
             }
 
             return result.isSuccessful();
 
-        } catch( InterruptedException | ExecutionException e ) {
-            log.warn( "An error occurred while maing breakfast: " + e );
+        } catch (InterruptedException | ExecutionException e) {
+            LOG.warn("An error occurred while maing breakfast: " + e);
         }
 
         return Boolean.FALSE;
@@ -159,8 +136,8 @@ public class KitchenServiceImpl extends AbstractMXBean
      * Implemented from the ToasterListener interface.
      */
     @Override
-    public void onToasterOutOfBread( ToasterOutOfBread notification ) {
-        log.info( "ToasterOutOfBread notification" );
+    public void onToasterOutOfBread(ToasterOutOfBread notification) {
+        LOG.info("ToasterOutOfBread notification");
         toasterOutOfBread = true;
     }
 
@@ -168,8 +145,8 @@ public class KitchenServiceImpl extends AbstractMXBean
      * Implemented from the ToasterListener interface.
      */
     @Override
-    public void onToasterRestocked( ToasterRestocked notification ) {
-        log.info( "ToasterRestocked notification - amountOfBread: " + notification.getAmountOfBread() );
+    public void onToasterRestocked(ToasterRestocked notification) {
+        LOG.info("ToasterRestocked notification - amountOfBread: " + notification.getAmountOfBread());
         toasterOutOfBread = false;
     }
 }