Merge branch 'main' into PR #2663 to update

Author: lqiu96

google-cloud-bigtable-emulator-core/src/main/java/com/google/cloud/bigtable/emulator/core/EmulatorController.java

@@ -44,6 +44,8 @@ public class EmulatorController {
 
   private final Path executable;
   private Process process;
+  private Thread stdoutThread;
+  private Thread stderrThread;
   private boolean isStopped = true;
   private Thread shutdownHook;
 
@@ -127,8 +129,8 @@ public synchronized void start(int port)
         throw e;
       }
     }
-    pipeStreamToLog(process.getInputStream(), Level.INFO);
-    pipeStreamToLog(process.getErrorStream(), Level.WARNING);
+    Thread stdoutThread = pipeStreamToLog(process.getInputStream(), Level.INFO);
+    Thread stderrThread = pipeStreamToLog(process.getErrorStream(), Level.WARNING);
     isStopped = false;
 
     shutdownHook =
@@ -164,6 +166,23 @@ public synchronized void stop() {
     } finally {
       isStopped = true;
       process.destroy();
+
+      try {
+        process.waitFor();
+        if (stdoutThread != null) {
+          stdoutThread.join();
+        }
+        if (stderrThread != null) {
+          stderrThread.join();
+        }
+      } catch (InterruptedException e) {
+        Thread.currentThread().interrupt();
+        LOGGER.log(Level.WARNING, "Interrupted while waiting for emulator to stop", e);
+      } finally {
+        stdoutThread = null;
+        stderrThread = null;
+        process = null;
+      }
     }
   }
 
@@ -239,7 +258,7 @@ private static void waitForPort(int port) throws InterruptedException, TimeoutEx
   }
 
   /** Creates a thread that will pipe an {@link InputStream} to this class' Logger. */
-  private static void pipeStreamToLog(final InputStream stream, final Level level) {
+  private static Thread pipeStreamToLog(final InputStream stream, final Level level) {
     final BufferedReader reader = new BufferedReader(new InputStreamReader(stream));
 
     Thread thread =
@@ -258,6 +277,7 @@ private static void pipeStreamToLog(final InputStream stream, final Level level)
             });
     thread.setDaemon(true);
     thread.start();
+    return thread;
   }
   // </editor-fold>
 }

pom.xml

@@ -263,14 +263,8 @@
 
                         <!-- Hide @InternalApi classes for InstanceAdmin -->
                         <sourceFileExclude>**/com/google/cloud/bigtable/admin/v2/internal/**</sourceFileExclude>
-                        <sourceFileExclude>**/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableInstanceAdminCallableFactory.java</sourceFileExclude>
-                        <sourceFileExclude>**/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableInstanceAdminStub.java</sourceFileExclude>
-                        <sourceFileExclude>**/com/google/cloud/bigtable/admin/v2/stub/BigtableInstanceAdminStub.java</sourceFileExclude>
 
                         <!-- Hide**/ @InternalApi classes for TableAdmin -->
-                        <sourceFileExclude>**/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableTableAdminCallableFactory.java</sourceFileExclude>
-                        <sourceFileExclude>**/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableTableAdminStub.java</sourceFileExclude>
-                        <sourceFileExclude>**/com/google/cloud/bigtable/admin/v2/stub/BigtableTableAdminStub.java</sourceFileExclude>
                         <sourceFileExclude>**/com/google/cloud/bigtable/admin/v2/stub/EnhancedBigtableTableAdminStub.java</sourceFileExclude>
 
                         <!-- Hide**/ @InternalApi classes for Data -->
@@ -327,7 +321,7 @@
                                 <!-- Exclude generating javadocs for internal implementations for admin and data, which
                                  are under internal/ and .v2.stub/, and exclude all BaseClients and BaseSettings.
                                  The only exception is we want to keep the javadoc for StubSettings. -->
-                                -excludeclasses com\.google\.cloud\.bigtable\.admin\.v2\.(internal\.|stub\.(?!Bigtable.*StubSettings).*):com\.google\.cloud\.bigtable\.data\.v2\.(internal\.|(Base.*).*|stub\.(?!Enhanced.*StubSettings).*)
+                                -excludeclasses com\.google\.cloud\.bigtable\.admin\.v2\.internal\..*:com\.google\.cloud\.bigtable\.data\.v2\.(internal\.|(Base.*).*|stub\.(?!Enhanced.*StubSettings).*)
                                 <!-- Exclude the javadocs for the auto-generated raw protos since we don't expose them.
                                  The raw protos generated by gapic are under com.google.bigtable. And the public surface
                                  is under com.google.cloud.bigtable. Also exclude the stats package which is the