updating to latest google-cloud-* dependencies (#723)

jabubake · lesv · commit e6fad2d664a8 · 2017-06-19T16:22:12.000-07:00
diff --git a/flexible/pubsub/pom.xml b/flexible/pubsub/pom.xml
@@ -63,7 +63,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-pubsub</artifactId>
-      <version>0.17.2-alpha</version>
+      <version>0.20.0-beta</version>
     </dependency>
     <dependency>
       <groupId>com.google.cloud</groupId>
diff --git a/flexible/pubsub/src/main/java/com/example/flexible/pubsub/PubSubPublish.java b/flexible/pubsub/src/main/java/com/example/flexible/pubsub/PubSubPublish.java
@@ -14,7 +14,7 @@
 package com.example.flexible.pubsub;
 
 import com.google.cloud.ServiceOptions;
-import com.google.cloud.pubsub.spi.v1.Publisher;
+import com.google.cloud.pubsub.v1.Publisher;
 import com.google.protobuf.ByteString;
 import com.google.pubsub.v1.PubsubMessage;
 import com.google.pubsub.v1.TopicName;
diff --git a/flexible/pubsub/src/main/test/com/example/flexible/pubsub/PubSubPublishTest.java b/flexible/pubsub/src/main/test/com/example/flexible/pubsub/PubSubPublishTest.java
@@ -21,7 +21,7 @@
 import static org.mockito.Mockito.when;
 
 import com.google.api.gax.core.SettableApiFuture;
-import com.google.cloud.pubsub.spi.v1.Publisher;
+import com.google.cloud.pubsub.v1.Publisher;
 import com.google.protobuf.ByteString;
 import com.google.pubsub.v1.PubsubMessage;
 import org.junit.Test;
diff --git a/iot/api-client/scripts/pom.xml b/iot/api-client/scripts/pom.xml
@@ -31,7 +31,7 @@
     <maven.compiler.target>1.8</maven.compiler.target>
     <maven.compiler.source>1.8</maven.compiler.source>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <pubsub.version>0.17.2-alpha</pubsub.version>
+    <pubsub.version>0.20.0-beta</pubsub.version>
   </properties>
 
   <build>
diff --git a/iot/api-client/scripts/src/main/java/com/example/pubsub/AddCloudIotService.java b/iot/api-client/scripts/src/main/java/com/example/pubsub/AddCloudIotService.java
@@ -20,7 +20,7 @@
 // Imports the Google Cloud client library
 import com.google.cloud.Identity;
 import com.google.cloud.Role;
-import com.google.cloud.pubsub.spi.v1.TopicAdminClient;
+import com.google.cloud.pubsub.v1.TopicAdminClient;
 import com.google.iam.v1.Binding;
 import com.google.iam.v1.Policy;
 import com.google.pubsub.v1.TopicName;
diff --git a/language/analysis/pom.xml b/language/analysis/pom.xml
@@ -25,7 +25,7 @@ limitations under the License.
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-language</artifactId>
-      <version>0.17.2-beta</version>
+      <version>0.20.0-beta</version>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
diff --git a/language/analysis/src/main/java/com/google/cloud/language/samples/Analyze.java b/language/analysis/src/main/java/com/google/cloud/language/samples/Analyze.java
@@ -16,7 +16,7 @@
 
 package com.google.cloud.language.samples;
 
-import com.google.cloud.language.spi.v1.LanguageServiceClient;
+import com.google.cloud.language.v1.LanguageServiceClient;
 
 import com.google.cloud.language.v1.AnalyzeEntitiesRequest;
 import com.google.cloud.language.v1.AnalyzeEntitiesResponse;
diff --git a/language/analysis/src/main/java/com/google/cloud/language/samples/AnalyzeBeta.java b/language/analysis/src/main/java/com/google/cloud/language/samples/AnalyzeBeta.java
@@ -16,7 +16,7 @@
 
 package com.google.cloud.language.samples;
 
-import com.google.cloud.language.spi.v1beta2.LanguageServiceClient;
+import com.google.cloud.language.v1beta2.LanguageServiceClient;
 
 import com.google.cloud.language.v1beta2.AnalyzeEntitySentimentRequest;
 import com.google.cloud.language.v1beta2.AnalyzeEntitySentimentResponse;
diff --git a/language/analysis/src/test/java/com/google/cloud/language/samples/AnalyzeBetaIT.java b/language/analysis/src/test/java/com/google/cloud/language/samples/AnalyzeBetaIT.java
@@ -18,7 +18,7 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import com.google.cloud.language.spi.v1beta2.LanguageServiceClient;
+import com.google.cloud.language.v1beta2.LanguageServiceClient;
 import com.google.cloud.language.v1beta2.Entity;
 import com.google.cloud.language.v1beta2.EntityMention;
 import com.google.cloud.language.v1beta2.Sentiment;
diff --git a/language/analysis/src/test/java/com/google/cloud/language/samples/AnalyzeIT.java b/language/analysis/src/test/java/com/google/cloud/language/samples/AnalyzeIT.java
@@ -18,7 +18,7 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import com.google.cloud.language.spi.v1.LanguageServiceClient;
+import com.google.cloud.language.v1.LanguageServiceClient;
 import com.google.cloud.language.v1.Entity;
 import com.google.cloud.language.v1.PartOfSpeech.Tag;
 import com.google.cloud.language.v1.Sentiment;
diff --git a/language/cloud-client/pom.xml b/language/cloud-client/pom.xml
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-language</artifactId>
-      <version>0.17.2-beta</version>
+      <version>0.20.0-beta</version>
     </dependency>
 
     <!-- Test dependencies -->
diff --git a/language/cloud-client/src/main/java/com/example/language/QuickstartSample.java b/language/cloud-client/src/main/java/com/example/language/QuickstartSample.java
@@ -18,10 +18,9 @@
 
 // [START language_quickstart]
 // Imports the Google Cloud client library
-import com.google.cloud.language.spi.v1.LanguageServiceClient;
-
 import com.google.cloud.language.v1.Document;
 import com.google.cloud.language.v1.Document.Type;
+import com.google.cloud.language.v1.LanguageServiceClient;
 import com.google.cloud.language.v1.Sentiment;
 
 public class QuickstartSample {
diff --git a/monitoring/cloud-client/pom.xml b/monitoring/cloud-client/pom.xml
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-monitoring</artifactId>
-      <version>0.17.2-alpha</version>
+      <version>0.20.0-alpha</version>
     </dependency>
 
     <!-- Test dependencies -->
diff --git a/monitoring/cloud-client/src/main/java/com/example/monitoring/QuickstartSample.java b/monitoring/cloud-client/src/main/java/com/example/monitoring/QuickstartSample.java
@@ -21,7 +21,7 @@
 import com.google.api.MonitoredResource;
 
 // Imports the Google Cloud client library
-import com.google.cloud.monitoring.spi.v3.MetricServiceClient;
+import com.google.cloud.monitoring.v3.MetricServiceClient;
 
 import com.google.monitoring.v3.CreateTimeSeriesRequest;
 import com.google.monitoring.v3.Point;
diff --git a/monitoring/cloud-client/src/main/java/com/example/monitoring/Snippets.java b/monitoring/cloud-client/src/main/java/com/example/monitoring/Snippets.java
@@ -20,8 +20,8 @@
 import com.google.api.MetricDescriptor;
 import com.google.api.MonitoredResource;
 import com.google.api.MonitoredResourceDescriptor;
-import com.google.cloud.monitoring.spi.v3.MetricServiceClient;
-import com.google.cloud.monitoring.spi.v3.PagedResponseWrappers;
+import com.google.cloud.monitoring.v3.MetricServiceClient;
+import com.google.cloud.monitoring.v3.PagedResponseWrappers;
 import com.google.monitoring.v3.Aggregation;
 import com.google.monitoring.v3.CreateMetricDescriptorRequest;
 import com.google.monitoring.v3.CreateTimeSeriesRequest;
diff --git a/pubsub/cloud-client/pom.xml b/pubsub/cloud-client/pom.xml
@@ -31,7 +31,7 @@
     <maven.compiler.target>1.8</maven.compiler.target>
     <maven.compiler.source>1.8</maven.compiler.source>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <pubsub.version>0.17.2-alpha</pubsub.version>
+    <pubsub.version>0.20.0-beta</pubsub.version>
   </properties>
 
   <dependencies>
diff --git a/pubsub/cloud-client/src/main/java/com/example/pubsub/QuickstartSample.java b/pubsub/cloud-client/src/main/java/com/example/pubsub/QuickstartSample.java
@@ -20,7 +20,7 @@
 // Imports the Google Cloud client library
 
 import com.google.cloud.ServiceOptions;
-import com.google.cloud.pubsub.spi.v1.TopicAdminClient;
+import com.google.cloud.pubsub.v1.TopicAdminClient;
 import com.google.pubsub.v1.TopicName;
 
 public class QuickstartSample {
diff --git a/pubsub/cloud-client/src/test/java/com/example/pubsub/QuickstartSampleIT.java b/pubsub/cloud-client/src/test/java/com/example/pubsub/QuickstartSampleIT.java
@@ -19,7 +19,7 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import com.google.cloud.ServiceOptions;
-import com.google.cloud.pubsub.spi.v1.TopicAdminClient;
+import com.google.cloud.pubsub.v1.TopicAdminClient;
 import com.google.pubsub.v1.TopicName;
 
 import org.junit.After;
diff --git a/spanner/cloud-client/pom.xml b/spanner/cloud-client/pom.xml
@@ -52,7 +52,7 @@ limitations under the License.
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-spanner</artifactId>
-      <version>0.17.2-beta</version>
+      <version>0.20.0-beta</version>
       <exclusions>
         <exclusion> <!-- exclude an old version of Guava -->
           <groupId>com.google.guava</groupId>
diff --git a/spanner/cloud-client/src/main/java/com/example/spanner/QuickstartSample.java b/spanner/cloud-client/src/main/java/com/example/spanner/QuickstartSample.java
@@ -57,7 +57,7 @@ public static void main(String... args) throws Exception {
       }
     } finally {
       // Closes the client which will free up the resources used
-      spanner.closeAsync();
+      spanner.close();
     }
   }
 }
