make pubsub high perf compile (#1474)

* merge from master * make pubsub high perf compile * make AckDeadlineRenewerTest pass
googleapis · Dec 13, 2016 · 4dd7d79 · 4dd7d79
1 parent 57ea1f2
commit 4dd7d79
Show file tree

Hide file tree

Showing 43 changed files with 92 additions and 611 deletions.
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@ Java idiomatic client for [Google Cloud Platform][cloud-platform] services.
 
 [![Build Status](https://travis-ci.org/GoogleCloudPlatform/google-cloud-java.svg?branch=master)](https://travis-ci.org/GoogleCloudPlatform/google-cloud-java)
 [![Coverage Status](https://coveralls.io/repos/GoogleCloudPlatform/google-cloud-java/badge.svg?branch=master)](https://coveralls.io/r/GoogleCloudPlatform/google-cloud-java?branch=master)
-[![Maven](https://img.shields.io/maven-central/v/com.google.cloud/google-cloud.svg)]( https://img.shields.io/maven-central/v/com.google.cloud/google-cloud.svg)
+[![Maven](https://img.shields.io/maven-central/v/com.google.cloud/google-cloud.svg)](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22com.google.cloud%22%20a%3A%22google-cloud%22)
 [![Codacy Badge](https://api.codacy.com/project/badge/grade/9da006ad7c3a4fe1abd142e77c003917)](https://www.codacy.com/app/mziccard/google-cloud-java)
 [![Dependency Status](https://www.versioneye.com/user/projects/56bd8ee72a29ed002d2b0969/badge.svg?style=flat)](https://www.versioneye.com/user/projects/56bd8ee72a29ed002d2b0969)
 
@@ -43,16 +43,16 @@ If you are using Maven, add this to your pom.xml file
 <dependency>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud</artifactId>
-  <version>0.7.0</version>
+  <version>0.8.0</version>
 </dependency>
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud:0.7.0'
+compile 'com.google.cloud:google-cloud:0.8.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud" % "0.7.0"
+libraryDependencies += "com.google.cloud" % "google-cloud" % "0.8.0"
 ```
 
 Example Applications

diff --git a/google-cloud-bigquery/README.md b/google-cloud-bigquery/README.md
@@ -22,16 +22,16 @@ If you are using Maven, add this to your pom.xml file
 <dependency>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-bigquery</artifactId>
-  <version>0.7.0</version>
+  <version>0.8.0-beta</version>
 </dependency>
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-bigquery:0.7.0'
+compile 'com.google.cloud:google-cloud-bigquery:0.8.0-beta'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-bigquery" % "0.7.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-bigquery" % "0.8.0-beta"
 ```
 
 Example Application

diff --git a/google-cloud-bigquery/pom.xml b/google-cloud-bigquery/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-pom</artifactId>
-    <version>0.8.0</version>
+    <version>0.8.1-SNAPSHOT</version>
   </parent>
   <properties>
     <site.installationModule>google-cloud-bigquery</site.installationModule>

diff --git a/google-cloud-compute/README.md b/google-cloud-compute/README.md
@@ -22,16 +22,16 @@ If you are using Maven, add this to your pom.xml file
 <dependency>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-compute</artifactId>
-  <version>0.7.0</version>
+  <version>0.8.0</version>
 </dependency>
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-compute:0.7.0'
+compile 'com.google.cloud:google-cloud-compute:0.8.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-compute" % "0.7.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-compute" % "0.8.0"
 ```
 
 Example Application

diff --git a/google-cloud-compute/pom.xml b/google-cloud-compute/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-pom</artifactId>
-    <version>0.8.0</version>
+    <version>0.8.1-SNAPSHOT</version>
   </parent>
   <properties>
     <site.installationModule>google-cloud-compute</site.installationModule>

diff --git a/google-cloud-contrib/README.md b/google-cloud-contrib/README.md
@@ -25,16 +25,16 @@ If you are using Maven, add this to your pom.xml file
 <dependency>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-contrib</artifactId>
-  <version>0.7.0</version>
+  <version>0.8.0</version>
 </dependency>
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-contrib:0.7.0'
+compile 'com.google.cloud:google-cloud-contrib:0.8.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-contrib" % "0.7.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-contrib" % "0.8.0"
 ```
 
 ### google-cloud-nio-examples

diff --git a/google-cloud-contrib/google-cloud-nio-examples/pom.xml b/google-cloud-contrib/google-cloud-nio-examples/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-contrib</artifactId>
-    <version>0.8.0</version>
+    <version>0.8.1-SNAPSHOT</version>
   </parent>
   <properties>
     <site.installationModule>google-cloud-nio-examples</site.installationModule>

diff --git a/google-cloud-contrib/google-cloud-nio/README.md b/google-cloud-contrib/google-cloud-nio/README.md
@@ -26,16 +26,16 @@ If you are using Maven, add this to your pom.xml file
 <dependency>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-nio</artifactId>
-  <version>0.7.0</version>
+  <version>0.8.0</version>
 </dependency>
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-nio:0.7.0'
+compile 'com.google.cloud:google-cloud-nio:0.8.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-nio" % "0.7.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-nio" % "0.8.0"
 ```
 
 Example Applications

diff --git a/google-cloud-contrib/google-cloud-nio/pom.xml b/google-cloud-contrib/google-cloud-nio/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-contrib</artifactId>
-    <version>0.8.0</version>
+    <version>0.8.1-SNAPSHOT</version>
   </parent>
   <properties>
     <site.installationModule>google-cloud-nio</site.installationModule>

diff --git a/google-cloud-contrib/pom.xml b/google-cloud-contrib/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-pom</artifactId>
-    <version>0.8.0</version>
+    <version>0.8.1-SNAPSHOT</version>
   </parent>
   <properties>
     <site.installationModule>google-cloud-contrib</site.installationModule>

diff --git a/google-cloud-core/README.md b/google-cloud-core/README.md
@@ -19,16 +19,16 @@ If you are using Maven, add this to your pom.xml file
 <dependency>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-core</artifactId>
-  <version>0.7.0</version>
+  <version>0.8.0</version>
 </dependency>
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-core:0.7.0'
+compile 'com.google.cloud:google-cloud-core:0.8.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-core" % "0.7.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-core" % "0.8.0"
 ```
 
 Troubleshooting

diff --git a/google-cloud-core/pom.xml b/google-cloud-core/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-pom</artifactId>
-    <version>0.8.0</version>
+    <version>0.8.1-SNAPSHOT</version>
   </parent>
   <properties>
     <site.installationModule>google-cloud-core</site.installationModule>

diff --git a/google-cloud-core/src/main/java/com/google/cloud/testing/BaseEmulatorHelper.java b/google-cloud-core/src/main/java/com/google/cloud/testing/BaseEmulatorHelper.java
@@ -114,15 +114,15 @@ protected final void startProcess(String blockUntilOutput)
    * and stop any possible thread listening for its output.
    */
   protected final int waitForProcess(Duration timeout) throws IOException, InterruptedException, TimeoutException {
-    if (blockingProcessReader != null) {
-      blockingProcessReader.terminate();
-      blockingProcessReader = null;
-    }
     if (activeRunner != null) {
       int exitCode = activeRunner.waitFor(timeout);
       activeRunner = null;
       return exitCode;
     }
+    if (blockingProcessReader != null) {
+      blockingProcessReader.join();
+      blockingProcessReader = null;
+    }
     return 0;
   }
 

diff --git a/google-cloud-core/src/main/java/com/google/cloud/testing/BlockingProcessStreamReader.java b/google-cloud-core/src/main/java/com/google/cloud/testing/BlockingProcessStreamReader.java
@@ -61,10 +61,6 @@ private BlockingProcessStreamReader(String emulator, InputStream stream, String
     }
   }
 
-  void terminate() throws IOException {
-    interrupt();
-  }
-
   @Override
   public void run() {
     String previousLine = "";
@@ -79,9 +75,7 @@ public void run() {
         processLogLine(previousLine, nextLine);
       }
     } catch (IOException e) {
-      if (!isInterrupted()) {
-        e.printStackTrace(System.err);
-      }
+      e.printStackTrace(System.err);
     }
     processLogLine(previousLine, firstNonNull(nextLine, ""));
     writeLog();

diff --git a/...le-cloud-core/src/test/java/com/google/cloud/testing/BlockingProcessStreamReaderTest.java b/...le-cloud-core/src/test/java/com/google/cloud/testing/BlockingProcessStreamReaderTest.java
@@ -74,15 +74,6 @@ Multimap<Level, String> getLogs() {
     }
   }
 
-  @Test
-  public void testBlockUntil() throws IOException {
-    InputStream stream = new ByteArrayInputStream(OUTPUT.getBytes(Charsets.UTF_8));
-    BlockingProcessStreamReader thread =
-        BlockingProcessStreamReader.start("emulator", stream, BLOCK_UNTIL, null);
-    thread.terminate();
-    stream.close();
-  }
-
   @Test
   public void testForwardLogEntry() throws IOException, InterruptedException {
     TestLogger logger = new TestLogger();

diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md
@@ -22,16 +22,16 @@ If you are using Maven, add this to your pom.xml file
 <dependency>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-datastore</artifactId>
-  <version>0.7.0</version>
+  <version>0.8.0-beta</version>
 </dependency>
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:0.7.0'
+compile 'com.google.cloud:google-cloud-datastore:0.8.0-beta'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "0.7.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "0.8.0-beta"
 ```
 
 Example Application

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-pom</artifactId>
-    <version>0.8.0</version>
+    <version>0.8.1-SNAPSHOT</version>
   </parent>
   <properties>
     <site.installationModule>google-cloud-datastore</site.installationModule>

diff --git a/google-cloud-dns/README.md b/google-cloud-dns/README.md
@@ -22,16 +22,16 @@ If you are using Maven, add this to your pom.xml file
 <dependency>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-dns</artifactId>
-  <version>0.7.0</version>
+  <version>0.8.0</version>
 </dependency>
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-dns:0.7.0'
+compile 'com.google.cloud:google-cloud-dns:0.8.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-dns" % "0.7.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-dns" % "0.8.0"
 ```
 
 Example Application

diff --git a/google-cloud-dns/pom.xml b/google-cloud-dns/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-pom</artifactId>
-    <version>0.8.0</version>
+    <version>0.8.1-SNAPSHOT</version>
   </parent>
   <properties>
     <site.installationModule>google-cloud-dns</site.installationModule>

diff --git a/google-cloud-errorreporting/pom.xml b/google-cloud-errorreporting/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-pom</artifactId>
-    <version>0.8.0</version>
+    <version>0.8.1-SNAPSHOT</version>
   </parent>
   <properties>
     <site.installationModule>google-cloud-errorreporting</site.installationModule>

diff --git a/google-cloud-examples/README.md b/google-cloud-examples/README.md
@@ -19,16 +19,16 @@ If you are using Maven, add this to your pom.xml file
 <dependency>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-examples</artifactId>
-  <version>0.7.0</version>
+  <version>0.8.0</version>
 </dependency>
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-examples:0.7.0'
+compile 'com.google.cloud:google-cloud-examples:0.8.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-examples" % "0.7.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-examples" % "0.8.0"
 ```
 
 To run examples from your command line:

diff --git a/google-cloud-examples/pom.xml b/google-cloud-examples/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-pom</artifactId>
-    <version>0.8.0</version>
+    <version>0.8.1-SNAPSHOT</version>
   </parent>
   <properties>
     <site.installationModule>google-cloud-examples</site.installationModule>

diff --git a/google-cloud-language/pom.xml b/google-cloud-language/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-pom</artifactId>
-    <version>0.8.0</version>
+    <version>0.8.1-SNAPSHOT</version>
   </parent>
   <properties>
     <site.installationModule>google-cloud-language</site.installationModule>

diff --git a/google-cloud-logging/README.md b/google-cloud-logging/README.md
@@ -26,16 +26,16 @@ Add this to your pom.xml file
 <dependency>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-logging</artifactId>
-  <version>0.7.0</version>
+  <version>0.8.0-beta</version>
 </dependency>
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-logging:0.7.0'
+compile 'com.google.cloud:google-cloud-logging:0.8.0-beta'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-logging" % "0.7.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-logging" % "0.8.0-beta"
 ```
 
 Example Application

diff --git a/google-cloud-logging/pom.xml b/google-cloud-logging/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-pom</artifactId>
-    <version>0.8.0</version>
+    <version>0.8.1-SNAPSHOT</version>
   </parent>
   <properties>
     <site.installationModule>google-cloud-logging</site.installationModule>

diff --git a/google-cloud-monitoring/pom.xml b/google-cloud-monitoring/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-pom</artifactId>
-    <version>0.8.0</version>
+    <version>0.8.1-SNAPSHOT</version>
   </parent>
   <properties>
     <site.installationModule>google-cloud-monitoring</site.installationModule>