Updating guava library to 32

Author: vikas-cs07

cdap-app-fabric-tests/src/test/java/io/cdap/cdap/runtime/WorkflowTest.java

@@ -16,7 +16,6 @@
 package io.cdap.cdap.runtime;
 
 import com.google.common.base.Supplier;
-import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Iterators;
 import com.google.common.util.concurrent.SettableFuture;
@@ -77,7 +76,7 @@ public class WorkflowTest {
     try {
       return tmpFolder.newFolder();
     } catch (IOException e) {
-      throw Throwables.propagate(e);
+      throw new RuntimeException(e);
     }
   };
 

cdap-app-fabric/src/main/java/io/cdap/cdap/app/guice/AppFabricServiceRuntimeModule.java

@@ -17,7 +17,6 @@
 package io.cdap.cdap.app.guice;
 
 import com.google.common.base.Supplier;
-import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.inject.AbstractModule;
@@ -607,7 +606,7 @@ public synchronized org.quartz.Scheduler get() {
             }
             return scheduler;
           } catch (Exception e) {
-            throw Throwables.propagate(e);
+            throw new RuntimeException(e);
           }
         }
       };

cdap-app-fabric/src/main/java/io/cdap/cdap/app/guice/ImpersonatedTwillController.java

@@ -183,7 +183,7 @@ public Void call() throws Exception {
         }
       });
     } catch (Exception e) {
-      throw Throwables.propagate(e);
+      throw new RuntimeException(e);
     }
   }
 

cdap-app-fabric/src/main/java/io/cdap/cdap/app/guice/ImpersonatedTwillPreparer.java

@@ -16,7 +16,6 @@
 
 package io.cdap.cdap.app.guice;
 
-import com.google.common.base.Throwables;
 import io.cdap.cdap.internal.app.runtime.distributed.ForwardingTwillPreparer;
 import io.cdap.cdap.proto.id.ProgramId;
 import io.cdap.cdap.security.TokenSecureStoreRenewer;
@@ -66,7 +65,7 @@ public TwillController start(final long timeout, final TimeUnit timeoutUnit) {
             impersonator, programId);
       });
     } catch (Exception e) {
-      throw Throwables.propagate(e);
+      throw new RuntimeException(e);
     }
   }
 

cdap-app-fabric/src/main/java/io/cdap/cdap/app/guice/ImpersonatedTwillRunnerService.java

@@ -16,7 +16,6 @@
 
 package io.cdap.cdap.app.guice;
 
-import com.google.common.base.Throwables;
 import io.cdap.cdap.common.conf.Constants;
 import io.cdap.cdap.common.twill.TwillAppNames;
 import io.cdap.cdap.internal.app.runtime.distributed.ProgramTwillApplication;
@@ -188,7 +187,7 @@ public void renew(final String application, final RunId runId,
         } catch (Exception e) {
           // it should already be a runtime exception anyways, since none of the methods in the above callable
           // throw any checked exceptions
-          throw Throwables.propagate(e);
+          throw new RuntimeException(e);
         }
       }
     };

cdap-app-fabric/src/main/java/io/cdap/cdap/app/preview/DefaultPreviewRunnerManager.java

@@ -67,7 +67,7 @@
 import org.apache.tephra.TransactionSystemClient;
 import org.apache.twill.common.Threads;
 import org.apache.twill.discovery.DiscoveryServiceClient;
-import org.apache.twill.internal.ServiceListenerAdapter;
+import com.google.common.util.concurrent.Service;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -124,12 +124,12 @@ protected void startUp() throws Exception {
     // Starts common services
     runner = previewInjector.getInstance(PreviewRunner.class);
     if (runner instanceof Service) {
-      ((Service) runner).startAndWait();
+      ((Service) runner).startAsync().awaitRunning();
     }
 
     // Create and start the preview poller services.
     for (int i = 0; i < maxConcurrentPreviews; i++) {
-      createPreviewRunnerService().startAndWait();
+      createPreviewRunnerService().startAsync().awaitRunning();
     }
   }
 