diff --git a/spanner/cloud-client/src/main/java/com/example/spanner/SpannerSample.java b/spanner/cloud-client/src/main/java/com/example/spanner/SpannerSample.java
@@ -500,7 +500,7 @@ public static void main(String[] args) throws Exception {
       // [END init_client]
       run(dbClient, dbAdminClient, command, db);
     } finally {
-      spanner.closeAsync().get();
+      spanner.close();
     }
     System.out.println("Closed client");
   }
diff --git a/speech/cloud-client/pom.xml b/speech/cloud-client/pom.xml
@@ -51,7 +51,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-speech</artifactId>
-      <version>0.17.2-alpha</version>
+      <version>0.20.0-alpha</version>
     </dependency>
     <dependency>
       <groupId>com.google.api</groupId>
diff --git a/speech/cloud-client/src/main/java/com/example/speech/QuickstartSample.java b/speech/cloud-client/src/main/java/com/example/speech/QuickstartSample.java
@@ -18,11 +18,11 @@
 
 // [START speech_quickstart]
 // Imports the Google Cloud client library
-import com.google.cloud.speech.spi.v1.SpeechClient;
 import com.google.cloud.speech.v1.RecognitionAudio;
 import com.google.cloud.speech.v1.RecognitionConfig;
 import com.google.cloud.speech.v1.RecognitionConfig.AudioEncoding;
 import com.google.cloud.speech.v1.RecognizeResponse;
