diff --git a/flexible/pubsub/pom.xml b/flexible/pubsub/pom.xml
index 37c8c0a85be..84fa9854092 100644
--- a/flexible/pubsub/pom.xml
+++ b/flexible/pubsub/pom.xml
@@ -63,7 +63,7 @@
com.google.cloud
google-cloud-pubsub
- 0.17.2-alpha
+ 0.20.0-beta
com.google.cloud
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
index f987529b46e..9974392f567 100644
--- 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
index 6b7f06016e9..c01c0b9a44f 100644
--- 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
index 5c88c2afa46..5dd299974e6 100644
--- a/iot/api-client/scripts/pom.xml
+++ b/iot/api-client/scripts/pom.xml
@@ -31,7 +31,7 @@
1.8
1.8
UTF-8
- 0.17.2-alpha
+ 0.20.0-beta
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
index 7e1babf65b3..5e1e68e0537 100644
--- 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
index d0ea9ae3488..2ebd0181901 100644
--- a/language/analysis/pom.xml
+++ b/language/analysis/pom.xml
@@ -25,7 +25,7 @@ limitations under the License.
com.google.cloud
google-cloud-language
- 0.17.2-beta
+ 0.20.0-beta
com.google.guava
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
index 49bb3d1e395..be67799e940 100644
--- 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
index 8d2c5096275..557168e54f1 100644
--- 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
index dba254b469c..1e4b1d141ea 100644
--- 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
index 43a5b19e47a..1818fdd5f19 100644
--- 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
index 013abf07c42..f2cd7ea467a 100644
--- a/language/cloud-client/pom.xml
+++ b/language/cloud-client/pom.xml
@@ -37,7 +37,7 @@
com.google.cloud
google-cloud-language
- 0.17.2-beta
+ 0.20.0-beta
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
index 215518e15e1..115c0e4d52f 100644
--- 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
index a5248da42d3..c020e7cb59c 100644
--- a/monitoring/cloud-client/pom.xml
+++ b/monitoring/cloud-client/pom.xml
@@ -37,7 +37,7 @@
com.google.cloud
google-cloud-monitoring
- 0.17.2-alpha
+ 0.20.0-alpha
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
index e90b08994be..dfd6ae89c15 100644
--- 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
index b02aca0611b..40492605ee1 100644
--- 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
index 18c98a814ec..f9a98dab733 100644
--- a/pubsub/cloud-client/pom.xml
+++ b/pubsub/cloud-client/pom.xml
@@ -31,7 +31,7 @@
1.8
1.8
UTF-8
- 0.17.2-alpha
+ 0.20.0-beta
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
index d37c3cdafd6..301156323a8 100644
--- 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
index bd5a781ccf3..bc582cba2d5 100644
--- 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
index 5db456f92dc..37c931c056b 100644
--- a/spanner/cloud-client/pom.xml
+++ b/spanner/cloud-client/pom.xml
@@ -52,7 +52,7 @@ limitations under the License.
com.google.cloud
google-cloud-spanner
- 0.17.2-beta
+ 0.20.0-beta
com.google.guava
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
index 8904edcbd4c..a05c847e3ed 100644
--- 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
index 3d9d9f736d0..176677b44f0 100644
--- 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
index 4f61eec3c54..b46e82b145c 100644
--- a/speech/cloud-client/pom.xml
+++ b/speech/cloud-client/pom.xml
@@ -51,7 +51,7 @@
com.google.cloud
google-cloud-speech
- 0.17.2-alpha
+ 0.20.0-alpha
com.google.api
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
index 955f971eb29..fbb0053f17b 100644
--- 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
index 9863d9bc1b4..92b6caa8e83 100644
--- 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
index b8cf3117731..cf80597ece8 100644
--- a/video/cloud-client/pom.xml
+++ b/video/cloud-client/pom.xml
@@ -54,7 +54,7 @@
com.google.cloud
google-cloud-video-intelligence
- 0.18.0-alpha
+ 0.20.0-alpha
com.google.guava
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
index a01c178351f..3c11c01cff2 100644
--- 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
index 3e543a0d74f..f2958fc503c 100644
--- 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
index 423a27df4b9..1288d24a5d9 100644
--- a/vision/cloud-client/pom.xml
+++ b/vision/cloud-client/pom.xml
@@ -38,7 +38,7 @@
com.google.cloud
google-cloud-vision
- 0.17.2-beta
+ 0.20.0-beta
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
index c07bc70e7f6..f50f03e7c9f 100644
--- 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
index f75307f71cd..195b67f16a4 100644
--- 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,7 +18,6 @@
// [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;
@@ -26,6 +25,7 @@
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;