@@ -144,7 +144,7 @@ protected void shutDown() throws Exception {
 
   private void stopQuietly(Service service) {
     try {
-      service.stopAndWait();
+      service.stopAsync().awaitTerminated();
     } catch (Exception e) {
       LOG.warn("Error stopping the preview runner.", e);
     }
@@ -163,8 +163,8 @@ public void stop(ApplicationId preview) throws Exception {
     }
 
     PreviewRunnerService newRunnerService = createPreviewRunnerService();
-    runnerService.stopAndWait();
-    newRunnerService.startAndWait();
+    runnerService.stopAsync().awaitTerminated();
+    newRunnerService.startAsync().awaitRunning();
   }
 
   @Override
@@ -237,14 +237,14 @@ public InetAddress providesHostname(CConfiguration cConf) {
   private PreviewRunnerService createPreviewRunnerService() {
     PreviewRunnerService previewRunnerService = previewRunnerServiceFactory.create(runner);
 
-    previewRunnerService.addListener(new ServiceListenerAdapter() {
+    previewRunnerService.addListener(new Service.Listener() {
 
       @Override
       public void terminated(State from) {
         previewRunnerServices.remove(previewRunnerService);
         if (previewRunnerServices.isEmpty()) {
           try {
-            stop();
+            stopAsync();
           } catch (Exception e) {
             // should not happen
             LOG.error("Failed to shutdown the preview runner manager service.", e);

cdap-app-fabric/src/main/java/io/cdap/cdap/app/preview/PreviewHttpServer.java

@@ -101,7 +101,7 @@ protected void startUp() throws Exception {
             Constants.Logging.COMPONENT_NAME,
             Constants.Service.PREVIEW_HTTP));
     if (previewManager instanceof Service) {
-      ((Service) previewManager).startAndWait();
+      ((Service) previewManager).startAsync().awaitRunning();
     }
 
     httpService.start();
@@ -117,7 +117,7 @@ protected void shutDown() throws Exception {
     try {
       cancelHttpService.cancel();
       if (previewManager instanceof Service) {
-        ((Service) previewManager).stopAndWait();
+        ((Service) previewManager).stopAsync().awaitTerminated();
       }
     } finally {
       httpService.stop();

cdap-app-fabric/src/main/java/io/cdap/cdap/app/runtime/AbstractProgramRuntimeService.java

@@ -21,7 +21,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Table;
-import com.google.common.io.Closeables;
 import com.google.common.util.concurrent.AbstractIdleService;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.google.inject.Inject;
@@ -472,7 +471,13 @@ private ProgramController createController(ProgramId programId, RunId runId,
    */
   private void cleanupRuntimeInfo(@Nullable RuntimeInfo info) {
     if (info instanceof Closeable) {
-      Closeables.closeQuietly((Closeable) info);
+      try {
+
+        ((Closeable) info).close();
+
+      } catch (Exception ignored) {
+
+      }
     }
   }
 

cdap-app-fabric/src/main/java/io/cdap/cdap/app/runtime/DelayedProgramController.java

@@ -18,6 +18,7 @@
 
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.MoreExecutors;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
 import com.google.common.util.concurrent.Uninterruptibles;
@@ -189,7 +190,8 @@ public void onSuccess(ProgramController result) {
             public void onFailure(Throwable t) {
               resultFuture.setException(t);
             }
-          });
+          },
+          MoreExecutors.directExecutor());
     });
     return resultFuture;
   }

cdap-app-fabric/src/main/java/io/cdap/cdap/common/twill/TwillAppLifecycleEventHandler.java

@@ -15,8 +15,6 @@
  */
 package io.cdap.cdap.common.twill;
 
-import com.google.common.base.Throwables;
-import com.google.common.io.Closeables;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.inject.Guice;
@@ -124,7 +122,7 @@ public void initialize(EventHandlerContext context) {
 
       if (clusterMode == ClusterMode.ON_PREMISE) {
         zkClientService = injector.getInstance(ZKClientService.class);
-        zkClientService.startAndWait();
+        zkClientService.startAsync().awaitRunning();
       }
 
       LoggingContextAccessor.setLoggingContext(
@@ -141,7 +139,7 @@ public void initialize(EventHandlerContext context) {
           new ProgramStateWriterWithHeartBeat(programRunId, programStateWriter, messagingService,
               cConf);
     } catch (Exception e) {
-      throw Throwables.propagate(e);
+      throw new RuntimeException(e);
     }
   }
 
@@ -210,9 +208,15 @@ public void aborted() {
 
   @Override
   public void destroy() {
-    Closeables.closeQuietly(logAppenderInitializer);
+    try {
+
+      logAppenderInitializer.close();
+
+    } catch (Exception ignored) {
+
+    }
     if (zkClientService != null) {
-      zkClientService.stop();
+      zkClientService.stopAsync();
     }
   }