+import com.google.cloud.speech.v1.SpeechClient;
 import com.google.cloud.speech.v1.SpeechRecognitionAlternative;
 import com.google.cloud.speech.v1.SpeechRecognitionResult;
 import com.google.protobuf.ByteString;
diff --git a/speech/cloud-client/src/main/java/com/example/speech/Recognize.java b/speech/cloud-client/src/main/java/com/example/speech/Recognize.java
@@ -19,12 +19,12 @@
 import com.google.api.gax.grpc.ApiStreamObserver;
 import com.google.api.gax.grpc.OperationFuture;
 import com.google.api.gax.grpc.StreamingCallable;
-import com.google.cloud.speech.spi.v1.SpeechClient;
 import com.google.cloud.speech.v1.LongRunningRecognizeResponse;
 import com.google.cloud.speech.v1.RecognitionAudio;
 import com.google.cloud.speech.v1.RecognitionConfig;
 import com.google.cloud.speech.v1.RecognitionConfig.AudioEncoding;
 import com.google.cloud.speech.v1.RecognizeResponse;
+import com.google.cloud.speech.v1.SpeechClient;
 import com.google.cloud.speech.v1.SpeechRecognitionAlternative;
 import com.google.cloud.speech.v1.SpeechRecognitionResult;
 import com.google.cloud.speech.v1.StreamingRecognitionConfig;
diff --git a/video/cloud-client/pom.xml b/video/cloud-client/pom.xml
@@ -54,7 +54,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-video-intelligence</artifactId>
-      <version>0.18.0-alpha</version>
+      <version>0.20.0-alpha</version>
       <exclusions>
         <exclusion> <!-- exclude an old version of Guava -->
           <groupId>com.google.guava</groupId>
diff --git a/video/cloud-client/src/main/java/com/example/video/Detect.java b/video/cloud-client/src/main/java/com/example/video/Detect.java
@@ -17,8 +17,6 @@
 package com.example.video;
 
 import com.google.api.gax.grpc.OperationFuture;
-import com.google.cloud.videointelligence.spi.v1beta1.VideoIntelligenceServiceClient;
-import com.google.cloud.videointelligence.spi.v1beta1.VideoIntelligenceServiceSettings;
 import com.google.cloud.videointelligence.v1beta1.AnnotateVideoRequest;
 import com.google.cloud.videointelligence.v1beta1.AnnotateVideoResponse;
 import com.google.cloud.videointelligence.v1beta1.FaceAnnotation;
@@ -28,6 +26,8 @@
 import com.google.cloud.videointelligence.v1beta1.Likelihood;
 import com.google.cloud.videointelligence.v1beta1.SafeSearchAnnotation;
 import com.google.cloud.videointelligence.v1beta1.VideoAnnotationResults;
+import com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceClient;
+import com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceSettings;
 import com.google.cloud.videointelligence.v1beta1.VideoSegment;
 import org.apache.commons.codec.binary.Base64;
 
diff --git a/video/cloud-client/src/main/java/com/example/video/QuickstartSample.java b/video/cloud-client/src/main/java/com/example/video/QuickstartSample.java
@@ -18,14 +18,14 @@
 
 // [START videointelligence_quickstart]
 import com.google.api.gax.grpc.OperationFuture;
-import com.google.cloud.videointelligence.spi.v1beta1.VideoIntelligenceServiceClient;
-import com.google.cloud.videointelligence.spi.v1beta1.VideoIntelligenceServiceSettings;
 import com.google.cloud.videointelligence.v1beta1.AnnotateVideoRequest;
 import com.google.cloud.videointelligence.v1beta1.AnnotateVideoResponse;
 import com.google.cloud.videointelligence.v1beta1.Feature;
 import com.google.cloud.videointelligence.v1beta1.LabelAnnotation;
 import com.google.cloud.videointelligence.v1beta1.LabelLocation;
 import com.google.cloud.videointelligence.v1beta1.VideoAnnotationResults;
+import com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceClient;
+import com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceSettings;
 
 import java.io.IOException;
 import java.util.concurrent.ExecutionException;
diff --git a/vision/cloud-client/pom.xml b/vision/cloud-client/pom.xml
@@ -38,7 +38,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-vision</artifactId>
-      <version>0.17.2-beta</version>
+      <version>0.20.0-beta</version>
     </dependency>
     <!-- [END dependencies] -->
 
diff --git a/vision/cloud-client/src/main/java/com/example/vision/Detect.java b/vision/cloud-client/src/main/java/com/example/vision/Detect.java
@@ -13,8 +13,6 @@
  */
 package com.example.vision;
 
-import com.google.cloud.vision.spi.v1.ImageAnnotatorClient;
-import com.google.cloud.vision.spi.v1.ImageAnnotatorSettings;
 import com.google.cloud.vision.v1.AnnotateImageRequest;
 import com.google.cloud.vision.v1.AnnotateImageResponse;
 import com.google.cloud.vision.v1.BatchAnnotateImagesResponse;
@@ -28,6 +26,8 @@
 import com.google.cloud.vision.v1.Feature;
 import com.google.cloud.vision.v1.Feature.Type;
 import com.google.cloud.vision.v1.Image;
+import com.google.cloud.vision.v1.ImageAnnotatorClient;
+import com.google.cloud.vision.v1.ImageAnnotatorSettings;
 import com.google.cloud.vision.v1.ImageSource;
 import com.google.cloud.vision.v1.LocationInfo;
 import com.google.cloud.vision.v1.Page;
diff --git a/vision/cloud-client/src/main/java/com/example/vision/QuickstartSample.java b/vision/cloud-client/src/main/java/com/example/vision/QuickstartSample.java
@@ -18,14 +18,14 @@
 
 // [START vision_quickstart]
 // Imports the Google Cloud client library
-import com.google.cloud.vision.spi.v1.ImageAnnotatorClient;
 import com.google.cloud.vision.v1.AnnotateImageRequest;
 import com.google.cloud.vision.v1.AnnotateImageResponse;
 import com.google.cloud.vision.v1.BatchAnnotateImagesResponse;
 import com.google.cloud.vision.v1.EntityAnnotation;
 import com.google.cloud.vision.v1.Feature;
 import com.google.cloud.vision.v1.Feature.Type;
 import com.google.cloud.vision.v1.Image;
+import com.google.cloud.vision.v1.ImageAnnotatorClient;
 import com.google.protobuf.ByteString;
 
 import java.nio.file.Files;
